diff options
Diffstat (limited to 'src/Rahm/Desktop/Keys')
| -rw-r--r-- | src/Rahm/Desktop/Keys/Wml.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Rahm/Desktop/Keys/Wml.hs b/src/Rahm/Desktop/Keys/Wml.hs index 9122ccb..00c8139 100644 --- a/src/Rahm/Desktop/Keys/Wml.hs +++ b/src/Rahm/Desktop/Keys/Wml.hs @@ -8,8 +8,8 @@ -- @a // All windows on workspace 'a' or the workspace with window 'a' -- ,. // The workspace to to the right of the current one. -- @,. // All windows on the workspace to the right of the current one. --- @,^ // All the windows on the screen second from the left --- &z!~@,,^ // The window tagged with z and The last window on the screen third from the left +-- @,^ // All the windows on the screen second from the top (in reading order) +-- &z!~@,,^ // The window tagged with z and The last window on the screen third from the top (in reading order) -- @@s // All the windows that share a workspace with the window tagged s -- \%@s // All windows except those on workspace 's' module Rahm.Desktop.Keys.Wml @@ -480,11 +480,11 @@ readNextWorkspace = case key of (mask, keysym, _) | (Just macro) <- Map.lookup (mask, keysym) macros -> do - pushKeys macro - readNextWorkspace + pushKeys macro + readNextWorkspace (_, _, [ch]) | isAlphaNum ch || ch == '*' -> - return $ justWorkspace [ch] + return $ justWorkspace [ch] (_, _, "[") -> justWorkspace <$> ( lift1 (adjacentWorkspaceNotVisible prev) @@ -518,7 +518,7 @@ readNextWorkspace = ) . head ) - (getHorizontallyOrderedScreens ws) + (getOrderedScreens ws) -- The last workspace in history. (_, _, "'") -> justWorkspace . locationWorkspace <$> liftXMaybe lastLocation @@ -531,7 +531,7 @@ readNextWorkspace = withWindowSet $ \ws -> return $ (fmap (justWorkspace . W.tag . W.workspace . snd) . last) - (getHorizontallyOrderedScreens ws) + (getOrderedScreens ws) -- Modify the next workspace as a "floating" workspace. (Windows sent to -- it will float). (_, _, ":") -> @@ -682,7 +682,7 @@ readNextLocationSet' = -- Windows in a workspace (_, _, s) | s == "\t" || s == "@" || s == "\n" -> - (liftXToFeed . workspaceWindows) =<< readNextWorkspace + (liftXToFeed . workspaceWindows) =<< readNextWorkspace -- The first window in the next window set. (_, _, "!") -> (: []) <$> absorbMaybe (head <$> readNextLocationSet) -- The windows except the first in a window set. |