diff options
Diffstat (limited to 'src/Rahm/Desktop/Keys.hs')
| -rw-r--r-- | src/Rahm/Desktop/Keys.hs | 390 |
1 files changed, 188 insertions, 202 deletions
diff --git a/src/Rahm/Desktop/Keys.hs b/src/Rahm/Desktop/Keys.hs index f508155..76634b0 100644 --- a/src/Rahm/Desktop/Keys.hs +++ b/src/Rahm/Desktop/Keys.hs @@ -42,7 +42,6 @@ import Graphics.X11.ExtraTypes.XF86 import Rahm.Desktop.Common ( Location (..), click, - duplWindow, focusLocation, getCurrentWorkspace, gotoWorkspace, @@ -52,7 +51,7 @@ import Rahm.Desktop.Common runMaybeT_, setBorderColor, withBorderColor, - withBorderColorM, + withBorderColorM, duplWindow, ) import Rahm.Desktop.DMenu (runDMenu) import qualified Rahm.Desktop.Dragging as D @@ -132,7 +131,6 @@ import Rahm.Desktop.Marking setAlternateWorkspace, ) import Rahm.Desktop.PassMenu (runPassMenu) -import Rahm.Desktop.PinWindow (togglePinWindow) import Rahm.Desktop.RebindKeys ( remapKey, sendKey, @@ -309,7 +307,7 @@ keymap = runKeys $ do justMod $ doc "Run the command which opened this window again." $ X.withFocused duplWindow - + bind xK_w $ do justMod $ doc "Swap windows with other windows" $ @@ -328,20 +326,19 @@ keymap = runKeys $ do lift $ do setAlternateWindows (l1'' ++ l2') windows $ W.swapWindows $ zip l1'' l2' ++ zip l2' l1'' - shiftMod - $ doc + shiftMod $ + doc "Swap two workspaces (or rename the current one). \ \(only works on normal workspaces)." - $ pushPendingBuffer "W " - $ do - logs Debug "%s" . W.dbgStackSet =<< gets windowset - runMaybeT_ $ do - w1 <- readNextWorkspaceName - wins <- lift $ W.windowsOnWorkspace w1 <$> gets windowset - withBorderColorM "#00ffff" wins $ do - lift $ addStringToPendingBuffer " " - w2 <- readNextWorkspaceName - lift $ windows $ W.swapWorkspaces w1 w2 + $ pushPendingBuffer "W " $ do + logs Debug "%s" . W.dbgStackSet =<< gets windowset + runMaybeT_ $ do + w1 <- readNextWorkspaceName + wins <- lift $ W.windowsOnWorkspace w1 <$> gets windowset + withBorderColorM "#00ffff" wins $ do + lift $ addStringToPendingBuffer " " + w2 <- readNextWorkspaceName + lift $ windows $ W.swapWorkspaces w1 w2 bind xK_BackSpace $ do -- The only raw keybinding. Meant to get a terminal to unbrick XMonad if @@ -449,8 +446,8 @@ keymap = runKeys $ do sendMessage flipHorizontally bind xK_g $ do - justMod - $ doc + justMod $ + doc "Goto To a workspace\n\n\t\ \Workspacs are alphanumeric characters. So if the next key typed is an\n\t\ \alphanumeric character, that's the workspace to operate on\n\n\ @@ -469,58 +466,58 @@ keymap = runKeys $ do \_: Black hole. Sending a window here closes it.\n\n\t\ \Other keybindings starting with H-g\n\t\t\ \F1: display this help.\n\n\t" - $ pushPendingBuffer "g " - $ runMaybeT_ - $ (lift . gotoWorkspaceFn) =<< readNextWorkspace + $ pushPendingBuffer "g " $ + runMaybeT_ $ + (lift . gotoWorkspaceFn) =<< readNextWorkspace - shiftMod - $ doc + shiftMod $ + doc "Switch a workspace with another workspace. \ \This is a more powerful version of the 'g' command, which does not\ \assume the current workspace.\ \which takes two workspaces as arguments and switches them whereas\ \the 'g' command operates only on the current workspace (.).\ \thereby G.<ws> is the same as g<ws>" - $ do - pushPendingBuffer "G " $ do - runMaybeT_ $ do - w1 <- readNextWorkspaceName - lift $ addStringToPendingBuffer " " - w2 <- readNextWorkspaceName - lift $ windows $ W.switchWorkspaces w1 w2 + $ do + pushPendingBuffer "G " $ do + runMaybeT_ $ do + w1 <- readNextWorkspaceName + lift $ addStringToPendingBuffer " " + w2 <- readNextWorkspaceName + lift $ windows $ W.switchWorkspaces w1 w2 bind xK_d $ justMod $ doc "Record (define) macros." $ subkeys $ do - bind xK_w - $ noMod - $ doc - "Record a windowset macro.\n\n\t\ - \To record a 'windowset' macro, type <M-d>w<key> and then\n\t\ - \type a character sequence followed by Enter. Now <key> can\n\t\ - \be used anywhere a 'windowset' is required and that macro\n\t\ - \will be used.\n\n\t\ - \For example, if one wants to define '+' as 'all windows \n\t\ - \not on the current workspace, one can type:\n\n\t\ - \<M-d>w+\\%@.<Enter>\n" - $ pushPendingBuffer "Win Macro " - $ runMaybeT_ readWindowsetMacro - - bind xK_t - $ noMod - $ doc - "Record a workspace macro\n\n\t\ - \To record a 'workspace' macro, type <M-d>t<key> and then\n\t\ - \type a character sequence followed by Enter. Now <key> can\n\t\ - \be used anywhere a 'workspace' is required and that macro\n\t\ - \will be used.\n\n\t\ - \For example, if one wants to define '<c-s>' as 'the workspace with\n\t\ - \the window 's' on it or the last workspace if already on that \n\t\ - \workspace (more useful that one would think):\n\n\t\ - \<M-d>t<c-s>?&s@.'s<Enter>\n" - $ pushPendingBuffer "Wksp Macro " - $ runMaybeT_ readWorkspaceMacro + bind xK_w $ + noMod $ + doc + "Record a windowset macro.\n\n\t\ + \To record a 'windowset' macro, type <M-d>w<key> and then\n\t\ + \type a character sequence followed by Enter. Now <key> can\n\t\ + \be used anywhere a 'windowset' is required and that macro\n\t\ + \will be used.\n\n\t\ + \For example, if one wants to define '+' as 'all windows \n\t\ + \not on the current workspace, one can type:\n\n\t\ + \<M-d>w+\\%@.<Enter>\n" + $ pushPendingBuffer "Win Macro " $ + runMaybeT_ readWindowsetMacro + + bind xK_t $ + noMod $ + doc + "Record a workspace macro\n\n\t\ + \To record a 'workspace' macro, type <M-d>t<key> and then\n\t\ + \type a character sequence followed by Enter. Now <key> can\n\t\ + \be used anywhere a 'workspace' is required and that macro\n\t\ + \will be used.\n\n\t\ + \For example, if one wants to define '<c-s>' as 'the workspace with\n\t\ + \the window 's' on it or the last workspace if already on that \n\t\ + \workspace (more useful that one would think):\n\n\t\ + \<M-d>t<c-s>?&s@.'s<Enter>\n" + $ pushPendingBuffer "Wksp Macro " $ + runMaybeT_ readWorkspaceMacro bind xK_h $ do justMod $ @@ -570,22 +567,14 @@ keymap = runKeys $ do doc "Lock the screen" $ spawnX "xsecurelock" - bind xK_p $ do - justMod $ - doc "Pin a window to the screen" $ - pushPendingBuffer "p " $ do - runMaybeT_ $ do - wins <- mapMaybe locationWindow <$> readNextLocationSet - lift $ mapM_ togglePinWindow wins - bind xK_minus $ do - justMod - $ doc + justMod $ + doc "Decrease the number of windows in the master region, or decrease\n\t\ \the size of the master region if the current layout cannot have more\n\t\ \than one window in the master region." - $ sendMessage - $ IncMasterN (-1) + $ sendMessage $ + IncMasterN (-1) shiftMod $ doc "For mosaic layout, shrink the size-share of the current window" $ @@ -620,31 +609,31 @@ keymap = runKeys $ do flip whenJust toggleWindowInSelection =<< withWindowSet (return . W.peek) bind xK_m $ do - justMod - $ doc + justMod $ + doc "Mark the windows described by the window set with a given character.\n\n\t\ \For example, to mark the current window use <M-m>.<character>. That window\n\n\t\ \can then be recalled anywhere that requires a WML window.\n" - $ do - pushPendingBuffer "m " $ do - locs <- fromMaybe [] <$> runMaybeT readNextLocationSet - let wins = mapMaybe locationWindow locs - unless (null wins) $ do - withBorderColor "#00ffff" wins $ do - runMaybeT_ $ do - mapNextString $ \_ str -> lift $ - case str of - [ch] | isAlpha ch -> markAllLocations str locs - _ -> return () + $ do + pushPendingBuffer "m " $ do + locs <- fromMaybe [] <$> runMaybeT readNextLocationSet + let wins = mapMaybe locationWindow locs + unless (null wins) $ do + withBorderColor "#00ffff" wins $ do + runMaybeT_ $ do + mapNextString $ \_ str -> lift $ + case str of + [ch] | isAlpha ch -> markAllLocations str locs + _ -> return () bind xK_plus $ do - justMod - $ doc + justMod $ + doc "Increase the number of windows in the master region, or increase\n\t\ \the size of the master region if the current layout cannot have more\n\t\ \than one window in the master region.\n" - $ sendMessage - $ IncMasterN 1 + $ sendMessage $ + IncMasterN 1 shiftMod $ doc "For mosaic layout, increase the size-share of the current window." $ @@ -663,8 +652,8 @@ keymap = runKeys $ do bind xK_s $ do forM_ [(JustShift, justMod), (ShiftAndSwap, shiftMod), (ShiftAndFollow, controlMod)] $ \(shiftType, f) -> - f - $ doc + f $ + doc ( case shiftType of ShiftAndFollow -> "Shift-and-follow: Like shift-and-swap with the implicit \ @@ -676,54 +665,54 @@ keymap = runKeys $ do \Note that this command will only work with normal workspaces." JustShift -> "Shift a windowset to a workspace" ) - $ pushPendingBuffer - ( case shiftType of - ShiftAndSwap -> "S " - JustShift -> "s " - ShiftAndFollow -> "^s " - ) - $ runMaybeT_ - $ do - stackset <- lift $ X.windowset <$> X.get - selection <- mapMaybe locationWindow <$> readNextLocationSet - - withBorderColorM "#00ffff" selection $ do - lift $ addStringToPendingBuffer " " - ws <- readNextWorkspace - finalSwap <- - case shiftType of - ShiftAndSwap -> do + $ pushPendingBuffer + ( case shiftType of + ShiftAndSwap -> "S " + JustShift -> "s " + ShiftAndFollow -> "^s " + ) + $ runMaybeT_ $ + do + stackset <- lift $ X.windowset <$> X.get + selection <- mapMaybe locationWindow <$> readNextLocationSet + + withBorderColorM "#00ffff" selection $ do lift $ addStringToPendingBuffer " " - wsName <- MaybeT . return $ workspaceName ws - W.switchWorkspaces wsName <$> readNextWorkspaceName - _ -> return id - - lift $ do - (Endo allMovements) <- - mconcat - <$> mapM (fmap Endo . moveWindowToWorkspaceFn ws) selection - - setAlternateWindows selection - - forM_ selection $ \win -> do - mapM_ - ( \t -> do - logs Debug "Set alternate workspace %s -> %s" (show win) t - setAlternateWorkspace win t - ) - (W.findTag win stackset) - - windows $ - finalSwap - . ( \ss -> - case shiftType of - ShiftAndFollow - | (w : _) <- selection, - Just ws <- W.findTag w ss -> - W.greedyView ws ss - _ -> ss - ) - . allMovements + ws <- readNextWorkspace + finalSwap <- + case shiftType of + ShiftAndSwap -> do + lift $ addStringToPendingBuffer " " + wsName <- MaybeT . return $ workspaceName ws + W.switchWorkspaces wsName <$> readNextWorkspaceName + _ -> return id + + lift $ do + (Endo allMovements) <- + mconcat + <$> mapM (fmap Endo . moveWindowToWorkspaceFn ws) selection + + setAlternateWindows selection + + forM_ selection $ \win -> do + mapM_ + ( \t -> do + logs Debug "Set alternate workspace %s -> %s" (show win) t + setAlternateWorkspace win t + ) + (W.findTag win stackset) + + windows $ + finalSwap + . ( \ss -> + case shiftType of + ShiftAndFollow + | (w : _) <- selection, + Just ws <- W.findTag w ss -> + W.greedyView ws ss + _ -> ss + ) + . allMovements altMod $ spawnX "sudo -A systemctl suspend && xsecurelock" @@ -778,25 +767,25 @@ keymap = runKeys $ do sendMessage resetHole logs Debug "/reset hole" - bind xK_g - $ (noMod -|- justMod) - $ doc - "Switch to a different theater.\n\n\t\ - \Theaters are like super-workspaces. They are used for different\n\t\ - \'contexts'. Theaters share all the windows with eachother, but\n\t\ - \but each theater has its own mappings for window -> workspace. i.e.\n\t\ - \one theater can have window 'x' on workspace 'y', but another might\n\t\ - \have 'x' on 'z' instead. If a theater does explicity place a window,\n\t\ - \the window is placed in the hidden workspace (which is '*')\n" - $ do - addStringToPendingBuffer " g " - runMaybeT_ $ - do - mapNextString $ \_ str -> lift $ - case str of - [ch] | isAlpha ch -> restoreTheater (Just [ch]) - [' '] -> restoreTheater Nothing - _ -> return () + bind xK_g $ + (noMod -|- justMod) $ + doc + "Switch to a different theater.\n\n\t\ + \Theaters are like super-workspaces. They are used for different\n\t\ + \'contexts'. Theaters share all the windows with eachother, but\n\t\ + \but each theater has its own mappings for window -> workspace. i.e.\n\t\ + \one theater can have window 'x' on workspace 'y', but another might\n\t\ + \have 'x' on 'z' instead. If a theater does explicity place a window,\n\t\ + \the window is placed in the hidden workspace (which is '*')\n" + $ do + addStringToPendingBuffer " g " + runMaybeT_ $ + do + mapNextString $ \_ str -> lift $ + case str of + [ch] | isAlpha ch -> restoreTheater (Just [ch]) + [' '] -> restoreTheater Nothing + _ -> return () let spaceResize = repeatable $ do bind xK_bracketright $ do @@ -828,24 +817,23 @@ keymap = runKeys $ do doc "Spawn a floating terminal" $ spawnX (terminal config ++ " -t Floating\\ Term") - bind xK_v - $ + bind xK_v $ -- Allows repeated strokes of M-h and M-l to reduce and increase volume -- respectively. - justMod - $ doc - "Allows repeated strokes of M-h and M-l to decrease and\n\ - \increase volume respectively" - $ repeatable - $ do - bind xK_h $ - justMod decreaseVolumeDoc + justMod $ + doc + "Allows repeated strokes of M-h and M-l to decrease and\n\ + \increase volume respectively" + $ repeatable $ + do + bind xK_h $ + justMod decreaseVolumeDoc - bind xK_l $ - justMod increaseVolumeDoc + bind xK_l $ + justMod increaseVolumeDoc - bind xK_v $ - justMod (return () :: X ()) + bind xK_v $ + justMod (return () :: X ()) bind xK_x $ do justMod $ @@ -916,8 +904,8 @@ keymap = runKeys $ do sendMessage togglePop bind xK_F8 $ do - justMod - $ doc + justMod $ + doc "Set the log level.\n\ \Log levels are, in order\n\n\t\ \Trace\n\t\ @@ -927,15 +915,15 @@ keymap = runKeys $ do \Error\n\t\ \Fatal\n\n\ \Log is sent to stdout." - $ do - ll <- getLogLevel - let next = if minBound == ll then maxBound else pred ll + $ do + ll <- getLogLevel + let next = if minBound == ll then maxBound else pred ll - safeSpawnX - "notify-send" - ["-t", "2000", printf "LogLevel set to %s" (show next)] - setLogLevel next - logs next "LogLevel set to %s." (show next) + safeSpawnX + "notify-send" + ["-t", "2000", printf "LogLevel set to %s" (show next)] + setLogLevel next + logs next "LogLevel set to %s." (show next) bind xF86XK_Calculator $ do noMod $ spawnX $ terminal config ++ " -t Floating\\ Term -e /usr/bin/env python3" @@ -1069,8 +1057,8 @@ mouseMap = runButtons $ do subMouse $ do bind button3 $ noMod $ - doc "Drag a workspace to another screen." $ - noWindow D.dragWorkspace + doc "Move to workspace 's' (Spotify)" $ + noWindow (gotoWorkspace "s") bind button1 $ noMod $ @@ -1188,8 +1176,7 @@ mouseMap = runButtons $ do bind button2 $ noMod $ - doc "Clear the window selection" $ - noWindow (clearWindowSelection >> escape) + doc "Clear the window selection" $ noWindow (clearWindowSelection >> escape) bind button13 $ noMod $ @@ -1217,25 +1204,24 @@ mouseMap = runButtons $ do forM_ [(button7, ",.", "right"), (button6, ";.", "left")] $ \(b, mot, d) -> do - bind b - $ noMod - $ doc - ( "Move the selected windows to the workspace on the \ - \screen to the " - ++ d - ) - $ noWindow - $ do - wins <- getAndResetWindowSelection - runMaybeT_ $ do - ws' <- workspaceForStringT mot - ws <- MaybeT . return $ workspaceName ws' - lift $ - let f = - appEndo - ( mconcat (map (Endo . W.shiftWin ws) wins) - ) - in windows f >> escape + bind b $ + noMod $ + doc + ( "Move the selected windows to the workspace on the \ + \screen to the " + ++ d + ) + $ noWindow $ do + wins <- getAndResetWindowSelection + runMaybeT_ $ do + ws' <- workspaceForStringT mot + ws <- MaybeT . return $ workspaceName ws' + lift $ + let f = + appEndo + ( mconcat (map (Endo . W.shiftWin ws) wins) + ) + in windows f >> escape let workspaceButtons = [ ( button2, |