xnobar 1.0.0.1 → 1.0.0.2
raw patch · 4 files changed
+18/−16 lines, 4 filesdep +textdep +text-icu
Dependencies added: text, text-icu
Files
- lib/Notification/XNobar/Internal/Notification.hs +1/−1
- lib/Scroller/XNobar/Scroller.hs +4/−4
- test/Main.hs +1/−1
- xnobar.cabal +12/−10
lib/Notification/XNobar/Internal/Notification.hs view
@@ -65,7 +65,7 @@ urgency n = let u = lookup "urgency" (hints n) in case u of Nothing -> 0- (Just x) -> fromMaybe 0 (fromVariant x)+ Just x -> fromMaybe 0 (fromVariant x) parseNotif :: [Variant] -> (Word32, Notification) parseNotif [name, rid, icon, summary, body, actions, hints, expire]
lib/Scroller/XNobar/Scroller.hs view
@@ -1,7 +1,7 @@ {-# LANGUAGE RecordWildCards #-} module XNobar.Scroller (scroller, Config(..)) where -import Control.Concurrent.Async (withAsync)+import Control.Concurrent.Async (concurrently_) import Control.Exception (finally) import Control.Monad (forever, when) import Control.Monad.State.Strict (evalStateT, get, liftIO, modify')@@ -24,9 +24,9 @@ let pipe = "/tmp/xnobar-" ++ removeLinebreak n where removeLinebreak = init (_, _, _) <- readProcessWithExitCode "mkfifo" [pipe] "" clicked <- newIORef Nothing- withAsync (forever $ do out <- withFileBlocking pipe ReadMode hGetContents'- atomicModifyIORef' clicked (const (Just out, ())))- (const $ evalStateT (forever $ update clicked pipe) Nothing)+ concurrently_ (forever $ do out <- withFileBlocking pipe ReadMode hGetContents'+ atomicModifyIORef' clicked (const (Just out, ())))+ (evalStateT (forever $ update clicked pipe) Nothing) `finally` removeFile pipe where update clicked pipe = do
test/Main.hs view
@@ -92,7 +92,7 @@ tRemoveCurrent (Just (_, _, [])) = error "This should not happen" tRemoveCurrent ns@(Just (curr, o, _)) = case remove curr ns of Nothing -> True- (Just (curr', _, _)) -> curr' /= curr+ Just (curr', _, _) -> curr' /= curr instance {-# Overlapping #-} Arbitrary [Id] where arbitrary = do
xnobar.cabal view
@@ -1,6 +1,6 @@ cabal-version: 3.4 name: xnobar-version: 1.0.0.1+version: 1.0.0.2 maintainer: Enrico Maria De Angelis homepage: https://codeberg.org/Aster89/xnobar synopsis: Text-based notification server for XMobar@@ -20,9 +20,11 @@ library import: common exposed-modules: XNobar- build-depends: xmobar >= 0.48.1 && <= 0.51+ build-depends: xmobar >= 0.48.1 && < 0.52 , xnobar:server , xnobar:scroller+ , text+ , text-icu hs-source-dirs: lib/XNobar executable echo@@ -30,7 +32,7 @@ build-depends: xnobar:positive32 , xnobar:scroller , xnobar:server- , xmobar >= 0.48.1 && <= 0.51+ , xmobar hs-source-dirs: exe main-is: Echo.hs @@ -39,7 +41,7 @@ visibility: public exposed-modules: XNobar.Server build-depends: dbus >= 1.3.6 && < 1.5- , extra >= 1.7.16 && <= 1.8+ , extra >= 1.7.16 && < 1.9 , flow >= 2.0.0 && < 2.1 , transformers >= 0.6.1 && < 0.7 , xnobar:notification@@ -50,8 +52,8 @@ import: common exposed-modules: XNobar.Internal.Notification build-depends: containers >= 0.6.8 && < 0.9- , dbus >= 1.3.6 && < 1.5- , flow >= 2.0.0 && < 2.1+ , dbus+ , flow , xnobar:positive32 hs-source-dirs: lib/Notification @@ -60,11 +62,11 @@ exposed-modules: XNobar.Scroller, XNobar.Internal.Scroller build-depends: async >= 2.2.5 && < 2.3 , directory >= 1.3.8 && < 1.4- , extra >= 1.7.16 && <= 1.8- , flow >= 2.0.0 && < 2.1+ , extra+ , flow , mtl >= 2.3.1 && < 2.4 , process >= 1.6.18 && < 1.7- , xmobar >= 0.48.1 && <= 0.51+ , xmobar , xnobar:notification , xnobar:positive32 , xnobar:server@@ -80,7 +82,7 @@ type: exitcode-stdio-1.0 main-is: Main.hs build-depends: QuickCheck- , extra >= 1.7.16 && <= 1.8+ , extra , xnobar:notification , xnobar:positive32 , xnobar:scroller