[WIP] Working on better workspaces

1 files changed, 5 insertions, 3 deletions

diff --git a/src/Rahm/Desktop/Marking.hs b/src/Rahm/Desktop/Marking.hs
index 8ca50fd..1144ad7 100644
--- a/src/Rahm/Desktop/Marking.hs
+++ b/src/Rahm/Desktop/Marking.hs
@@ -94,7 +94,7 @@ instance ExtensionClass MarkState where
 changeHistory :: (History Spot -> History Spot) -> (MarkState -> MarkState)
 changeHistory fn ms = ms { windowHistory = fn (windowHistory ms)}
 
-withMaybeFocused :: (Maybe Window -> X ()) -> X ()
+withMaybeFocused :: (Maybe Window -> X a) -> X a
 withMaybeFocused f = withWindowSet $ f . peek
 
 normalizeWindows :: X ()
@@ -118,7 +118,7 @@ markCurrentWindow mark = do
           markStateMap = Map.insert mark win ms
         }
 
-pushHistory :: X () -> X ()
+pushHistory :: X a -> X a
 pushHistory fn = do
   withMaybeFocused $ \maybeWindowBefore -> do
     case maybeWindowBefore of
@@ -128,7 +128,7 @@ pushHistory fn = do
         withWindowSet $ \ws ->
           XS.modify $ changeHistory (historyPush (TagSpot (currentTag ws)))
 
-    fn
+    ret <- fn
 
     withMaybeFocused $ \maybeWindowAfter ->
       case maybeWindowAfter of
@@ -138,6 +138,8 @@ pushHistory fn = do
           withWindowSet $ \ws ->
             XS.modify $ changeHistory (historyPush $ TagSpot $ currentTag ws)
 
+    return ret
+
 withHistory :: (History Spot -> X ()) -> X ()
 withHistory fn = do
   MarkState { windowHistory = w } <- XS.get