Merge remote-tracking branch 'origin/v017' into v017

1 files changed, 29 insertions, 12 deletions

diff --git a/src/Rahm/Desktop/Keys.hs b/src/Rahm/Desktop/Keys.hs
index b57d310..ac80561 100644
--- a/src/Rahm/Desktop/Keys.hs
+++ b/src/Rahm/Desktop/Keys.hs
@@ -64,6 +64,8 @@ import Rahm.Desktop.Submap
 import Rahm.Desktop.Swallow
 import Rahm.Desktop.SwapMaster (swapMaster)
 import Rahm.Desktop.Workspaces
+import Rahm.Desktop.Theater
+
 import qualified Rahm.Desktop.StackSet as W
 import Rahm.Desktop.History
 
@@ -281,10 +283,18 @@ keymap = runKeys $ do
       runMaybeT_ $ (lift . gotoWorkspaceFn) =<< readNextWorkspace
 
     shiftMod $
-      doc "Swap a workspace with another workspace." $
-      runMaybeT_ $
-        lift . windows . uncurry W.swapWorkspaces =<<
-          (,) <$> readNextWorkspaceName <*> readNextWorkspaceName
+      doc "Restore the theater marked with the next typed character." $
+      runMaybeT_ $ do
+        mapNextString $ \_ str -> lift $
+          case str of
+            [ch] | isAlpha ch -> restoreTheater [ch]
+            _ -> return ()
+
+    -- shiftMod $
+    --   doc "Swap a workspace with another workspace." $
+    --   runMaybeT_ $
+    --     lift . windows . uncurry W.swapWorkspaces =<<
+    --       (,) <$> readNextWorkspaceName <*> readNextWorkspaceName
 
     controlMod $
       doc "Move the current focused window to another workspace and view that workspace" $
@@ -400,18 +410,25 @@ keymap = runKeys $ do
       doc "For mosaic layout, shrink the size-share of the current window" $
       sendMessage =<< shrinkPositionAlt
 
-  bind xK_m $
+  bind xK_m $ do
     justMod $
       doc "Mark the current window with the next typed character." $ do
       locs <- fromMaybe [] <$> runMaybeT readNextLocationSet
       let wins = mapMaybe locationWindow locs
-      withBorderWidth 4 wins $
-        withBorderColor "#00ffff" wins $ do
-          runMaybeT_ $ do
-           mapNextString $ \_ str -> lift $
-            case str of
-              [ch] | isAlpha ch -> markAllLocations str locs
-              _ -> return ()
+      withBorderColor "#00ffff" wins $ do
+        runMaybeT_ $ do
+         mapNextString $ \_ str -> lift $
+          case str of
+            [ch] | isAlpha ch -> markAllLocations str locs
+            _ -> return ()
+
+    shiftMod $
+      doc "Mark the current theater with the next typed character." $
+      runMaybeT_ $ do
+        mapNextString $ \_ str -> lift $
+          case str of
+            [ch] | isAlpha ch -> saveCurrentTheater str
+            _ -> return ()
 
   bind xK_plus $ do
     justMod $