Break out the ModifyDescription into its own file.

2 files changed, 10 insertions, 43 deletions

diff --git a/src/Rahm/Desktop/Keys.hs b/src/Rahm/Desktop/Keys.hs
index b8a4c4e..c8d9092 100644
--- a/src/Rahm/Desktop/Keys.hs
+++ b/src/Rahm/Desktop/Keys.hs
@@ -56,6 +56,7 @@ import Rahm.Desktop.RebindKeys
 import Rahm.Desktop.Swallow
 import Rahm.Desktop.Layout.Pop (PopMessage(..))
 import Rahm.Desktop.Layout.Flip (flipHorizontally, flipVertically)
+import Rahm.Desktop.Layout.Rotate (rotateLayout)
 import Rahm.Desktop.ScreenRotate (screenRotateForward, screenRotateBackward)
 
 type KeyMap l = XConfig l -> Map (KeyMask, KeySym) (X ())
@@ -398,7 +399,7 @@ keymap = runKeys $ do
     justMod $ doc "Run a command via Rofi" runDMenu
     shiftMod $
       doc "Rotate the current layout. (flips x, y coordinates)" $
-      sendMessage DoRotate
+      sendMessage rotateLayout
 
   bind xK_s $ do
     altMod $ spawnX "sudo -A systemctl suspend && xsecurelock"
diff --git a/src/Rahm/Desktop/Layout/Layout.hs b/src/Rahm/Desktop/Layout/Layout.hs
index 88143cd..2719bea 100644
--- a/src/Rahm/Desktop/Layout/Layout.hs
+++ b/src/Rahm/Desktop/Layout/Layout.hs
@@ -10,6 +10,7 @@ import XMonad.Layout.Accordion
 import Control.Applicative
 import XMonad.Layout.Spacing
 import Data.List
+import Data.Typeable (cast)
 import XMonad.Layout.Spiral
 import XMonad.Layout.ThreeColumns
 import XMonad.Layout.Grid
@@ -30,6 +31,7 @@ import Rahm.Desktop.Layout.ReinterpretMessage
 import Rahm.Desktop.Layout.Pop
 import Rahm.Desktop.Layout.Flip
 import Rahm.Desktop.Layout.Rotate
+import Rahm.Desktop.Layout.Redescribe
 
 import qualified Data.Map as M
 import qualified XMonad.StackSet as W
@@ -44,8 +46,8 @@ myLayout =
           mods (reinterpretIncMaster $ spiral (6/7)) |:
           mods (modifyMosaic (MosaicAlt M.empty :: MosaicAlt Window)) |:
           mods (reinterpretIncMaster $ Corner (3/4) (3/100)) |:
-          mods (ModifyDescription TallDescriptionModifier (Tall 1 (3/100) (1/2))) |:
-          mods (ModifyDescription ThreeColDescMod (ThreeCol 1 (3/100) (1/2))) |:
+          mods (Redescribe UsingTall (Tall 1 (3/100) (1/2))) |:
+          mods (Redescribe UsingThreeCol (ThreeCol 1 (3/100) (1/2))) |:
           mods Grid |:
           mods (Dishes 2 (1/6)) |:
           mods (reinterpretIncMaster $ D.Dwindle D.R D.CW 1.5 1.1) |:
@@ -91,47 +93,11 @@ reinterpretIncMaster ::
   l a -> ModifiedLayout (ReinterpretMessage "IncMasterToResizeMaster") l a
 reinterpretIncMaster = ModifiedLayout ReinterpretMessage
 
-
-data ModifyDescription m l a = ModifyDescription m (l a)
-  deriving (Show, Read)
-
-data TallDescriptionModifier = TallDescriptionModifier
-  deriving (Show, Read)
-
-data ThreeColDescMod = ThreeColDescMod
-  deriving (Show, Read)
-
-class DescriptionModifier m l where
-  newDescription :: m -> l a -> String -> String
-
-instance (Typeable m, Show m, DescriptionModifier m l, LayoutClass l a) => LayoutClass (ModifyDescription m l) a where
-  runLayout (W.Workspace t (ModifyDescription m l) a) rect = do
-    (rects, maybeNewLayout) <- runLayout (W.Workspace t l a) rect
-    return (rects, fmap (ModifyDescription m) maybeNewLayout)
-
-  doLayout (ModifyDescription m l) a s = do
-    (rects, maybeNewLayout) <- doLayout l a s
-    return (rects, fmap (ModifyDescription m) maybeNewLayout)
-
-  pureLayout (ModifyDescription m l) a s = pureLayout l a s
-
-  emptyLayout (ModifyDescription m l) a = do
-    (rects, maybeNewLayout) <- emptyLayout l a
-    return (rects, fmap (ModifyDescription m) maybeNewLayout)
-
-  handleMessage (ModifyDescription m l) a = do
-    maybeNewLayout <- handleMessage l a
-    return (ModifyDescription m <$> maybeNewLayout)
-
-  pureMessage (ModifyDescription m l) a =
-    let maybeNewLayout = pureMessage l a in
-      ModifyDescription m <$> maybeNewLayout
-
-  description (ModifyDescription m l) = newDescription m l (description l)
-
-instance DescriptionModifier TallDescriptionModifier Tall where
+data UsingTall = UsingTall deriving (Read, Show)
+instance Describer UsingTall Tall where
   newDescription _ (Tall mast _ _) _ = "Tall(" ++ show mast ++ ")"
 
-instance DescriptionModifier ThreeColDescMod ThreeCol where
+data UsingThreeCol = UsingThreeCol deriving (Read, Show)
+instance Describer UsingThreeCol ThreeCol where
   newDescription _ (ThreeCol mast _ _) _ = "ThreeCol(" ++ show mast ++ ")"
   newDescription _ (ThreeColMid mast _ _) _ = "ThreeColMid(" ++ show mast ++ ")"