Make both Tags and Windows as valid history targets

1 files changed, 45 insertions, 20 deletions

diff --git a/src/Internal/Marking.hs b/src/Internal/Marking.hs
index 9bf58cd..3ffb411 100644
--- a/src/Internal/Marking.hs
+++ b/src/Internal/Marking.hs
@@ -66,11 +66,25 @@ historyLast :: History a -> Maybe a
 historyLast (History _ (t :<| _)) = Just t
 historyLast _ = Nothing
 
+data Spot =
+        WindowSpot Window | -- Focus is on a window.
+        TagSpot String -- Focus is on an (empty) tag
+        deriving (Read, Show, Eq, Ord)
+
+greedyFocus :: Spot -> X ()
+greedyFocus (WindowSpot win) = do
+     ws <- withWindowSet $ \ss ->
+             return $ getLocationWorkspace =<< findWindow ss win
+ 
+     mapM_ (windows . greedyView . tag) ws
+     focus win
+greedyFocus (TagSpot tag) =
+  windows $ greedyView tag
 
 data MarkState =
   MarkState {
     markStateMap :: Map Mark Window
-  , windowHistory :: History Window
+  , windowHistory :: History Spot
   } deriving (Read, Show)
 
 
@@ -78,21 +92,24 @@ instance ExtensionClass MarkState where
   initialValue = MarkState Map.empty def
   extensionType = PersistentExtension
 
-changeHistory :: (History Window -> History Window) -> (MarkState -> MarkState)
+changeHistory :: (History Spot -> History Spot) -> (MarkState -> MarkState)
 changeHistory fn ms = ms { windowHistory = fn (windowHistory ms)}
 
+withMaybeFocused :: (Maybe Window -> X ()) -> X ()
+withMaybeFocused f = withWindowSet $ f . peek
+
 normalizeWindows :: X ()
 normalizeWindows = do
   MarkState { windowHistory = h } <- XS.get
   mapM_ greedyFocus (historyCurrent h)
 
-greedyFocus :: Window -> X ()
-greedyFocus win = do
-    ws <- withWindowSet $ \ss ->
-            return $ getLocationWorkspace =<< findWindow ss win
-
-    mapM_ (windows . greedyView . tag) ws
-    focus win
+-- greedyFocus :: Window -> X ()
+-- greedyFocus win = do
+--     ws <- withWindowSet $ \ss ->
+--             return $ getLocationWorkspace =<< findWindow ss win
+-- 
+--     mapM_ (windows . greedyView . tag) ws
+--     focus win
 
 markCurrentWindow :: Mark -> X ()
 markCurrentWindow mark = do
@@ -104,16 +121,25 @@ markCurrentWindow mark = do
 
 pushHistory :: X () -> X ()
 pushHistory fn = do
-  withFocused $ \windowBefore -> do
-    withHistory $ \hist ->
-      XS.modify $ changeHistory (historyPush windowBefore)
+  withMaybeFocused $ \maybeWindowBefore -> do
+    case maybeWindowBefore of
+      (Just windowBefore) ->
+        XS.modify $ changeHistory (historyPush (WindowSpot windowBefore))
+      Nothing -> 
+        withWindowSet $ \ws ->
+          XS.modify $ changeHistory (historyPush (TagSpot (currentTag ws)))
 
     fn
 
-    withFocused $ \windowAfter ->
-      XS.modify $ changeHistory (historyPush windowAfter)
+    withMaybeFocused $ \maybeWindowAfter ->
+      case maybeWindowAfter of
+        Just windowAfter ->
+          XS.modify $ changeHistory (historyPush $ WindowSpot windowAfter)
+        Nothing ->
+          withWindowSet $ \ws ->
+            XS.modify $ changeHistory (historyPush $ TagSpot $ currentTag ws)
 
-withHistory :: (History Window -> X ()) -> X ()
+withHistory :: (History Spot -> X ()) -> X ()
 withHistory fn = do
   MarkState { windowHistory = w } <- XS.get
   fn w
@@ -128,9 +154,8 @@ jumpToMark mark = do
   MarkState {markStateMap = m} <- XS.get
   case Map.lookup mark m of
     Nothing -> return ()
-    Just w -> do
-      XS.modify $ changeHistory (historyPush w)
-      greedyFocus w
+    Just w -> pushHistory $
+      greedyFocus (WindowSpot w)
 
 setFocusedWindow :: a -> StackSet i l a s sd -> StackSet i l a s sd
 setFocusedWindow
@@ -155,9 +180,9 @@ swapWithLastMark :: X ()
 swapWithLastMark = pushHistory $ withHistory $ \hist -> do
 
   case historyLast hist of
-    Nothing -> return ()
-    Just win ->
+    Just (WindowSpot win) ->
       windows $ swapWithFocused win
+    Nothing -> return ()
 
 swapWithMark :: Mark -> X ()
 swapWithMark mark = pushHistory $ do