From a04150657e74e4a3dc0bce7f70ff83bd2ce42e90 Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Sat, 19 Jun 2021 15:32:43 -0400
Subject: [PATCH] ENH warn user if deps are missing

---
 bin/xmonad.hs                | 19 +++++++++++--------
 lib/XMonad/Internal/Shell.hs |  8 ++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/bin/xmonad.hs b/bin/xmonad.hs
index 1a80564..b06fd2e 100644
--- a/bin/xmonad.hs
+++ b/bin/xmonad.hs
@@ -74,10 +74,11 @@ main = do
         , childPIDs = [p]
         , childHandles = [h]
         }
-  ekbs <- evalExternal $ externalBindings ts
+  (ekbs, missing) <- fmap filterExternal $ evalExternal $ externalBindings ts
+  mapM_ warnMissing missing
   launch
     $ ewmh
-    $ addKeymap (filterExternal ekbs)
+    $ addKeymap ekbs
     $ def { terminal = myTerm
           , modMask = myModMask
           , layoutHook = myLayouts
@@ -463,13 +464,15 @@ evalExternal = mapM go
 evalKeyBinding :: Monad m => KeyBinding (m a) -> m (KeyBinding a)
 evalKeyBinding k@KeyBinding { kbAction = a } = (\b -> k { kbAction = b }) <$> a
 
-filterExternal :: [KeyGroup MaybeX] -> [KeyGroup (X ())]
-filterExternal = fmap go
+filterExternal :: [KeyGroup MaybeX] -> ([KeyGroup (X ())], [Dependency])
+filterExternal kgs = let kgs' = fmap go kgs in (fst <$> kgs', concatMap snd kgs')
   where
-    go k@KeyGroup { kgBindings = bs } =
-      k { kgBindings = mapMaybe go' bs }
-    go' k@KeyBinding { kbAction = Installed x _ } = Just $ k { kbAction = x }
-    go' _                                         = Nothing
+    go k@KeyGroup { kgBindings = bs } = let bs' = go' <$> bs in
+      (k { kgBindings = mapMaybe fst bs' }, concatMap snd bs')
+    go' k@KeyBinding { kbAction = a } = case a of
+      Installed x ds -> (Just $ k { kbAction = x }, fmap Optional ds)
+      Missing ds     -> (Nothing, ds)
+      Ignore         -> (Nothing, [])
 
 externalBindings :: ThreadState -> [KeyGroup (IO MaybeX)]
 externalBindings ts =
diff --git a/lib/XMonad/Internal/Shell.hs b/lib/XMonad/Internal/Shell.hs
index a273d44..870cadb 100644
--- a/lib/XMonad/Internal/Shell.hs
+++ b/lib/XMonad/Internal/Shell.hs
@@ -7,6 +7,7 @@ module XMonad.Internal.Shell
   , MaybeX
   , IOMaybeX
   , runIfInstalled
+  , warnMissing
   , whenInstalled
   , spawnIfInstalled
   , spawnCmdIfInstalled
@@ -45,6 +46,13 @@ type MaybeX = MaybeExe X
 
 type IOMaybeX = IO MaybeX
 
+warnMissing :: Dependency -> IO ()
+warnMissing d            = case d of
+  Required d' -> warn "required" d'
+  Optional d' -> warn "optional" d'
+  where
+    warn t n = putStrLn $ "WARNING: " ++ t ++ " executable not found: " ++ n
+
 exeInstalled :: String -> IO Bool
 exeInstalled x = isJust <$> findExecutable x