xmonad-extras 0.15 → 0.15.1

raw patch · 6 files changed

+19/−12 lines, 6 filesdep ~alsa-mixerPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: alsa-mixer

API changes (from Hackage documentation)

Files

• CHANGELOG.md +5/−1
• XMonad/Actions/Volume.hs +2/−2
• XMonad/Hooks/PerWindowKbdLayout.hsc +1/−0
• XMonad/Util/Brightness.hs +4/−4
• XMonad/Util/WindowPropertiesRE.hs +3/−1
• xmonad-extras.cabal +4/−4

@@ -1,3 +1,8 @@+# 0.15.1++* Make it work with the latest alsa-mixer+* Fix warnings in the code+ # 0.15  * Relax bounds and make it compatible with other releases.@@ -29,4 +34,3 @@ * Remove small_base flag. * Remove unused dependencies like process, random, unix, directory, old-time, old-locale * Remove ghc-options specific to 6.10.1, 7.2-

@@ -156,12 +156,12 @@ clip :: (Num t, Ord t) => t -> t clip = min 100 . max 0 -toRange :: (Integer, Integer) -> Double -> Integer+toRange :: (CLong, CLong) -> Double -> CLong toRange (x, y) d = floor (d * (y' - x') / 100 + x')   where x' = fromIntegral x         y' = fromIntegral y         -fromRange :: (Integer, Integer) -> Integer -> Double+fromRange :: (CLong, CLong) -> CLong -> Double fromRange (x, y) z = fromIntegral (z - x) / fromIntegral (y - x) * 100  modify :: Monad m => (arg -> m value) -> (arg -> value -> m ()) -> arg -> (value -> value) -> m value

@@ -96,6 +96,7 @@             compat_lookup_mods = r_compat_lookup_mods,             ptr_buttons = r_ptr_buttons         }+    poke _ = error "poke is unimplemented and should be unused"  foreign import ccall unsafe "X11/XKBlib.h XkbGetState"     xkbGetState :: Display -> CUInt -> Ptr XkbStateRec -> IO CInt

@@ -103,16 +103,16 @@ -- | Perform all needed IO to update screen brightness change :: (Int -> Int) -> IO (Either () ()) change f = do-  max <- getFromFile maxfile readInt+  maxBright <- getFromFile maxfile readInt   current <- getFromFile currentfile readInt-  printError =<< apply (writeToFile currentfile) (liftA2 (guard f) max current)+  printError =<< apply (writeToFile currentfile) (liftA2 (guard f) maxBright current)  apply :: (Int -> IO (Either String ())) -> Either String Int -> IO (Either String ()) apply f = fmap join . traverse f  guard :: (Int -> Int) -> Int -> Int -> Int-guard f max current-  | value > max = max+guard f limit current+  | value > limit = limit   | value < 0   = 0   | otherwise = value   where value = f current

@@ -23,8 +23,9 @@  import XMonad +import XMonad.Actions.TagWindows import XMonad.Util.WindowProperties-import XMonad.Layout.LayoutBuilderP+import XMonad.Layout.LayoutBuilder  -- | A wrapper for X.U.WindowProperties.Property. -- Checks using regular expression.@@ -47,6 +48,7 @@ propertyToQueryRE (Or p1 p2) = propertyToQueryRE p1 <||> propertyToQueryRE p2 propertyToQueryRE (Not p) = not `fmap` propertyToQueryRE p propertyToQueryRE (Const b) = return b+propertyToQueryRE (Tagged s) = ask >>= \w -> liftX (any (=~ s) `fmap` getTags w)  -- | Does given window have this property? hasPropertyRE :: PropertyRE -> Window -> X Bool

@@ -1,5 +1,5 @@ name:               xmonad-extras-version:            0.15+version:            0.15.1 homepage:           https://github.com/xmonad/xmonad-extras synopsis:           Third party extensions for xmonad with wacky dependencies description:        Various modules for xmonad that cannot be added to xmonad-contrib@@ -51,7 +51,7 @@     --     ghc-options:    -Werror      if flag(with_sound)-        build-depends: alsa-mixer >= 0.2+        build-depends: alsa-mixer >= 0.3         exposed-modules: XMonad.Actions.Volume      if flag(with_hint)@@ -91,9 +91,9 @@ --     ghc-options:        -Wall --     if !flag(with_hint) --         Buildable: False--- +-- --     if flag(with_hint) --         build-depends: network--- +-- --     if flag(testing) --         ghc-options:  -Werror