← Back to branch summary

~ubuntu-branches/ubuntu/karmic/libsdl1.2/karmic

« back to all changes in this revision

Viewing changes to src/video/x11/SDL_x11video.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2008-01-05 14:10:45 UTC
  • mto: (2.1.3 lenny)
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: james.westby@ubuntu.com-20080105141045-mjdg2rp09mamme4a
Tags: upstream-1.2.13
Import upstream version 1.2.13

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/video/x11/SDL_x11video.c
667
667
        }
668
668
        X11_SaveVidModeGamma(this);
669
669
 
 
670
        /* Allow environment override of screensaver disable. */
 
671
        env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
 
672
        this->hidden->allow_screensaver = ( (env && SDL_atoi(env)) ? 1 : 0 );
 
673
 
670
674
        /* Save DPMS and screensaver settings */
671
675
        X11_SaveScreenSaver(SDL_Display, &screensaver_timeout, &dpms_enabled);
672
676
        X11_DisableScreenSaver(this, SDL_Display);
685
689
        /* Fill in some window manager capabilities */
686
690
        this->info.wm_available = 1;
687
691
 
688
 
        /* Allow environment override of screensaver disable. */
689
 
        env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
690
 
        this->hidden->allow_screensaver = ( (env && SDL_atoi(env)) ? 1 : 0 );
691
 
 
692
692
        /* We're done! */
693
693
        XFlush(SDL_Display);
694
694
        return(0);