diff options
Diffstat (limited to 'src/Rahm')
| -rw-r--r-- | src/Rahm/Desktop/Keys.hs | 8 | ||||
| -rw-r--r-- | src/Rahm/Desktop/Keys/Wml.hs | 8 | ||||
| -rw-r--r-- | src/Rahm/Desktop/Workspaces.hs | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/Rahm/Desktop/Keys.hs b/src/Rahm/Desktop/Keys.hs index 9a6d895..4848998 100644 --- a/src/Rahm/Desktop/Keys.hs +++ b/src/Rahm/Desktop/Keys.hs @@ -120,7 +120,7 @@ import Rahm.Desktop.Theater ) import Rahm.Desktop.WorkspaceWheel (displayWorkspaceWheel, displayWorkspaceWheelAtPoint, displayWorkspaceWheelInCenter) import Rahm.Desktop.Workspaces - ( accompaningWorkspace, + ( accompanyingWorkspace, next, prev, viewAdjacent, @@ -447,7 +447,7 @@ bindings = do \(: The previous workspace.\n\t\t\ \}: The workspace on the screen to the right\n\t\t\ \{: The workspace on the screen to the left\n\t\t\ - \<space>: The accompaningWorkspace (toggled case)\n\t\t\ + \<space>: The accompanyingWorkspace (toggled case)\n\t\t\ \/: Prompt to select a window, and reference that workspace\n\t\t\ \^: The first populated workspace\n\t\t\ \$: The last populated workspace\n\t\t\ @@ -1176,9 +1176,9 @@ bindings = do subbind $ do bind button13 $ noMod $ - doc "Goto the accompaning workspace to the current one." $ + doc "Goto the accompanying workspace to the current one." $ noWindow $ - gotoWorkspace . accompaningWorkspace =<< getCurrentWorkspace + gotoWorkspace . accompanyingWorkspace =<< getCurrentWorkspace bind button15 $ do noMod $ diff --git a/src/Rahm/Desktop/Keys/Wml.hs b/src/Rahm/Desktop/Keys/Wml.hs index 86bc921..d3e741b 100644 --- a/src/Rahm/Desktop/Keys/Wml.hs +++ b/src/Rahm/Desktop/Keys/Wml.hs @@ -518,13 +518,13 @@ readNextWorkspace = winLocation <- W.findWindow ws win justWorkspaceWithPreferredWindow win . W.tag <$> W.getLocationWorkspace winLocation - -- The accompaning worksapce to the next read workspace. + -- The accompanying worksapce to the next read workspace. (_, _, "~") -> - justWorkspace . accompaningWorkspace <$> readNextWorkspaceName - -- The accompaning workspace to the current workspace (equivalent to ~.) + justWorkspace . accompanyingWorkspace <$> readNextWorkspaceName + -- The accompanying workspace to the current workspace (equivalent to ~.) (_, _, " ") -> liftXToFeed $ - justWorkspace . accompaningWorkspace <$> getCurrentWorkspace + justWorkspace . accompanyingWorkspace <$> getCurrentWorkspace -- The balck hole workspace (_, _, "_") -> return blackHoleWorkspace diff --git a/src/Rahm/Desktop/Workspaces.hs b/src/Rahm/Desktop/Workspaces.hs index 49dcaae..47a4e31 100644 --- a/src/Rahm/Desktop/Workspaces.hs +++ b/src/Rahm/Desktop/Workspaces.hs @@ -7,7 +7,7 @@ module Rahm.Desktop.Workspaces firstWorkspaceId, windowsInCurrentWorkspace, getHorizontallyOrderedScreens, - accompaningWorkspace, + accompanyingWorkspace, adjacentWorkspaceNotVisible, adjacentWorkspace, viewAdjacent, @@ -146,18 +146,18 @@ getScreensOnDifferentPlane ss = | (SD (Rectangle _ y _ h)) <- W.screenDetail (W.current ss) = yCenter < y + fromIntegral h && yCenter > y -accompaningWorkspace :: WorkspaceId -> WorkspaceId -accompaningWorkspace [s] +accompanyingWorkspace :: WorkspaceId -> WorkspaceId +accompanyingWorkspace [s] | isDigit s = show (fl (ord s - ord '0')) where fl x | even x = x + 1 fl x = x - 1 -accompaningWorkspace [s] = +accompanyingWorkspace [s] = return $ if isUpper s then toLower s else toUpper s -accompaningWorkspace s = s +accompanyingWorkspace s = s adjacentWorkspaceNotVisible :: Selector -> WorkspaceId -> X WorkspaceId adjacentWorkspaceNotVisible (Selector selector) from = |