Merge branch 'X11Libre:master' into master

dix/screen.c

@@ -23,6 +23,7 @@ void dixFreeScreen(ScreenPtr pScreen)
     DeleteCallbackList(&pScreen->hookWindowDestroy);
     DeleteCallbackList(&pScreen->hookWindowPosition);
     DeleteCallbackList(&pScreen->hookClose);
+    DeleteCallbackList(&pScreen->hookPostClose);
     DeleteCallbackList(&pScreen->hookPixmapDestroy);
     free(pScreen);
 }

dix/screen_hooks.c

@@ -28,6 +28,7 @@
 DECLARE_HOOK_PROC(WindowDestroy, hookWindowDestroy, XorgScreenWindowDestroyProcPtr);
 DECLARE_HOOK_PROC(WindowPosition, hookWindowPosition, XorgScreenWindowPositionProcPtr);
 DECLARE_HOOK_PROC(Close, hookClose, XorgScreenCloseProcPtr);
+DECLARE_HOOK_PROC(PostClose, hookPostClose, XorgScreenCloseProcPtr);
 DECLARE_HOOK_PROC(PixmapDestroy, hookPixmapDestroy, XorgScreenPixmapDestroyProcPtr);
 DECLARE_HOOK_PROC(PostCreateResources, hookPostCreateResources,
                   XorgScreenPostCreateResourcesProcPtr);
@@ -71,6 +72,8 @@ void dixScreenRaiseClose(ScreenPtr pScreen) {
 
     if (pScreen->CloseScreen)
         pScreen->CloseScreen(pScreen);
+
+    CallCallbacks(&pScreen->hookPostClose, NULL);
 }
 
 void dixScreenRaisePixmapDestroy(PixmapPtr pPixmap)

dix/screen_hooks_priv.h

@@ -147,6 +147,37 @@ _X_EXPORT
 void dixScreenUnhookClose(ScreenPtr pScreen,
                           XorgScreenCloseProcPtr func);
 
+/**
+ * @brief register a screen post close notify hook on the given screen
+ *
+ * @param pScreen pointer to the screen to register the notify hook into
+ * @param func pointer to the hook function
+ *
+ * In contrast to Close hook, it's called *after* the driver's CloseScreen()
+ * proc had been called.
+ *
+ * When registration fails, the server aborts.
+ **/
+void dixScreenHookPostClose(ScreenPtr pScreen,
+                            XorgScreenCloseProcPtr func);
+
+/**
+ * @brief unregister a screen close notify hook on the given screen
+ *
+ * @param pScreen pointer to the screen to unregister the hook from
+ * @param func pointer to the hook function
+ * @param arg opaque pointer passed to the destructor
+ *
+ * @see dixScreenHookPostClose
+ *
+ * Unregister a screen close notify hook registered via @ref dixScreenHookPostClose
+ *
+ * In contrast to Close hook, it's called *after* the driver's CloseScreen()
+ * proc had been called.
+ **/
+void dixScreenUnhookPostClose(ScreenPtr pScreen,
+                              XorgScreenCloseProcPtr func);
+
 /* prototype of pixmap destroy notification handler */
 typedef void (*XorgScreenPixmapDestroyProcPtr)(CallbackListPtr *pcbl,
                                                ScreenPtr pScreen,

include/scrnintstr.h

@@ -696,6 +696,10 @@ typedef struct _Screen {
     CallbackListPtr hookPostCreateResources;
 
     SetWindowVRRModeProcPtr SetWindowVRRMode;
+
+    /* additional screen post-close notify hooks (replaces wrapping CloseScreen)
+       should NOT be touched outside of DIX core */
+    CallbackListPtr hookPostClose;
 } ScreenRec;
 
 static inline RegionPtr

miext/damage/damage.c

@@ -1569,7 +1569,7 @@ damageWindowDestroy(CallbackListPtr *pcbl, ScreenPtr pScreen, WindowPtr pWindow)
 
 static void damageCloseScreen(CallbackListPtr *pcbl, ScreenPtr pScreen, void *unused)
 {
-    dixScreenUnhookClose(pScreen, damageCloseScreen);
+    dixScreenUnhookPostClose(pScreen, damageCloseScreen);
     dixScreenUnhookWindowDestroy(pScreen, damageWindowDestroy);
     dixScreenUnhookPixmapDestroy(pScreen, damagePixmapDestroy);
 
@@ -1667,7 +1667,7 @@ DamageSetup(ScreenPtr pScreen)
     pScrPriv->internalLevel = 0;
     pScrPriv->pScreenDamage = 0;
 
-    dixScreenHookClose(pScreen, damageCloseScreen);
+    dixScreenHookPostClose(pScreen, damageCloseScreen);
     dixScreenHookWindowDestroy(pScreen, damageWindowDestroy);
     dixScreenHookPixmapDestroy(pScreen, damagePixmapDestroy);