From de7a0aff77114638f3e83835de0fe00395fe6bf7 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Wed, 12 Feb 2025 02:06:55 +0000
Subject: on-click implementation based on implicit actions

Draw methods based on Segments don't keep enough information to fill in
correctly a list of actions. With this implementation, we introduce empty
actions as markers where Runnable instances can be inserted. Triggering them
is then just calling the corresponding Exec method, onClick.

Conceivably, onClick could receive some kind of additional state, but that's
better done as a base Plugin instance that keeps state and makes it available
via its onClick function, for instance.

Very lightly tested, needs documentation and extending the plugin example to
include an onClick method.
---
 src/Xmobar/Run/Actions.hs | 6 ++++++
 src/Xmobar/Run/Loop.hs    | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/Xmobar/Run')

diff --git a/src/Xmobar/Run/Actions.hs b/src/Xmobar/Run/Actions.hs
index cbc10c5..fc9682d 100644
--- a/src/Xmobar/Run/Actions.hs
+++ b/src/Xmobar/Run/Actions.hs
@@ -12,6 +12,7 @@
 
 module Xmobar.Run.Actions ( Button
                           , Action(..)
+                          , isEmpty
                           , runAction
                           , runAction'
                           , stripActions) where
@@ -20,12 +21,17 @@ import System.Process (spawnCommand, waitForProcess)
 import Control.Monad (void)
 import Text.Regex (Regex, subRegex, mkRegex, matchRegex)
 import Data.Word (Word32)
+import Data.Char (isSpace)
 
 type Button = Word32
 
 data Action = Spawn [Button] String deriving (Eq, Read, Show)
 
+isEmpty :: Action -> Bool
+isEmpty (Spawn _ s) = all isSpace s
+
 runAction :: Action -> IO ()
+runAction a | isEmpty a = return ()
 runAction (Spawn _ s) = void $ spawnCommand (s ++ " &") >>= waitForProcess
 
 -- | Run action with stdout redirected to stderr
diff --git a/src/Xmobar/Run/Loop.hs b/src/Xmobar/Run/Loop.hs
index 9954cb9..343a857 100644
--- a/src/Xmobar/Run/Loop.hs
+++ b/src/Xmobar/Run/Loop.hs
@@ -28,6 +28,7 @@ import Data.Foldable (for_)
 
 import Xmobar.System.Signal
 import Xmobar.Config.Types
+import Xmobar.Config.Template (withEmptyAction)
 import Xmobar.Run.Runnable (Runnable)
 import Xmobar.Run.Exec (start, trigger, alias)
 import Xmobar.Run.Template
@@ -94,14 +95,15 @@ initLoop sig lock vs = do
 -- | Runs a command as an independent thread and returns its Async handles
 -- and the TVar the command will be writing to.
 startCommand :: TMVar SignalType
-             -> (Runnable,String,String)
+             -> (Runnable, String, String)
              -> IO ([Async ()], TVar String)
 startCommand sig (com,s,ss)
     | alias com == "" = do var <- newTVarIO is
                            atomically $ writeTVar var (s ++ ss)
                            return ([], var)
     | otherwise = do var <- newTVarIO is
-                     let cb str = atomically $ writeTVar var (s ++ str ++ ss)
+                     let cb str = atomically $
+                           writeTVar var (s ++ withEmptyAction str ++ ss)
                      a1 <- async $ start com cb
                      a2 <- async $ trigger com $ maybe (return ())
                                                  (atomically . putTMVar sig)
-- 
cgit v1.2.3