From 6891238793d882f39f3c939137fbe54459bc83f2 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Mon, 2 Jan 2023 19:55:44 -0500 Subject: [PATCH] ENH add log contraints to spawnpipe --- lib/XMonad/Internal/Command/DMenu.hs | 9 ++++++--- lib/XMonad/Internal/Shell.hs | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/XMonad/Internal/Command/DMenu.hs b/lib/XMonad/Internal/Command/DMenu.hs index 0956ee5..946bbd7 100644 --- a/lib/XMonad/Internal/Command/DMenu.hs +++ b/lib/XMonad/Internal/Command/DMenu.hs @@ -210,7 +210,7 @@ runClipMenu = sometimesIO_ "clipboard manager" "rofi greenclip" tree act -- Shortcut menu runShowKeys - :: MonadUnliftIO m + :: (MonadReader env m, HasLogFunc env, MonadUnliftIO m) => Always ([((KeyMask, KeySym), NamedAction)] -> m ()) runShowKeys = Always "keyboard menu" $ @@ -225,7 +225,7 @@ runShowKeys = defNoteError {body = Just $ Text "could not display keymap"} showKeysDMenu - :: MonadUnliftIO m + :: (MonadReader env m, HasLogFunc env, MonadUnliftIO m) => SubfeatureRoot ([((KeyMask, KeySym), NamedAction)] -> m ()) showKeysDMenu = Subfeature @@ -233,7 +233,10 @@ showKeysDMenu = , sfData = IORoot_ showKeys $ Only_ dmenuDep } -showKeys :: MonadUnliftIO m => [((KeyMask, KeySym), NamedAction)] -> m () +showKeys + :: (MonadReader env m, HasLogFunc env, MonadUnliftIO m) + => [((KeyMask, KeySym), NamedAction)] + -> m () showKeys kbs = do h <- spawnPipe cmd B.hPut h $ BC.unlines $ BC.pack <$> showKm kbs diff --git a/lib/XMonad/Internal/Shell.hs b/lib/XMonad/Internal/Shell.hs index 70a3e6c..ee2aad9 100644 --- a/lib/XMonad/Internal/Shell.hs +++ b/lib/XMonad/Internal/Shell.hs @@ -85,7 +85,10 @@ spawn :: MonadIO m => T.Text -> m () spawn = X.spawn . T.unpack -- | Run 'XMonad.Run.Utils.spawnPipe' with 'Text' input. -spawnPipe :: MonadIO m => T.Text -> m Handle +spawnPipe + :: (MonadReader env m, HasLogFunc env, MonadUnliftIO m) + => T.Text + -> m Handle spawnPipe = XR.spawnPipe . T.unpack -- | Run 'XMonad.Core.spawn' with a command and arguments