From f666cf4e4e0e433ecb067d2a7466eee1a39c7acf Mon Sep 17 00:00:00 2001
From: Tomas Janousek <tomi@nomi.cz>
Date: Wed, 20 Oct 2021 14:16:13 +0100
Subject: [PATCH] X.H.EwmhDesktops: Deprecate standalone hooks

We should get rid of this error-prone interface ASAP, so mark it as
deprecated to give people some time to adapt their configs.
---
 XMonad/Config/Bluetile.hs    | 8 +++-----
 XMonad/Hooks/EwmhDesktops.hs | 7 ++++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/XMonad/Config/Bluetile.hs b/XMonad/Config/Bluetile.hs
index 6a7a13d29e..f7eaa46b2b 100644
--- a/XMonad/Config/Bluetile.hs
+++ b/XMonad/Config/Bluetile.hs
@@ -197,15 +197,13 @@ bluetileLayoutHook = avoidStruts $ minimize $ boringWindows $
             floatingDeco l = buttonDeco shrinkText defaultThemeWithButtons l
 
 bluetileConfig =
-    docks $
+    docks . ewmhFullscreen . ewmh $
     def
         { modMask = mod4Mask,   -- logo key
           manageHook = bluetileManageHook,
           layoutHook = bluetileLayoutHook,
-          logHook = currentWorkspaceOnTop >> ewmhDesktopsLogHook,
-          handleEventHook = ewmhDesktopsEventHook
-                                `mappend` fullscreenEventHook
-                                `mappend` minimizeEventHook
+          logHook = currentWorkspaceOnTop,
+          handleEventHook = minimizeEventHook
                                 `mappend` serverModeEventHook' bluetileCommands
                                 `mappend` positionStoreEventHook,
           workspaces = bluetileWorkspaces,
diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs
index d5872ae8a7..f6dd58ec30 100644
--- a/XMonad/Hooks/EwmhDesktops.hs
+++ b/XMonad/Hooks/EwmhDesktops.hs
@@ -40,7 +40,7 @@ module XMonad.Hooks.EwmhDesktops (
     -- $customActivate
     setEwmhActivateHook,
 
-    -- * Standalone hooks (to be deprecated)
+    -- * Standalone hooks (deprecated)
     ewmhDesktopsStartup,
     ewmhDesktopsLogHook,
     ewmhDesktopsLogHookCustom,
@@ -230,11 +230,13 @@ setEwmhActivateHook h = XC.modifyDef $ \c -> c{ activateHook = h }
 
 
 -- | Initializes EwmhDesktops and advertises EWMH support to the X server.
+{-# DEPRECATED ewmhDesktopsStartup "Use ewmh instead." #-}
 ewmhDesktopsStartup :: X ()
 ewmhDesktopsStartup = setSupported
 
 -- | Notifies pagers and window lists, such as those in the gnome-panel of the
 -- current state of workspaces and windows.
+{-# DEPRECATED ewmhDesktopsLogHook "Use ewmh instead." #-}
 ewmhDesktopsLogHook :: X ()
 ewmhDesktopsLogHook = XC.withDef ewmhDesktopsLogHook'
 
@@ -256,6 +258,7 @@ ewmhDesktopsLogHookCustom f =
 --  * _NET_ACTIVE_WINDOW (activate another window, changing workspace if needed)
 --
 --  * _NET_CLOSE_WINDOW (close window)
+{-# DEPRECATED ewmhDesktopsEventHook "Use ewmh instead." #-}
 ewmhDesktopsEventHook :: Event -> X All
 ewmhDesktopsEventHook = XC.withDef . ewmhDesktopsEventHook'
 
@@ -377,6 +380,7 @@ ewmhFullscreen c = c { startupHook     = startupHook c <+> fullscreenStartup
                      , handleEventHook = handleEventHook c <+> fullscreenEventHook }
 
 -- | Advertises EWMH fullscreen support to the X server.
+{-# DEPRECATED fullscreenStartup "Use ewmhFullscreen instead." #-}
 fullscreenStartup :: X ()
 fullscreenStartup = setFullscreenSupported
 
@@ -385,6 +389,7 @@ fullscreenStartup = setFullscreenSupported
 -- function, such as Totem, Evince and OpenOffice.org.
 --
 -- Note this is not included in 'ewmh'.
+{-# DEPRECATED fullscreenEventHook "Use ewmhFullscreen instead." #-}
 fullscreenEventHook :: Event -> X All
 fullscreenEventHook (ClientMessageEvent _ _ _ dpy win typ (action:dats)) = do
   managed <- isClient win