diff options
| -rw-r--r-- | NoBorders.hs | 10 | ||||
| -rw-r--r-- | Run.hs | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/NoBorders.hs b/NoBorders.hs index 5c54814..ef07336 100644 --- a/NoBorders.hs +++ b/NoBorders.hs @@ -56,10 +56,10 @@ instance LayoutModifier WithBorder Window where modifierDescription (WithBorder 0 _) = "NoBorders" modifierDescription (WithBorder n _) = "Borders " ++ show n - unhook (WithBorder _ s) = asks borderWidth >>= setBorders s + unhook (WithBorder _ s) = asks (borderWidth . config) >>= setBorders s redoLayout (WithBorder n s) _ _ wrs = do - asks borderWidth >>= setBorders (s \\ ws) + asks (borderWidth . config) >>= setBorders (s \\ ws) setBorders ws n return (wrs, Just $ WithBorder n ws) where @@ -79,18 +79,18 @@ data SmartBorder a = SmartBorder [a] deriving (Read, Show) instance LayoutModifier SmartBorder Window where modifierDescription _ = "SmartBorder" - unhook (SmartBorder s) = asks borderWidth >>= setBorders s + unhook (SmartBorder s) = asks (borderWidth . config) >>= setBorders s redoLayout (SmartBorder s) _ _ wrs = do ss <- gets (W.screens . windowset) if singleton ws && singleton ss then do - asks borderWidth >>= setBorders (s \\ ws) + asks (borderWidth . config) >>= setBorders (s \\ ws) setBorders ws 0 return (wrs, Just $ SmartBorder ws) else do - asks borderWidth >>= setBorders s + asks (borderWidth . config) >>= setBorders s return (wrs, Just $ SmartBorder []) where ws = map fst wrs @@ -108,8 +108,8 @@ unsafeSpawn = spawn -- | Run a given program in the preferred terminal emulator. This uses safeSpawn. safeRunInTerm :: String -> X () -safeRunInTerm command = asks terminal >>= \t -> safeSpawn t ("-e " ++ command) +safeRunInTerm command = asks (terminal . config) >>= \t -> safeSpawn t ("-e " ++ command) unsafeRunInTerm, runInTerm :: String -> X () -unsafeRunInTerm command = asks terminal >>= \t -> unsafeSpawn $ t ++ " -e " ++ command +unsafeRunInTerm command = asks (terminal . config) >>= \t -> unsafeSpawn $ t ++ " -e " ++ command runInTerm = unsafeRunInTerm |