mi: Factor out miSaveScreen

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>

5 files changed, 9 insertions, 55 deletions

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 407f2afcd..df4d2701b 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -461,12 +461,6 @@ vfbStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs)
     }
 }
 
-static Bool
-vfbSaveScreen(ScreenPtr pScreen, int on)
-{
-    return TRUE;
-}
-
 #ifdef HAVE_MMAP
 
 /* this flushes any changes to the screens out to the mmapped file */
@@ -935,8 +929,6 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
        return FALSE;
 
     pScreen->InstallColormap = vfbInstallColormap;
-
-    pScreen->SaveScreen = vfbSaveScreen;
     pScreen->StoreColors = vfbStoreColors;
 
     miDCInitialize(pScreen, &vfbPointerCursorFuncs);
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index c701eb6ac..d8027c9b6 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -172,20 +172,6 @@ DarwinPrintBanner(void)
 }
 
 /*
- * DarwinSaveScreen
- *  X screensaver support. Not implemented.
- */
-static Bool
-DarwinSaveScreen(ScreenPtr pScreen, int on)
-{
-    // FIXME
-    if (on == SCREEN_SAVER_FORCER) {}
-    else if (on == SCREEN_SAVER_ON) {}
-    else {}
-    return TRUE;
-}
-
-/*
  * DarwinScreenInit
  *  This is a callback from dix during AddScreen() from InitOutput().
  *  Initialize the screen and communicate information about it back to dix.
@@ -271,9 +257,6 @@ DarwinScreenInit(ScreenPtr pScreen, int argc, char **argv)
     ShmRegisterFbFuncs(pScreen);
 #endif
 
-    // this must be initialized (why doesn't X have a default?)
-    pScreen->SaveScreen = DarwinSaveScreen;
-
     // finish mode dependent screen setup including cursor support
     if (!QuartzSetupScreen(pScreen->myNum, pScreen)) {
         return FALSE;
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 96b4db18c..4b27ee627 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -614,12 +614,6 @@ xwl_unrealize_window(WindowPtr window)
     return ret;
 }
 
-static Bool
-xwl_save_screen(ScreenPtr pScreen, int on)
-{
-    return TRUE;
-}
-
 static void
 frame_callback(void *data,
                struct wl_callback *callback,
@@ -1066,8 +1060,6 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
     SetNotifyFd(xwl_screen->wayland_fd, socket_handler, X_NOTIFY_READ, xwl_screen);
     RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, xwl_screen);
 
-    pScreen->SaveScreen = xwl_save_screen;
-
     pScreen->blackPixel = 0;
     pScreen->whitePixel = 1;
 
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index a44e21fbd..c44df565f 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -64,17 +64,6 @@ static RootlessFrameProcsRec winMWExtWMProcs = {
 #endif
 
 /*
- * Prototypes
- */
-
-/*
- * Local functions
- */
-
-static Bool
- winSaveScreen(ScreenPtr pScreen, int on);
-
-/*
  * Determine what type of screen we are initializing
  * and call the appropriate procedure to intiailize
  * that type of screen.
@@ -327,9 +316,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         pScreen->whitePixel = 1;
     }
 
-    /* Place our save screen function */
-    pScreen->SaveScreen = winSaveScreen;
-
     /* Finish fb initialization */
     if (!fbFinishScreenInit(pScreen,
                             pScreenInfo->pfb,
@@ -552,10 +538,3 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 
     return TRUE;
 }
-
-/* See Porting Layer Definition - p. 33 */
-static Bool
-winSaveScreen(ScreenPtr pScreen, int on)
-{
-    return TRUE;
-}
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 9c6af0dc7..f38298266 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -124,6 +124,12 @@ miCloseScreen(ScreenPtr pScreen)
     return ((*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate));
 }
 
+static Bool
+miSaveScreen(ScreenPtr pScreen, int on)
+{
+    return TRUE;
+}
+
 /* With the introduction of pixmap privates, the "screen pixmap" can no
  * longer be created in miScreenInit, since all the modules that could
  * possibly ask for pixmap private space have not been initialized at
@@ -242,7 +248,9 @@ miScreenInit(ScreenPtr pScreen, void *pbits,  /* pointer to screen bits */
         pScreen->CloseScreen = miCloseScreen;
     }
     /* else CloseScreen */
-    /* QueryBestSize, SaveScreen, GetImage, GetSpans */
+    /* QueryBestSize */
+    pScreen->SaveScreen = miSaveScreen;
+    /* GetImage, GetSpans */
     pScreen->SourceValidate = (SourceValidateProcPtr) 0;
     /* CreateWindow, DestroyWindow, PositionWindow, ChangeWindowAttributes */
     /* RealizeWindow, UnrealizeWindow */