Ticket #5: scr-test2.diff

libvo/vo_sdl.c

@@ -1575 +1575 @@
 uninit(void)
 {
 #ifdef HAVE_X11
-        static Display *XDisplay;
-    XDisplay = XOpenDisplay(NULL);
-    if(XDisplay) {
+    struct sdl_priv_s *priv = &sdl_priv;
+    if(priv->X) {
                 if(verbose) printf("SDL: activating XScreensaver/DPMS\n");
-
-                saver_on(XDisplay);
-                XCloseDisplay(XDisplay);
+                vo_x11_uninit();
         }
 #endif
         sdl_close();
@@ -1597 +1594 @@
 static uint32_t preinit(const char *arg)
 {
     struct sdl_priv_s *priv = &sdl_priv;
-#ifdef HAVE_X11 
-    static Display *XDisplay;
-    static int XScreen;
-#endif
 
     priv->rgbsurface = NULL;
     priv->overlay = NULL;
@@ -1635 +1628 @@
 
     priv->X = 0;
 #ifdef HAVE_X11
-    XDisplay = XOpenDisplay(NULL);
-    if(XDisplay) {
+    if(vo_init()) {
                 if(verbose) printf("SDL: deactivating XScreensaver/DPMS\n");
-                XScreen = DefaultScreen(XDisplay);
-                priv->XWidth = DisplayWidth(XDisplay, XScreen);
-                priv->XHeight = DisplayHeight(XDisplay, XScreen);
+                priv->XWidth = vo_screenwidth;
+                priv->XHeight = vo_screenheight;
                 priv->X = 1;
                 if(verbose) printf("SDL: X11 Resolution %ix%i\n", priv->XWidth, priv->XHeight);
-                saver_off(XDisplay);
-                XCloseDisplay(XDisplay);
         }
 #endif