twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 11:30:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use <+> instead of explicit M.union to merge keybindings in X.C.*

Browse Source
This commit is contained in:
Adam Vogt 2010-01-24 20:21:36 +00:00
parent 0b4d34fa7e
commit a9f2b82337
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XMonad/Config/Azerty.hs
View File

@ -38,7 +38,7 @@ import qualified Data.Map as M
-- > import qualified Data.Map as M -- > import qualified Data.Map as M
-- > main = xmonad someConfig { keys = \c -> azertyKeys c `M.union` keys someConfig c } -- > main = xmonad someConfig { keys = \c -> azertyKeys c `M.union` keys someConfig c }
azertyConfig = defaultConfig { keys = \c -> azertyKeys c `M.union` keys defaultConfig c } azertyConfig = defaultConfig { keys = azertyKeys <+> keys defaultConfig }
azertyKeys conf@(XConfig {modMask = modm}) = M.fromList $ azertyKeys conf@(XConfig {modMask = modm}) = M.fromList $
[((modm, xK_semicolon), sendMessage (IncMasterN (-1)))] [((modm, xK_semicolon), sendMessage (IncMasterN (-1)))]

2
XMonad/Config/Desktop.hs
View File

@ -170,7 +170,7 @@ desktopConfig = ewmh defaultConfig
{ startupHook = setDefaultCursor xC_left_ptr { startupHook = setDefaultCursor xC_left_ptr
, layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig , layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig
, manageHook = manageHook defaultConfig <+> manageDocks , manageHook = manageHook defaultConfig <+> manageDocks
, keys = \c -> desktopKeys c `M.union` keys defaultConfig c } , keys = desktopKeys <+> keys defaultConfig }
desktopKeys (XConfig {modMask = modm}) = M.fromList $ desktopKeys (XConfig {modMask = modm}) = M.fromList $
[ ((modm, xK_b), sendMessage ToggleStruts) ] [ ((modm, xK_b), sendMessage ToggleStruts) ]

2
XMonad/Config/Gnome.hs
View File

@ -41,7 +41,7 @@ import System.Environment (getEnvironment)
gnomeConfig = desktopConfig gnomeConfig = desktopConfig
{ terminal = "gnome-terminal" { terminal = "gnome-terminal"
, keys = \c -> gnomeKeys c `M.union` keys desktopConfig c , keys = gnomeKeys <+> keys desktopConfig
, startupHook = gnomeRegister >> startupHook desktopConfig } , startupHook = gnomeRegister >> startupHook desktopConfig }
gnomeKeys (XConfig {modMask = modm}) = M.fromList $ gnomeKeys (XConfig {modMask = modm}) = M.fromList $

4
XMonad/Config/Kde.hs
View File

@ -40,11 +40,11 @@ import qualified Data.Map as M
kdeConfig = desktopConfig kdeConfig = desktopConfig
{ terminal = "konsole" { terminal = "konsole"
, keys = \c -> kdeKeys c `M.union` keys desktopConfig c } , keys = kdeKeys <+> keys desktopConfig }
kde4Config = desktopConfig kde4Config = desktopConfig
{ terminal = "konsole" { terminal = "konsole"
, keys = \c -> kde4Keys c `M.union` keys desktopConfig c } , keys = kde4Keys <+> keys desktopConfig }
kdeKeys (XConfig {modMask = modm}) = M.fromList $ kdeKeys (XConfig {modMask = modm}) = M.fromList $
[ ((modm, xK_p), spawn "dcop kdesktop default popupExecuteCommand") [ ((modm, xK_p), spawn "dcop kdesktop default popupExecuteCommand")

2
XMonad/Config/Xfce.hs
View File

@ -36,7 +36,7 @@ import qualified Data.Map as M
xfceConfig = desktopConfig xfceConfig = desktopConfig
{ terminal = "Terminal" { terminal = "Terminal"
, keys = \c -> xfceKeys c `M.union` keys desktopConfig c } , keys = xfceKeys <+> keys desktopConfig }
xfceKeys (XConfig {modMask = modm}) = M.fromList $ xfceKeys (XConfig {modMask = modm}) = M.fromList $
[ ((modm, xK_p), spawn "xfrun4") [ ((modm, xK_p), spawn "xfrun4")