aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2026-01-01 20:47:17 -0700
committerJosh Rahm <joshuarahm@gmail.com>2026-01-01 20:47:17 -0700
commit4c5a5cc0eb92319719773e382fb43d5cb4098b13 (patch)
tree4ad36814f75397af0515449a0753395f0dee5eb0
parentcb657fa9fc8124bdab42eb148e9b4a8ac69fc05e (diff)
downloadmontis-main.tar.gz
montis-main.tar.bz2
montis-main.zip
[refactor] Clean up all the warnings.HEADmain
-rw-r--r--plug/plug.stamp0
-rw-r--r--plug/src/Config.hs1
-rw-r--r--plug/src/Montis/Constraints.hs1
-rw-r--r--plug/src/Montis/Core.hs3
-rw-r--r--plug/src/Montis/Core/ButtonEvent.hs1
-rw-r--r--plug/src/Montis/Core/Keys.hs1
-rw-r--r--plug/src/Montis/Core/W.hs4
-rw-r--r--plug/src/Montis/Dsl/Bind.hs10
-rw-r--r--plug/src/Montis/Dsl/Buttons.hsc1
-rw-r--r--plug/src/Montis/Dsl/Input.hs3
-rw-r--r--plug/src/Montis/Foreign/Export.hs1
-rw-r--r--plug/src/Montis/Foreign/WlRoots.hs1
-rw-r--r--plug/src/Montis/Keys/MagicModifierKey.hs2
-rw-r--r--plug/src/Montis/Layout/Combine.hs1
-rw-r--r--plug/src/Montis/Layout/Full.hs1
-rw-r--r--plug/src/Montis/StackSet.hs4
16 files changed, 19 insertions, 16 deletions
diff --git a/plug/plug.stamp b/plug/plug.stamp
deleted file mode 100644
index e69de29..0000000
--- a/plug/plug.stamp
+++ /dev/null
diff --git a/plug/src/Config.hs b/plug/src/Config.hs
index 0c067c4..153c483 100644
--- a/plug/src/Config.hs
+++ b/plug/src/Config.hs
@@ -85,4 +85,3 @@ instance InputProxy SetXtra where
return $ InputKeyEvent ke {KeyEvent.modifiers = modifiers .|. modifierToMask (ModX 5)}
(InputButtonEvent be@(ButtonEvent {ButtonEvent.modifiers = modifiers})) ->
return $ InputButtonEvent be {ButtonEvent.modifiers = modifiers .|. modifierToMask (ModX 5)}
- _ -> return ie
diff --git a/plug/src/Montis/Constraints.hs b/plug/src/Montis/Constraints.hs
index f1f15ff..8c7957f 100644
--- a/plug/src/Montis/Constraints.hs
+++ b/plug/src/Montis/Constraints.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
-- | Contains useful constraints and constraint combinators for type-level
-- metaprogramming.
module Montis.Constraints where
diff --git a/plug/src/Montis/Core.hs b/plug/src/Montis/Core.hs
index df024e2..a5479dc 100644
--- a/plug/src/Montis/Core.hs
+++ b/plug/src/Montis/Core.hs
@@ -1,5 +1,4 @@
-{-# HLINT ignore "Use camelCase" #-}
-
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
module Montis.Core
-- ( WState (..),
-- WConfig (..),
diff --git a/plug/src/Montis/Core/ButtonEvent.hs b/plug/src/Montis/Core/ButtonEvent.hs
index f9c5c48..a8b336e 100644
--- a/plug/src/Montis/Core/ButtonEvent.hs
+++ b/plug/src/Montis/Core/ButtonEvent.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
module Montis.Core.ButtonEvent where
import Montis.Foreign.WlRoots
diff --git a/plug/src/Montis/Core/Keys.hs b/plug/src/Montis/Core/Keys.hs
index 4ee9e6e..b3faadd 100644
--- a/plug/src/Montis/Core/Keys.hs
+++ b/plug/src/Montis/Core/Keys.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
module Montis.Core.Keys where
import Control.Monad (forever, void, when)
diff --git a/plug/src/Montis/Core/W.hs b/plug/src/Montis/Core/W.hs
index cf21a04..b2046ff 100644
--- a/plug/src/Montis/Core/W.hs
+++ b/plug/src/Montis/Core/W.hs
@@ -1,4 +1,5 @@
{-# LANGUAGE DuplicateRecordFields #-}
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
module Montis.Core.W where
@@ -7,9 +8,8 @@ import Control.Monad ((<=<))
import Control.Monad.RWS (MonadIO (liftIO), MonadReader (..), MonadState, modify)
import Control.Monad.Reader (ReaderT (runReaderT))
import Control.Monad.State (StateT (runStateT), gets, modify')
-import Control.Monad.Trans.Class
import Control.Monad.Trans.Maybe
-import Data.Data (TypeRep, Typeable, cast, tyConModule, tyConName, tyConPackage)
+import Data.Data (Typeable, cast, tyConModule, tyConName, tyConPackage)
import Data.Default.Class (Default, def)
import Data.Kind (Constraint, Type)
import Data.Map (Map)
diff --git a/plug/src/Montis/Dsl/Bind.hs b/plug/src/Montis/Dsl/Bind.hs
index c7dbc43..ddba481 100644
--- a/plug/src/Montis/Dsl/Bind.hs
+++ b/plug/src/Montis/Dsl/Bind.hs
@@ -1,9 +1,11 @@
+{-# OPTIONS_GHC -Wno-unused-top-binds #-}
-- | eDSL for the 'bind' function. The 'bind' function provides an easy way to
-- bind certain actions to other actions.
module Montis.Dsl.Bind
( bind,
(.+),
MatchEvent (..),
+ MatchModifiers (..),
Modifier (..),
released,
weak,
@@ -14,7 +16,6 @@ module Montis.Dsl.Bind
where
import Control.Monad
-import Control.Monad.Trans
import Data.Bits
import Data.Word
import Montis.Core.ButtonEvent (ButtonEvent(..))
@@ -82,19 +83,18 @@ data MatchModifiers = MatchModifiers
}
instance MatchEvent MatchModifiers where
- matches (MatchModifiers weak bits base) ev = do
+ matches (MatchModifiers weakMatch bits base) ev = do
mods <- getMods ev
b <- liftW $ base ev
return $
b
- && ( (not weak && mods == bits)
- || (weak && (bits .&. mods == bits))
+ && ( (not weakMatch && mods == bits)
+ || (weakMatch && (bits .&. mods == bits))
)
where
getMods (InputButtonEvent (ButtonEvent {ButtonEvent.modifiers = mods})) = return mods
getMods (InputKeyEvent (KeyEvent {KeyEvent.modifiers = mods})) = return mods
- getMods _ = getModifierState
class LiftMatchModifiers a where
toModifiers :: a -> MatchModifiers
diff --git a/plug/src/Montis/Dsl/Buttons.hsc b/plug/src/Montis/Dsl/Buttons.hsc
index 963d5ce..a73ccc6 100644
--- a/plug/src/Montis/Dsl/Buttons.hsc
+++ b/plug/src/Montis/Dsl/Buttons.hsc
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
module Montis.Dsl.Buttons where
import Data.Word
diff --git a/plug/src/Montis/Dsl/Input.hs b/plug/src/Montis/Dsl/Input.hs
index 4855951..a295a19 100644
--- a/plug/src/Montis/Dsl/Input.hs
+++ b/plug/src/Montis/Dsl/Input.hs
@@ -24,7 +24,6 @@ module Montis.Dsl.Input
)
where
-import Control.Concurrent (threadDelay)
import Control.Monad
import Control.Monad.Cont (MonadCont)
import Control.Monad.Loops (andM)
@@ -164,8 +163,6 @@ replayEvents events = do
)
InputM $ modify $ \st -> st {inputSource = newInput}
- where
- delay to act = liftIO (threadDelay to) >> act
-- | Call in the reset handler with the InputM handler you wolud like to use.
useInputHandler :: (InputProxy spy) => InputM spy () -> W ()
diff --git a/plug/src/Montis/Foreign/Export.hs b/plug/src/Montis/Foreign/Export.hs
index f14fb40..f6be82f 100644
--- a/plug/src/Montis/Foreign/Export.hs
+++ b/plug/src/Montis/Foreign/Export.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-unused-top-binds #-}
-- | This module does not export anything. It exists simply to provide C-symbols
-- for the plugin.
module Montis.Foreign.Export () where
diff --git a/plug/src/Montis/Foreign/WlRoots.hs b/plug/src/Montis/Foreign/WlRoots.hs
index 4b0685f..a8b25d2 100644
--- a/plug/src/Montis/Foreign/WlRoots.hs
+++ b/plug/src/Montis/Foreign/WlRoots.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
module Montis.Foreign.WlRoots where
import Foreign (IntPtr, Ptr, Word32, intPtrToPtr, ptrToIntPtr, nullPtr)
diff --git a/plug/src/Montis/Keys/MagicModifierKey.hs b/plug/src/Montis/Keys/MagicModifierKey.hs
index 0cf1eb3..e1a70d5 100644
--- a/plug/src/Montis/Keys/MagicModifierKey.hs
+++ b/plug/src/Montis/Keys/MagicModifierKey.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
module Montis.Keys.MagicModifierKey where
import Data.Data
@@ -5,7 +6,6 @@ import Data.Default.Class
import GHC.TypeNats
import Montis.Core.KeyEvent
import Montis.Core.W
-import Montis.Dsl.Bind
import Montis.Dsl.Input
import Control.Monad.RWS (MonadTrans(lift))
import Control.Monad.Trans.Maybe (MaybeT(..))
diff --git a/plug/src/Montis/Layout/Combine.hs b/plug/src/Montis/Layout/Combine.hs
index 7563876..8079da3 100644
--- a/plug/src/Montis/Layout/Combine.hs
+++ b/plug/src/Montis/Layout/Combine.hs
@@ -1,4 +1,5 @@
{-# LANGUAGE ViewPatterns #-}
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
module Montis.Layout.Combine where
diff --git a/plug/src/Montis/Layout/Full.hs b/plug/src/Montis/Layout/Full.hs
index b2efb91..7715526 100644
--- a/plug/src/Montis/Layout/Full.hs
+++ b/plug/src/Montis/Layout/Full.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-missing-export-lists #-}
module Montis.Layout.Full where
import Data.Data (Typeable)
diff --git a/plug/src/Montis/StackSet.hs b/plug/src/Montis/StackSet.hs
index 9f24514..4101a2f 100644
--- a/plug/src/Montis/StackSet.hs
+++ b/plug/src/Montis/StackSet.hs
@@ -1,11 +1,11 @@
+{-# OPTIONS_GHC -Wno-orphans -Wno-missing-export-lists #-}
+
module Montis.StackSet where
-import Control.Monad (void)
import Data.Monoid (First(..))
import Control.Monad.Identity
import Control.Monad.Writer (MonadWriter (tell), execWriter)
import Data.Maybe (isJust, mapMaybe)
-import Data.Maybe (isJust)
-- | The root datastructure for holding the state of the windows.
data StackSet s sd t l a = StackSet