Mercurial > sdl-ios-xcode
diff src/video/x11/SDL_x11modes.c @ 1668:4da1ee79c9af SDL-1.3
more tweaking indent options
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 29 May 2006 04:04:35 +0000 |
| parents | 782fd950bd46 |
| children | 43ba677b4f62 |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11modes.c Mon May 29 03:53:21 2006 +0000 +++ b/src/video/x11/SDL_x11modes.c Mon May 29 04:04:35 2006 +0000 @@ -39,7 +39,7 @@ #if SDL_VIDEO_DRIVER_X11_VIDMODE int -vidmode_refreshrate (SDL_NAME (XF86VidModeModeInfo) * mode) +vidmode_refreshrate(SDL_NAME(XF86VidModeModeInfo) * mode) { return (mode->htotal && mode->vtotal) ? (1000 * mode->dotclock / (mode->htotal * @@ -48,54 +48,54 @@ #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) +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); + 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) +restore_mode(_THIS) { - SDL_NAME (XF86VidModeModeLine) mode; + SDL_NAME(XF86VidModeModeLine) mode; int unused; - if (SDL_NAME (XF86VidModeGetModeLine) + 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); + 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(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) +set_best_resolution(_THIS, int width, int height) { SDL_DisplayMode mode; @@ -103,29 +103,29 @@ mode.w = width; mode.h = height; mode.refresh_rate = 0; - SDL_GetClosestDisplayMode (&mode, &mode, SDL_FULLSCREEN); + SDL_GetClosestDisplayMode(&mode, &mode, SDL_FULLSCREEN); #if SDL_VIDEO_DRIVER_X11_VIDMODE if (use_vidmode) { - SDL_NAME (XF86VidModeModeLine) vmode; - SDL_NAME (XF86VidModeModeInfo) vinfo; - SDL_NAME (XF86VidModeModeInfo) ** modes; + SDL_NAME(XF86VidModeModeLine) vmode; + SDL_NAME(XF86VidModeModeInfo) vinfo; + SDL_NAME(XF86VidModeModeInfo) ** modes; int i, dotclock; int nmodes; int best = -1; - if (SDL_NAME (XF86VidModeGetModeLine) + if (SDL_NAME(XF86VidModeGetModeLine) (SDL_Display, SDL_Screen, &dotclock, &vmode) - && SDL_NAME (XF86VidModeGetAllModeLines) (SDL_Display, - SDL_Screen, &nmodes, - &modes)) { + && SDL_NAME(XF86VidModeGetAllModeLines) (SDL_Display, + SDL_Screen, &nmodes, + &modes)) { vinfo.dotclock = dotclock; - SDL_memcpy (&vinfo.hdisplay, &vmode, sizeof (vmode)); + 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)) { + (vidmode_refreshrate(modes[i]) == mode.refresh_rate)) { best = i; break; } @@ -133,17 +133,17 @@ if (best >= 0 && ((modes[best]->hdisplay != vmode.hdisplay) || (modes[best]->vdisplay != vmode.vdisplay) || - (vidmode_refreshrate (modes[best]) != - vidmode_refreshrate (&vinfo)))) { + (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, - vidmode_refreshrate (modes[best])); + printf("Best Mode %d: %d x %d @ %d\n", best, + 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); + XFree(modes); } } #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ @@ -155,16 +155,16 @@ int w, h; /* check current mode so we can avoid uneccessary mode changes */ - get_real_resolution (this, &w, &h); + get_real_resolution(this, &w, &h); if ((mode.w != w) || (mode.h != h)) { #ifdef X11MODES_DEBUG - fprintf (stderr, "XME: set_best_resolution: " - "XiGMiscChangeResolution: %d %d\n", mode.w, mode.h); + fprintf(stderr, "XME: set_best_resolution: " + "XiGMiscChangeResolution: %d %d\n", mode.w, mode.h); #endif - XiGMiscChangeResolution (SDL_Display, SDL_Screen, 0, /* view */ - mode.w, mode.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 */ @@ -175,7 +175,7 @@ XRRScreenSize *sizes; /* find the smallest resolution that is at least as big as the user requested */ - sizes = XRRConfigSizes (screen_config, &nsizes); + sizes = XRRConfigSizes(screen_config, &nsizes); for (i = (nsizes - 1); i >= 0; i--) { if ((mode.w >= width) && (mode.h >= height)) { break; @@ -186,14 +186,14 @@ int w, h; /* check current mode so we can avoid uneccessary mode changes */ - get_real_resolution (this, &w, &h); + get_real_resolution(this, &w, &h); if ((mode.w != w) || (mode.h != h)) { int size_id; #ifdef X11MODES_DEBUG - fprintf (stderr, "XRANDR: set_best_resolution: " - "XXRSetScreenConfig: %d %d\n", mode.w, mode.h); + fprintf(stderr, "XRANDR: set_best_resolution: " + "XXRSetScreenConfig: %d %d\n", mode.w, mode.h); #endif /* find the matching size entry index */ @@ -203,9 +203,9 @@ 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); } } } @@ -213,31 +213,31 @@ } static void -get_real_resolution (_THIS, int *w, int *h) +get_real_resolution(_THIS, int *w, int *h) { #if SDL_VIDEO_DRIVER_X11_XME if (use_xme) { int ractive; XiGMiscResolutionInfo *modelist; - XiGMiscQueryResolutions (SDL_Display, SDL_Screen, 0, /* view */ - &ractive, &modelist); + XiGMiscQueryResolutions(SDL_Display, SDL_Screen, 0, /* view */ + &ractive, &modelist); *w = modelist[ractive].width; *h = modelist[ractive].height; #ifdef X11MODES_DEBUG - fprintf (stderr, "XME: get_real_resolution: w = %d h = %d\n", *w, *h); + fprintf(stderr, "XME: get_real_resolution: w = %d h = %d\n", *w, *h); #endif - XFree (modelist); + XFree(modelist); return; } #endif /* SDL_VIDEO_DRIVER_X11_XME */ #if SDL_VIDEO_DRIVER_X11_VIDMODE if (use_vidmode) { - SDL_NAME (XF86VidModeModeLine) mode; + SDL_NAME(XF86VidModeModeLine) mode; int unused; - if (SDL_NAME (XF86VidModeGetModeLine) + if (SDL_NAME(XF86VidModeGetModeLine) (SDL_Display, SDL_Screen, &unused, &mode)) { *w = mode.hdisplay; *h = mode.vdisplay; @@ -251,20 +251,20 @@ int nsizes; XRRScreenSize *sizes; - sizes = XRRConfigSizes (screen_config, &nsizes); + sizes = XRRConfigSizes(screen_config, &nsizes); if (nsizes > 0) { int cur_size; Rotation cur_rotation; cur_size = - XRRConfigCurrentConfiguration (screen_config, &cur_rotation); + 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; } @@ -279,43 +279,43 @@ } #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ - *w = DisplayWidth (SDL_Display, SDL_Screen); - *h = DisplayHeight (SDL_Display, SDL_Screen); + *w = DisplayWidth(SDL_Display, SDL_Screen); + *h = DisplayHeight(SDL_Display, SDL_Screen); } /* Called after mapping a window - waits until the window is mapped */ void -X11_WaitMapped (_THIS, Window win) +X11_WaitMapped(_THIS, Window win) { XEvent event; do { - XMaskEvent (SDL_Display, StructureNotifyMask, &event); + XMaskEvent(SDL_Display, StructureNotifyMask, &event); } 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) +X11_WaitUnmapped(_THIS, Window win) { XEvent event; do { - XMaskEvent (SDL_Display, StructureNotifyMask, &event); + XMaskEvent(SDL_Display, StructureNotifyMask, &event); } while ((event.type != UnmapNotify) || (event.xunmap.event != win)); } static void -move_cursor_to (_THIS, int x, int y) +move_cursor_to(_THIS, int x, int y) { - XWarpPointer (SDL_Display, None, SDL_Root, 0, 0, 0, 0, x, y); + XWarpPointer(SDL_Display, None, SDL_Root, 0, 0, 0, 0, x, y); } static int -add_visual (_THIS, int depth, int class) +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; @@ -324,28 +324,28 @@ return (this->hidden->nvisuals); } static int -add_visual_byid (_THIS, const char *visual_id) +add_visual_byid(_THIS, const char *visual_id) { XVisualInfo *vi, template; int nvis; if (visual_id) { - SDL_memset (&template, 0, (sizeof template)); - template.visualid = SDL_strtol (visual_id, NULL, 0); - vi = XGetVisualInfo (SDL_Display, VisualIDMask, &template, &nvis); + SDL_memset(&template, 0, (sizeof template)); + template.visualid = SDL_strtol(visual_id, NULL, 0); + vi = XGetVisualInfo(SDL_Display, VisualIDMask, &template, &nvis); if (vi) { int n = this->hidden->nvisuals; this->hidden->visuals[n].depth = vi->depth; this->hidden->visuals[n].visual = vi->visual; this->hidden->nvisuals++; - XFree (vi); + XFree(vi); } } return (this->hidden->nvisuals); } int -X11_GetVisuals (_THIS) +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. @@ -358,30 +358,30 @@ /* Search for the visuals in deepest-first order, so that the first will be the richest one */ - if (SDL_getenv ("SDL_VIDEO_X11_NODIRECTCOLOR")) { + 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 (!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], DirectColor); } - add_visual (this, depth_list[i], TrueColor); + add_visual(this, depth_list[i], TrueColor); } else { - add_visual (this, depth_list[i], PseudoColor); - add_visual (this, depth_list[i], StaticColor); + 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"); + SDL_SetError("Found no sufficiently capable X11 visuals"); return -1; } /* look up the pixel quantum for each depth */ - pf = XListPixmapFormats (SDL_Display, &np); + 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++) @@ -390,7 +390,7 @@ this->hidden->visuals[i].bpp = j < np ? pf[j].bits_per_pixel : d; } - XFree (pf); + XFree(pf); return 0; } @@ -399,7 +399,7 @@ #if SDL_VIDEO_DRIVER_X11_XINERAMA static int -CheckXinerama (_THIS, int *major, int *minor) +CheckXinerama(_THIS, int *major, int *minor) { const char *env; @@ -407,14 +407,14 @@ *major = *minor = 0; /* Allow environment override */ - env = getenv ("SDL_VIDEO_X11_XINERAMA"); - if (env && !SDL_atoi (env)) { + env = getenv("SDL_VIDEO_X11_XINERAMA"); + 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; @@ -423,7 +423,7 @@ #if SDL_VIDEO_DRIVER_X11_XRANDR static int -CheckXRandR (_THIS, int *major, int *minor) +CheckXRandR(_THIS, int *major, int *minor) { const char *env; @@ -431,8 +431,8 @@ *major = *minor = 0; /* Allow environment override */ - env = getenv ("SDL_VIDEO_X11_XRANDR"); - if (env && !SDL_atoi (env)) { + env = getenv("SDL_VIDEO_X11_XRANDR"); + if (env && !SDL_atoi(env)) { return 0; } @@ -446,7 +446,7 @@ } /* Query the extension version */ - if (!XRRQueryVersion (SDL_Display, major, minor)) { + if (!XRRQueryVersion(SDL_Display, major, minor)) { return 0; } return 1; @@ -455,7 +455,7 @@ #if SDL_VIDEO_DRIVER_X11_VIDMODE static int -CheckVidMode (_THIS, int *major, int *minor) +CheckVidMode(_THIS, int *major, int *minor) { const char *env; @@ -463,26 +463,25 @@ *major = *minor = 0; /* Allow environment override */ - env = getenv ("SDL_VIDEO_X11_VIDMODE"); - if (env && !SDL_atoi (env)) { + env = getenv("SDL_VIDEO_X11_VIDMODE"); + 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"); + metro_fp = fopen("/usr/X11R6/lib/X11/Metro/.version", "r"); if (metro_fp != NULL) { int major, minor, patch, version; major = 0; minor = 0; patch = 0; - fscanf (metro_fp, "%d.%d.%d", &major, &minor, &patch); - fclose (metro_fp); + fscanf(metro_fp, "%d.%d.%d", &major, &minor, &patch); + fclose(metro_fp); version = major * 100 + minor * 10 + patch; if (version < 431) { return 0; @@ -492,9 +491,9 @@ /* Query the extension version */ vm_error = -1; - if (!SDL_NAME (XF86VidModeQueryExtension) + if (!SDL_NAME(XF86VidModeQueryExtension) (SDL_Display, &vm_event, &vm_error) - || !SDL_NAME (XF86VidModeQueryVersion) (SDL_Display, major, minor)) { + || !SDL_NAME(XF86VidModeQueryVersion) (SDL_Display, major, minor)) { return 0; } return 1; @@ -503,7 +502,7 @@ #if SDL_VIDEO_DRIVER_X11_XME static int -CheckXME (_THIS, int *major, int *minor) +CheckXME(_THIS, int *major, int *minor) { const char *env; @@ -511,13 +510,13 @@ *major = *minor = 0; /* Allow environment override */ - env = getenv ("SDL_VIDEO_X11_VIDMODE"); - if (env && !SDL_atoi (env)) { + env = getenv("SDL_VIDEO_X11_VIDMODE"); + 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; @@ -525,7 +524,7 @@ #endif /* SDL_VIDEO_DRIVER_X11_XME */ int -X11_GetVideoModes (_THIS) +X11_GetVideoModes(_THIS) { #if SDL_VIDEO_DRIVER_X11_XINERAMA int xinerama_major, xinerama_minor; @@ -540,7 +539,7 @@ #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; @@ -556,37 +555,37 @@ use_xrandr = 0; use_vidmode = 0; use_xme = 0; - screen_w = DisplayWidth (SDL_Display, SDL_Screen); - screen_h = DisplayHeight (SDL_Display, SDL_Screen); + 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); + SDL_AddDisplayMode(0, &mode); #if SDL_VIDEO_DRIVER_X11_XINERAMA /* Query Xinerama extention */ - if (CheckXinerama (this, &xinerama_major, &xinerama_minor)) { + if (CheckXinerama(this, &xinerama_major, &xinerama_minor)) { int screens; #ifdef X11MODES_DEBUG - printf ("X11 detected Xinerama:\n"); + printf("X11 detected Xinerama:\n"); #endif - xinerama = SDL_NAME (XineramaQueryScreens) (SDL_Display, &screens); + 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); + 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); #endif if (xinerama[i].screen_number != 0) { - SDL_AddVideoDisplay (&mode); + SDL_AddVideoDisplay(&mode); } mode.w = xinerama[i].width; mode.h = xinerama[i].height; - SDL_AddDisplayMode (xinerama[i].screen_number, &mode); + SDL_AddDisplayMode(xinerama[i].screen_number, &mode); } use_xinerama = 1; } @@ -595,42 +594,41 @@ #if SDL_VIDEO_DRIVER_X11_XRANDR /* XRandR */ /* require at least XRandR v1.0 (arbitrary) */ - if (CheckXRandR (this, &xrandr_major, &xrandr_minor) + 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); + fprintf(stderr, "XRANDR: XRRQueryVersion: V%d.%d\n", + xrandr_major, xrandr_minor); #endif /* save the screen configuration since we must reference it each time we toggle modes. */ - screen_config = XRRGetScreenInfo (SDL_Display, SDL_Root); + screen_config = XRRGetScreenInfo(SDL_Display, SDL_Root); /* retrieve the list of resolution */ - sizes = XRRConfigSizes (screen_config, &nsizes); + sizes = XRRConfigSizes(screen_config, &nsizes); if (nsizes > 0) { for (i = 0; i < nsizes; i++) { mode.w = sizes[i].width; mode.h = sizes[i].height; - rates = XRRConfigRates (screen_config, i, &nrates); + rates = XRRConfigRates(screen_config, i, &nrates); if (nrates == 0) { mode.refresh_rate = 0; - SDL_AddDisplayMode (0, &mode); + SDL_AddDisplayMode(0, &mode); } else { int j; for (j = 0; j < nrates; ++j) { mode.refresh_rate = rates[j]; - SDL_AddDisplayMode (0, &mode); + SDL_AddDisplayMode(0, &mode); } } } use_xrandr = xrandr_major * 100 + xrandr_minor; saved_size_id = - XRRConfigCurrentConfiguration (screen_config, - &saved_rotation); + XRRConfigCurrentConfiguration(screen_config, &saved_rotation); } } #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ @@ -638,27 +636,27 @@ #if SDL_VIDEO_DRIVER_X11_VIDMODE /* XVidMode */ if (!use_xrandr && - CheckVidMode (this, &vm_major, &vm_minor) && - SDL_NAME (XF86VidModeGetAllModeLines) (SDL_Display, SDL_Screen, - &nmodes, &modes)) { + CheckVidMode(this, &vm_major, &vm_minor) && + SDL_NAME(XF86VidModeGetAllModeLines) (SDL_Display, SDL_Screen, + &nmodes, &modes)) { #ifdef X11MODES_DEBUG - printf ("VidMode modes: (unsorted)\n"); + printf("VidMode modes: (unsorted)\n"); for (i = 0; i < nmodes; ++i) { - printf ("Mode %d: %d x %d @ %d\n", i, - modes[i]->hdisplay, modes[i]->vdisplay, - vidmode_refreshrate (modes[i])); + printf("Mode %d: %d x %d @ %d\n", i, + modes[i]->hdisplay, modes[i]->vdisplay, + vidmode_refreshrate(modes[i])); } #endif 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); + mode.refresh_rate = vidmode_refreshrate(modes[i]); + SDL_AddDisplayMode(0, &mode); } - XFree (modes); + XFree(modes); use_vidmode = vm_major * 100 + vm_minor; - save_mode (this); + save_mode(this); } #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ @@ -666,50 +664,50 @@ /* 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)) + 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); + fprintf(stderr, "XME: nummodes = %d, active mode = %d\n", + nummodes, ractive); #endif 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); + fprintf(stderr, "XME: mode = %4d, w = %4d, h = %4d\n", + i, modelist[i].width, modelist[i].height); #endif mode.w = modelist[i].width; mode.h = modelist[i].height; - SDL_AddDisplayMode (0, &mode); + SDL_AddDisplayMode(0, &mode); } use_xme = xme_major * 100 + xme_minor; saved_res = modelist[ractive]; /* save the current resolution */ } if (modelist) { - XFree (modelist); + XFree(modelist); } #endif /* SDL_VIDEO_DRIVER_X11_XME */ #ifdef X11MODES_DEBUG if (use_xinerama) { - printf ("Xinerama is enabled\n"); + printf("Xinerama is enabled\n"); } if (use_xrandr) { - printf ("XRandR is enabled\n"); + printf("XRandR is enabled\n"); } if (use_vidmode) { - printf ("VidMode is enabled\n"); + printf("VidMode is enabled\n"); } if (use_xme) { - printf ("Xi Graphics XME fullscreen is enabled\n"); + printf("Xi Graphics XME fullscreen is enabled\n"); } #endif /* X11MODES_DEBUG */ @@ -717,27 +715,27 @@ } void -X11_FreeVideoModes (_THIS) +X11_FreeVideoModes(_THIS) { #if SDL_VIDEO_DRIVER_X11_XRANDR /* Free the Xrandr screen configuration */ if (screen_config) { - XRRFreeScreenConfigInfo (screen_config); + XRRFreeScreenConfigInfo(screen_config); screen_config = NULL; } #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ } int -X11_ResizeFullScreen (_THIS) +X11_ResizeFullScreen(_THIS) { int x = 0, y = 0; int real_w, real_h; int screen_w; int screen_h; - screen_w = DisplayWidth (SDL_Display, SDL_Screen); - screen_h = DisplayHeight (SDL_Display, SDL_Screen); + screen_w = DisplayWidth(SDL_Display, SDL_Screen); + screen_h = DisplayHeight(SDL_Display, SDL_Screen); #if SDL_VIDEO_DRIVER_X11_VIDMODE if (use_xinerama && @@ -749,41 +747,41 @@ #endif 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); + 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) { - real_w = MAX (real_w, screen_w); + real_w = MAX(real_w, screen_w); } if (window_h > real_h) { - real_h = MAX (real_h, screen_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); + XMoveResizeWindow(SDL_Display, FSwindow, x, y, real_w, real_h); + 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; - XReparentWindow (SDL_Display, SDL_Window, FSwindow, x, y); + 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); } void -X11_QueueEnterFullScreen (_THIS) +X11_QueueEnterFullScreen(_THIS) { switch_waiting = 0x01 | SDL_FULLSCREEN; - switch_time = SDL_GetTicks () + 1500; + switch_time = SDL_GetTicks() + 1500; #if 0 /* This causes a BadMatch error if the window is iconified (not needed) */ - XSetInputFocus (SDL_Display, WMwindow, RevertToNone, CurrentTime); + XSetInputFocus(SDL_Display, WMwindow, RevertToNone, CurrentTime); #endif } int -X11_EnterFullScreen (_THIS) +X11_EnterFullScreen(_THIS) { int okay; #if 0 @@ -801,7 +799,7 @@ } /* Ungrab the input so that we can move the mouse around */ - X11_GrabInputNoLock (this, SDL_GRAB_OFF); + X11_GrabInputNoLock(this, SDL_GRAB_OFF); #if SDL_VIDEO_DRIVER_X11_VIDMODE if (use_xinerama && @@ -812,73 +810,73 @@ } #endif /* Map the fullscreen window to blank the screen */ - screen_w = DisplayWidth (SDL_Display, SDL_Screen); - screen_h = DisplayHeight (SDL_Display, SDL_Screen); - get_real_resolution (this, &real_w, &real_h); + 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) { - real_w = MAX (real_w, screen_w); + real_w = MAX(real_w, screen_w); } if (window_h > real_h) { - real_h = MAX (real_h, screen_h); + real_h = MAX(real_h, screen_h); } - XMoveResizeWindow (SDL_Display, FSwindow, x, y, real_w, real_h); - XMapRaised (SDL_Display, FSwindow); - X11_WaitMapped (this, FSwindow); + 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 */ /* 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])); + SDL_memcpy(&windows[i], &windows[i + 1], + (nwindows - i - 1) * sizeof(windows[i])); break; } } windows[nwindows - 1] = FSwindow; - XRestackWindows (SDL_Display, windows, nwindows); - XSync (SDL_Display, False); + XRestackWindows(SDL_Display, windows, nwindows); + XSync(SDL_Display, False); } - XFree (windows); + XFree(windows); } #else - XRaiseWindow (SDL_Display, FSwindow); + XRaiseWindow(SDL_Display, FSwindow); #endif #if SDL_VIDEO_DRIVER_X11_VIDMODE /* Save the current video mode */ if (use_vidmode) { - SDL_NAME (XF86VidModeLockModeSwitch) (SDL_Display, SDL_Screen, True); + SDL_NAME(XF86VidModeLockModeSwitch) (SDL_Display, SDL_Screen, True); } #endif currently_fullscreen = 1; /* Set the new resolution */ - okay = X11_ResizeFullScreen (this); + okay = X11_ResizeFullScreen(this); if (!okay) { - X11_LeaveFullScreen (this); + X11_LeaveFullScreen(this); } /* Set the colormap */ if (SDL_XColorMap) { - XInstallColormap (SDL_Display, SDL_XColorMap); + XInstallColormap(SDL_Display, SDL_XColorMap); } if (okay) { - X11_GrabInputNoLock (this, - SDL_CurrentWindow. - 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 (SDL_VideoSurface) { if (SDL_VideoSurface->flags & SDL_INTERNALOPENGL) { - SDL_PrivateExpose (); + SDL_PrivateExpose(); } else { - X11_RefreshDisplay (this); + X11_RefreshDisplay(this); } } @@ -886,15 +884,15 @@ } int -X11_LeaveFullScreen (_THIS) +X11_LeaveFullScreen(_THIS) { if (currently_fullscreen) { - XReparentWindow (SDL_Display, SDL_Window, WMwindow, 0, 0); + XReparentWindow(SDL_Display, SDL_Window, WMwindow, 0, 0); #if SDL_VIDEO_DRIVER_X11_VIDMODE if (use_vidmode) { - restore_mode (this); - SDL_NAME (XF86VidModeLockModeSwitch) (SDL_Display, SDL_Screen, - False); + restore_mode(this); + SDL_NAME(XF86VidModeLockModeSwitch) (SDL_Display, SDL_Screen, + False); } #endif @@ -903,27 +901,26 @@ int rw, rh; /* check current mode so we can avoid uneccessary mode changes */ - get_real_resolution (this, &rw, &rh); + 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); - XSync (SDL_Display, False); + 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) { - XRRSetScreenConfig (SDL_Display, screen_config, SDL_Root, - saved_size_id, saved_rotation, CurrentTime); + XRRSetScreenConfig(SDL_Display, screen_config, SDL_Root, + saved_size_id, saved_rotation, CurrentTime); } #endif - XUnmapWindow (SDL_Display, FSwindow); - X11_WaitUnmapped (this, FSwindow); - XSync (SDL_Display, True); /* Flush spurious mode change events */ + XUnmapWindow(SDL_Display, FSwindow); + X11_WaitUnmapped(this, FSwindow); + 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 @@ -931,16 +928,16 @@ temporary. In this case, release the grab unless the input has been explicitly grabbed. */ - X11_GrabInputNoLock (this, - SDL_CurrentWindow.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 (SDL_VideoSurface) { if (SDL_VideoSurface->flags & SDL_INTERNALOPENGL) { - SDL_PrivateExpose (); + SDL_PrivateExpose(); } else { - X11_RefreshDisplay (this); + X11_RefreshDisplay(this); } } @@ -948,7 +945,7 @@ } Uint32 -X11_VisualToFormat (const Visual * visual, int depth, int bpp) +X11_VisualToFormat(const Visual * visual, int depth, int bpp) { Uint32 Rmask = visual->red_mask; Uint32 Gmask = visual->green_mask; @@ -960,7 +957,7 @@ } else { Amask = 0; } - return (SDL_MasksToPixelFormatEnum (bpp, Rmask, Gmask, Bmask, Amask)); + return (SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask)); } /* vi: set ts=4 sw=4 expandtab: */