From b3c860284b34e72ec8b30ed9319e073cb66989f6 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Fri, 13 Mar 2020 14:27:24 +0100
Subject: [PATCH] Rename UserUpdate to EventUpdate
---
src/QBar/BlockHelper.hs | 8 ++++----
src/QBar/Core.hs | 2 +-
src/QBar/Host.hs | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/QBar/BlockHelper.hs b/src/QBar/BlockHelper.hs
index 605ed8e..5f4f5f1 100644
--- a/src/QBar/BlockHelper.hs
+++ b/src/QBar/BlockHelper.hs
@@ -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
diff --git a/src/QBar/Core.hs b/src/QBar/Core.hs
index cad9c3f..d66a8dc 100644
--- a/src/QBar/Core.hs
+++ b/src/QBar/Core.hs
@@ -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
diff --git a/src/QBar/Host.hs b/src/QBar/Host.hs
index ecfdc77..3524b6d 100644
--- a/src/QBar/Host.hs
+++ b/src/QBar/Host.hs
@@ -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
--
GitLab