mirror of
https://github.com/xmonad/xmonad-contrib.git
synced 2025-05-19 03:20:21 -07:00
f6b1e5dd88
It's often difficult to make contrib modules work together. When one depends on a functionality of another, it is often necessary to expose lots of low-level functions and hooks and have the user combine these into a complex configuration that works. This is error-prone, and arguably a bad UX in general. This commit presents a simple solution to that problem inspired by "extensible state": extensible config. It allows contrib modules to store custom configuration values inside XConfig. This lets them create custom hooks, ensure they hook into xmonad core only once, and possibly other use cases I haven't thought of yet. This requires changes to xmonad core: https://github.com/xmonad/xmonad/pull/294 A couple examples of what this gives us: * [X.H.RescreenHook](https://github.com/xmonad/xmonad-contrib/pull/460) can be made safe to apply multiple times, making it composable and usable in other contrib modules like X.H.StatusBar * `withSB` from X.H.StatusBar can also be made safe to apply multiple times, and we can even provide an API [similar to what we had before](https://hackage.haskell.org/package/xmonad-contrib-0.16/docs/XMonad-Hooks-DynamicLog.html#v:statusBar) if we want (probably not, consistency with the new dynamic status bars of https://github.com/xmonad/xmonad-contrib/pull/463 is more important) * The [X.H.EwmhDesktops refactor](https://github.com/xmonad/xmonad-contrib/pull/399) can possibly be made without breaking the `ewmh`/`ewmhFullscreen` API. And we will finally be able to have composable EWMH hooks. Related: https://github.com/xmonad/xmonad/pull/294
32 lines
1.2 KiB
Haskell
32 lines
1.2 KiB
Haskell
{-# OPTIONS_GHC -Wall #-}
|
|
module ExtensibleConf where
|
|
|
|
import Test.Hspec
|
|
|
|
import XMonad
|
|
import qualified XMonad.Util.ExtensibleConf as XC
|
|
|
|
spec :: Spec
|
|
spec = do
|
|
specify "lookup" $
|
|
XC.lookup def `shouldBe` (Nothing :: Maybe ())
|
|
specify "lookup . add" $
|
|
XC.lookup (XC.add "a" def) `shouldBe` Just "a"
|
|
specify "lookup . add . add" $
|
|
XC.lookup (XC.add "b" (XC.add "a" def)) `shouldBe` Just "ab"
|
|
specify "lookup @String . add @String . add @[Int]" $
|
|
XC.lookup (XC.add "a" (XC.add [1 :: Int] def)) `shouldBe` Just "a"
|
|
specify "lookup @[Int] . add @String . add @[Int]" $
|
|
XC.lookup (XC.add "a" (XC.add [1 :: Int] def)) `shouldBe` Just [1 :: Int]
|
|
specify "lookup @() . add @String . add @[Int]" $
|
|
XC.lookup (XC.add "a" (XC.add [1 :: Int] def)) `shouldBe` (Nothing :: Maybe ())
|
|
|
|
specify "once" $
|
|
borderWidth (XC.once "a" incBorderWidth def) `shouldBe` succ (borderWidth def)
|
|
specify "once . once" $
|
|
borderWidth (XC.once "b" incBorderWidth (XC.once "a" incBorderWidth def))
|
|
`shouldBe` succ (borderWidth def)
|
|
|
|
incBorderWidth :: XConfig l -> XConfig l
|
|
incBorderWidth c = c{ borderWidth = succ (borderWidth c) }
|