Skip to content
Snippets Groups Projects
Commit b3c86028 authored by Jens Nolte's avatar Jens Nolte
Browse files

Rename UserUpdate to EventUpdate

parent 7f32e700
No related branches found
No related tags found
No related merge requests found
......@@ -154,7 +154,7 @@ runSignalBlockConfiguration SignalBlockConfiguration{initialize, signalThread, s
case signal of
EventSignal _ -> do
(state, _) <- get
lift $ yield (invalidateBlockState state, UserUpdate)
lift $ yield (invalidateBlockState state, EventUpdate)
_ -> return ()
outputAndStore signal
void $ sendQueuedEvents
......@@ -170,7 +170,7 @@ runSignalBlockConfiguration SignalBlockConfiguration{initialize, signalThread, s
signalToReason :: Signal a -> BlockUpdateReason
signalToReason (UserSignal _) = DefaultUpdate
signalToReason (EventSignal _) = UserUpdate
signalToReason (EventSignal _) = EventUpdate
signalToReason RegularSignal = PollUpdate
......@@ -210,7 +210,7 @@ runPollBlock' interval pb = do
maybeOutput <- await
-- Attach a click handler that will trigger a block update
let state = mkBlockStateWithHandler (triggerOnClick event) maybeOutput
yield (state, if isEvent then UserUpdate else PollUpdate)
yield (state, if isEvent then EventUpdate else PollUpdate)
scheduler <- askSleepScheduler
result <- liftIO $ do
......@@ -222,7 +222,7 @@ runPollBlock' interval pb = do
when isEventNew $ do
liftIO $ Event.clear event
yield (invalidateBlockState state, UserUpdate)
yield (invalidateBlockState state, EventUpdate)
sleepToNextInterval' isEventNew
......
......@@ -43,7 +43,7 @@ data ExitBlock = ExitBlock
type BlockEventHandler = BlockEvent -> BarIO ()
type BlockState = Maybe (BlockOutput, Maybe BlockEventHandler)
data BlockUpdateReason = DefaultUpdate | PollUpdate | UserUpdate
data BlockUpdateReason = DefaultUpdate | PollUpdate | EventUpdate
type BlockUpdate = (BlockState, BlockUpdateReason)
-- |Block that 'yield's an update whenever the block should be changed
......
......@@ -140,8 +140,8 @@ filterDuplicates = do
followupEventWaitTime :: BlockUpdateReason -> Int
followupEventWaitTime DefaultUpdate = 10000
followupEventWaitTime PollUpdate = 50000
-- 'followupEventWaitTime' for 'UserUpdate' has to be zero, or blocks would be blocked blocked for this time when sending a 'UserUpdate'.
followupEventWaitTime UserUpdate = 0
-- 'followupEventWaitTime' for 'EventUpdate' has to be zero, or blocks would be blocked blocked for this time when sending a 'UserUpdate'.
followupEventWaitTime EventUpdate = 0
followupEventWaitTimeDefault :: Int
followupEventWaitTimeDefault = followupEventWaitTime PollUpdate
......@@ -153,7 +153,7 @@ requestBarUpdateHandler HostHandle{barUpdateEvent, barUpdatedEvent, followupEven
signalHost blockUpdateReason
where
signalHost :: BlockUpdateReason -> IO ()
signalHost UserUpdate = do
signalHost EventUpdate = do
-- Start waiting before triggering the event cannot be missed
task <- async $ Event.wait barUpdatedEvent
Event.set barUpdateEvent
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment