mirror of
https://github.com/xmonad/xmonad.git
synced 2025-08-01 04:31:53 -07:00
Change manpage token @@ to %! to avoid conflicts with Haddock (xmonad)
This commit is contained in:
54
Config.hs
54
Config.hs
@@ -130,53 +130,53 @@ logHook = return ()
|
||||
keys :: M.Map (KeyMask, KeySym) (X ())
|
||||
keys = M.fromList $
|
||||
-- launching and killing programs
|
||||
[ ((modMask .|. shiftMask, xK_Return), spawn "xterm") -- @@ Launch an xterm
|
||||
, ((modMask, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") -- @@ Launch dmenu
|
||||
, ((modMask .|. shiftMask, xK_p ), spawn "gmrun") -- @@ Launch gmrun
|
||||
, ((modMask .|. shiftMask, xK_c ), kill) -- @@ Close the focused window
|
||||
[ ((modMask .|. shiftMask, xK_Return), spawn "xterm") -- %! Launch an xterm
|
||||
, ((modMask, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") -- %! Launch dmenu
|
||||
, ((modMask .|. shiftMask, xK_p ), spawn "gmrun") -- %! Launch gmrun
|
||||
, ((modMask .|. shiftMask, xK_c ), kill) -- %! Close the focused window
|
||||
|
||||
, ((modMask, xK_space ), switchLayout) -- @@ Rotate through the available layout algorithms
|
||||
, ((modMask, xK_space ), switchLayout) -- %! Rotate through the available layout algorithms
|
||||
|
||||
, ((modMask, xK_n ), refresh) -- @@ Resize viewed windows to the correct size
|
||||
, ((modMask, xK_n ), refresh) -- %! Resize viewed windows to the correct size
|
||||
|
||||
-- move focus up or down the window stack
|
||||
, ((modMask, xK_Tab ), focusDown) -- @@ Move focus to the next window
|
||||
, ((modMask, xK_j ), focusDown) -- @@ Move focus to the next window
|
||||
, ((modMask, xK_k ), focusUp ) -- @@ Move focus to the previous window
|
||||
, ((modMask, xK_Tab ), focusDown) -- %! Move focus to the next window
|
||||
, ((modMask, xK_j ), focusDown) -- %! Move focus to the next window
|
||||
, ((modMask, xK_k ), focusUp ) -- %! Move focus to the previous window
|
||||
|
||||
-- modifying the window order
|
||||
, ((modMask, xK_Return), swapMaster) -- @@ Swap the focused window and the master window
|
||||
, ((modMask .|. shiftMask, xK_j ), swapDown ) -- @@ Swap the focused window with the next window
|
||||
, ((modMask .|. shiftMask, xK_k ), swapUp ) -- @@ Swap the focused window with the previous window
|
||||
, ((modMask, xK_Return), swapMaster) -- %! Swap the focused window and the master window
|
||||
, ((modMask .|. shiftMask, xK_j ), swapDown ) -- %! Swap the focused window with the next window
|
||||
, ((modMask .|. shiftMask, xK_k ), swapUp ) -- %! Swap the focused window with the previous window
|
||||
|
||||
-- resizing the master/slave ratio
|
||||
, ((modMask, xK_h ), sendMessage Shrink) -- @@ Shrink the master area
|
||||
, ((modMask, xK_l ), sendMessage Expand) -- @@ Expand the master area
|
||||
, ((modMask, xK_h ), sendMessage Shrink) -- %! Shrink the master area
|
||||
, ((modMask, xK_l ), sendMessage Expand) -- %! Expand the master area
|
||||
|
||||
, ((modMask, xK_t ), withFocused sink) -- @@ Push window back into tiling
|
||||
, ((modMask, xK_t ), withFocused sink) -- %! Push window back into tiling
|
||||
|
||||
-- increase or decrease number of windows in the master area
|
||||
, ((modMask , xK_comma ), sendMessage (IncMasterN 1)) -- @@ Increment the number of windows in the master area
|
||||
, ((modMask , xK_period), sendMessage (IncMasterN (-1))) -- @@ Deincrement the number of windows in the master area
|
||||
, ((modMask , xK_comma ), sendMessage (IncMasterN 1)) -- %! Increment the number of windows in the master area
|
||||
, ((modMask , xK_period), sendMessage (IncMasterN (-1))) -- %! Deincrement the number of windows in the master area
|
||||
|
||||
-- toggle the status bar gap
|
||||
, ((modMask , xK_b ), modifyGap (\i n -> let x = (defaultGaps ++ repeat (0,0,0,0)) !! i in if n == x then (0,0,0,0) else x)) -- @@ Toggle the status bar gap
|
||||
, ((modMask , xK_b ), modifyGap (\i n -> let x = (defaultGaps ++ repeat (0,0,0,0)) !! i in if n == x then (0,0,0,0) else x)) -- %! Toggle the status bar gap
|
||||
|
||||
-- quit, or restart
|
||||
, ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) -- @@ Quit xmonad
|
||||
, ((modMask , xK_q ), restart Nothing True) -- @@ Restart xmonad
|
||||
, ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) -- %! Quit xmonad
|
||||
, ((modMask , xK_q ), restart Nothing True) -- %! Restart xmonad
|
||||
|
||||
-- Extension-provided key bindings
|
||||
]
|
||||
++
|
||||
-- mod-[1..9] @@ Switch to workspace N
|
||||
-- mod-shift-[1..9] @@ Move client to workspace N
|
||||
-- mod-[1..9] %! Switch to workspace N
|
||||
-- mod-shift-[1..9] %! Move client to workspace N
|
||||
[((m .|. modMask, k), f i)
|
||||
| (i, k) <- zip workspaces [xK_1 ..]
|
||||
, (f, m) <- [(view, 0), (shift, shiftMask)]]
|
||||
++
|
||||
-- mod-{w,e,r} @@ Switch to physical/Xinerama screens 1, 2, or 3
|
||||
-- mod-shift-{w,e,r} @@ Move client to screen 1, 2, or 3
|
||||
-- mod-{w,e,r} %! Switch to physical/Xinerama screens 1, 2, or 3
|
||||
-- mod-shift-{w,e,r} %! Move client to screen 1, 2, or 3
|
||||
[((m .|. modMask, key), screenWorkspace sc >>= flip whenJust f)
|
||||
| (key, sc) <- zip [xK_w, xK_e, xK_r] [0..]
|
||||
, (f, m) <- [(windows . W.view, 0), (shift, shiftMask)]]
|
||||
@@ -187,11 +187,11 @@ keys = M.fromList $
|
||||
--
|
||||
mouseBindings :: M.Map (KeyMask, Button) (Window -> X ())
|
||||
mouseBindings = M.fromList $
|
||||
-- mod-button1 @@ Set the window to floating mode and move by dragging
|
||||
-- mod-button1 %! Set the window to floating mode and move by dragging
|
||||
[ ((modMask, button1), (\w -> focus w >> mouseMoveWindow w))
|
||||
-- mod-button2 @@ Raise the window to the top of the stack
|
||||
-- mod-button2 %! Raise the window to the top of the stack
|
||||
, ((modMask, button2), (\w -> focus w >> swapMaster))
|
||||
-- mod-button3 @@ Set the window to floating mode and resize by dragging
|
||||
-- mod-button3 %! Set the window to floating mode and resize by dragging
|
||||
, ((modMask, button3), (\w -> focus w >> mouseResizeWindow w))
|
||||
-- Extension-provided mouse bindings
|
||||
]
|
||||
|
Reference in New Issue
Block a user