Add multi-select Rofi support and allow multiselect for windows.

1 files changed, 17 insertions, 8 deletions

diff --git a/src/Rahm/Desktop/Keys/Wml.hs b/src/Rahm/Desktop/Keys/Wml.hs
index def3b27..5565c31 100644
--- a/src/Rahm/Desktop/Keys/Wml.hs
+++ b/src/Rahm/Desktop/Keys/Wml.hs
@@ -71,6 +71,11 @@ import qualified Data.Map as Map
 import Data.Maybe (catMaybes, fromJust, fromMaybe)
 import Data.Ord (Down (..))
 import Data.Typeable (cast)
+-- getMostRecentLocationInHistory,
+
+-- pastHistory,
+
+import Rahm.Desktop.BorderColors (BorderColor (BorderColor), setBorderColor)
 import Rahm.Desktop.Common
   ( Location (..),
     askWindowId,
@@ -81,10 +86,8 @@ import Rahm.Desktop.Common
     windowsInWorkspace,
   )
 import Rahm.Desktop.History
-  ( -- getMostRecentLocationInHistory,
-    lastLocation,
+  ( lastLocation,
     nextLocation,
-    -- pastHistory,
   )
 import Rahm.Desktop.Layout.PinWindow (pinnedWindows)
 import Rahm.Desktop.Logger (LogLevel (Info, Trace), logs)
@@ -143,7 +146,6 @@ import XMonad
 import XMonad.Prompt.ConfirmPrompt (confirmPrompt)
 import qualified XMonad.Util.ExtensibleState as XS (get, modify, put)
 import Prelude hiding (head, last)
-import Rahm.Desktop.BorderColors (setBorderColor, BorderColor (BorderColor))
 
 type KeyString = [(KeyMask, KeySym, String)]
 
@@ -183,7 +185,6 @@ saveMacros = do
   macros <- getMacros
   io $ writeFile dataFile $ show macros
 
-
 selColor = BorderColor "#ffff00" "#b8b880"
 
 insertWorkspaceMacroString :: (KeyMask, KeySym) -> KeyString -> X ()
@@ -527,7 +528,7 @@ readNextWorkspace =
 
       -- The workspace with the searched for window.
       (_, _, "/") -> fromMaybeTX $ do
-        justWorkspace <$> ((MaybeT . workspaceWithWindow) =<< MaybeT ((head =<<) <$> askWindowId))
+        justWorkspace <$> ((MaybeT . workspaceWithWindow) =<< MaybeT (head <$> askWindowId))
 
       -- The workspace with the next read window on it.
       (_, _, "@") -> do
@@ -583,6 +584,14 @@ readNextWorkspace =
     mt :: (KeyFeeder m) => X a -> MaybeT m a
     mt = lift . fromX
 
+nonempty :: (Monad m) => m [a] -> MaybeT m [a]
+nonempty l = MaybeT $ do
+  l
+    >>= ( \case
+            [] -> return Nothing
+            a -> return (Just a)
+        )
+
 readNextLocationSet :: (KeyFeeder m) => MaybeT m [Location]
 readNextLocationSet = do
   (WindowSelect mp) <- MaybeT (Just <$> fromX XS.get)
@@ -640,7 +649,7 @@ readNextLocationSet' =
       -- Search for the windows.
       (_, _, "/") ->
         fromMaybeTX $
-          mapM windowLocation =<< MaybeT askWindowId
+          mapM windowLocation =<< nonempty askWindowId
       -- All windows.
       (_, _, "%") -> fromMaybeTX $ do
         ret <- mapM windowLocation =<< lift (withWindowSet (return . sortOn Down . W.allWindows))
@@ -650,7 +659,7 @@ readNextLocationSet' =
       -- Windows in a workspace
       (_, _, s)
         | s == "\t" || s == "@" || s == "\n" ->
-          (mt . windowsInWorkspace) =<< readNextWorkspaceName
+            (mt . windowsInWorkspace) =<< readNextWorkspaceName
       -- The first window in the next window set.
       (_, _, "!") -> (: []) <$> joinMaybe (head <$> readNextLocationSet)
       -- The windows except the first in a window set.