aboutsummaryrefslogtreecommitdiff
path: root/src/Rahm/Desktop/Workspaces.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Rahm/Desktop/Workspaces.hs')
-rw-r--r--src/Rahm/Desktop/Workspaces.hs27
1 files changed, 1 insertions, 26 deletions
diff --git a/src/Rahm/Desktop/Workspaces.hs b/src/Rahm/Desktop/Workspaces.hs
index f11520a..6c52f01 100644
--- a/src/Rahm/Desktop/Workspaces.hs
+++ b/src/Rahm/Desktop/Workspaces.hs
@@ -6,14 +6,13 @@ import Prelude hiding ((!!))
import Control.Monad.Trans.Maybe
import Control.Arrow (second, (&&&))
-import qualified XMonad.StackSet as W
+import qualified Rahm.Desktop.StackSet as W
import XMonad
import Data.List.Safe ((!!))
import Rahm.Desktop.Common
import Rahm.Desktop.History
-import XMonad.Actions.DynamicWorkspaces
import Data.List (sortOn, sort, sortBy, find)
import Data.Maybe (mapMaybe, fromMaybe)
import Data.Char (isUpper, toUpper, toLower, isAlphaNum)
@@ -75,12 +74,6 @@ getHorizontallyOrderedScreens windowSet =
where
screens = (True, W.current windowSet) : map (False,) (W.visible windowSet)
-shiftToWorkspace :: WorkspaceId -> X ()
-shiftToWorkspace t = do
- addHiddenWorkspace t
- windows . W.shift $ t
-
-
accompaningWorkspace :: WorkspaceId -> WorkspaceId
accompaningWorkspace [s] = return $
if isUpper s
@@ -88,24 +81,6 @@ accompaningWorkspace [s] = return $
else toUpper s
accompaningWorkspace s = s
-swapWorkspace :: WorkspaceId -> X ()
-swapWorkspace toWorkspace = do
- addHiddenWorkspace toWorkspace
- windows $ \ss -> do
- let fromWorkspace = W.tag $ W.workspace $ W.current ss in
- W.StackSet (swapSc fromWorkspace toWorkspace $ W.current ss)
- (map (swapSc fromWorkspace toWorkspace) $ W.visible ss)
- (map (swapWs fromWorkspace toWorkspace) $ W.hidden ss)
- (W.floating ss)
- where
- swapSc fromWorkspace toWorkspace (W.Screen ws a b) =
- W.Screen (swapWs fromWorkspace toWorkspace ws) a b
-
- swapWs fromWorkspace toWorkspace ws@(W.Workspace t' l s)
- | t' == fromWorkspace = W.Workspace toWorkspace l s
- | t' == toWorkspace = W.Workspace fromWorkspace l s
- | otherwise = ws
-
adjacentWorkspaceNotVisible :: Selector -> WorkspaceId -> X WorkspaceId
adjacentWorkspaceNotVisible (Selector selector) from =
withWindowSet $ \ss ->