diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-08-12 03:18:46 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-08-12 03:18:46 +0200 |
commit | 15bccc001a5ff2e76d0890f85e300e9312cddd1b (patch) | |
tree | 2e880537f1a1eedebe021ffbd3cb521c2a8c3a28 /lib/Phi/Widgets | |
parent | 180285af85c4c6c02c885dd6c276a33e0bf00d1a (diff) | |
download | phi-15bccc001a5ff2e76d0890f85e300e9312cddd1b.tar phi-15bccc001a5ff2e76d0890f85e300e9312cddd1b.zip |
Some strictness optimizations
Diffstat (limited to 'lib/Phi/Widgets')
-rw-r--r-- | lib/Phi/Widgets/AlphaBox.hs | 4 | ||||
-rw-r--r-- | lib/Phi/Widgets/Clock.hs | 6 | ||||
-rw-r--r-- | lib/Phi/Widgets/Systray.hs | 6 | ||||
-rw-r--r-- | lib/Phi/Widgets/Taskbar.hs | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/lib/Phi/Widgets/AlphaBox.hs b/lib/Phi/Widgets/AlphaBox.hs index c09b911..dd4bfba 100644 --- a/lib/Phi/Widgets/AlphaBox.hs +++ b/lib/Phi/Widgets/AlphaBox.hs @@ -11,9 +11,9 @@ import Control.Monad import Graphics.Rendering.Cairo -data AlphaBoxState = AlphaBoxState [WidgetState] deriving Show +data AlphaBoxState = AlphaBoxState ![WidgetState] deriving Show -data AlphaBox = AlphaBox Double [Widget] deriving Show +data AlphaBox = AlphaBox !Double ![Widget] deriving Show instance WidgetClass AlphaBox where diff --git a/lib/Phi/Widgets/Clock.hs b/lib/Phi/Widgets/Clock.hs index 1f00bd0..d2ad134 100644 --- a/lib/Phi/Widgets/Clock.hs +++ b/lib/Phi/Widgets/Clock.hs @@ -34,11 +34,11 @@ data ClockConfig = ClockConfig { clockFormat :: !String defaultClockConfig :: ClockConfig defaultClockConfig = ClockConfig "%R" (0, 0, 0, 1) 0 50 -data Clock = Clock ClockConfig deriving Show +data Clock = Clock !ClockConfig deriving Show -data ClockState = ClockState ZonedTime deriving Show +data ClockState = ClockState !ZonedTime deriving Show -data ClockMessage = UpdateTime ZonedTime deriving (Show, Typeable) +data ClockMessage = UpdateTime !ZonedTime deriving (Show, Typeable) instance WidgetClass Clock where type WidgetData Clock = ClockState diff --git a/lib/Phi/Widgets/Systray.hs b/lib/Phi/Widgets/Systray.hs index b8b85d7..385a740 100644 --- a/lib/Phi/Widgets/Systray.hs +++ b/lib/Phi/Widgets/Systray.hs @@ -45,13 +45,13 @@ instance Show (IORef a) where show _ = "IORef <?>" -data SystrayIconState = SystrayIconState Window Window deriving Show +data SystrayIconState = SystrayIconState !Window !Window deriving Show -data SystrayState = SystrayState Phi Rectangle Int (IORef Int) [SystrayIconState] deriving Show +data SystrayState = SystrayState !Phi !Rectangle !Int !(IORef Int) ![SystrayIconState] deriving Show data Systray = Systray deriving Show -data SystrayMessage = AddIcon Window Window | RemoveIcon Window | RenderIcon Window Window Int Int Int Int Bool +data SystrayMessage = AddIcon !Window !Window | RemoveIcon !Window | RenderIcon !Window !Window !Int !Int !Int !Int !Bool deriving (Show, Typeable) diff --git a/lib/Phi/Widgets/Taskbar.hs b/lib/Phi/Widgets/Taskbar.hs index a5a6fdc..e1a4adc 100644 --- a/lib/Phi/Widgets/Taskbar.hs +++ b/lib/Phi/Widgets/Taskbar.hs @@ -152,10 +152,10 @@ data WindowState = WindowState { windowTitle :: !String , windowVisible :: !Bool } deriving (Show, Eq) -data TaskbarMessage = WindowListUpdate [Xlib.Window] (M.Map Window WindowState) (M.Map Window [(Int, Surface)]) (M.Map Window (IORef (Maybe (Int, Surface)))) (M.Map Window Xlib.Rectangle) - | DesktopCountUpdate Int - | CurrentDesktopUpdate Int - | ActiveWindowUpdate Window +data TaskbarMessage = WindowListUpdate ![Xlib.Window] !(M.Map Window WindowState) !(M.Map Window [(Int, Surface)]) !(M.Map Window (IORef (Maybe (Int, Surface)))) !(M.Map Window Xlib.Rectangle) + | DesktopCountUpdate !Int + | CurrentDesktopUpdate !Int + | ActiveWindowUpdate !Window deriving (Show, Typeable) instance Show (IORef a) where |