twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

X.L.SubLayouts: Use ScopedTypeVariables as intended years ago

Browse Source 
We don't need to support GHC 6.8.2 any more. :-)
This commit is contained in:
Tomas Janousek 2022-02-18 18:55:39 +00:00
parent 6a6e4bcce8
commit a6c048899c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
XMonad/Layout/SubLayouts.hs
View File

@ -1,4 +1,11 @@
{-# LANGUAGE PatternGuards, ParallelListComp, FlexibleInstances, FlexibleContexts, MultiParamTypeClasses, ViewPatterns #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE ParallelListComp #-}
{-# LANGUAGE PatternGuards #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE ViewPatterns #-}
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- | -- |
-- Module : XMonad.Layout.SubLayouts -- Module : XMonad.Layout.SubLayouts
@ -298,7 +305,7 @@ onGroup f = withFocused (sendMessage . WithGroup (return . f))
toSubl :: (Message a) => a -> X () toSubl :: (Message a) => a -> X ()
toSubl m = withFocused (sendMessage . SubMessage (SomeMessage m)) toSubl m = withFocused (sendMessage . SubMessage (SomeMessage m))
instance (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModifier (Sublayout l) Window where instance forall l. (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModifier (Sublayout l) Window where
modifyLayout Sublayout{ subls = osls } (W.Workspace i la st) r = do modifyLayout Sublayout{ subls = osls } (W.Workspace i la st) r = do
let gs' = updateGroup st $ toGroups osls let gs' = updateGroup st $ toGroups osls
st' = W.filter (`elem` M.keys gs') =<< st st' = W.filter (`elem` M.keys gs') =<< st
@ -398,10 +405,8 @@ instance (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModif
findGroup z = mplus (M.lookup z gs) $ listToMaybe findGroup z = mplus (M.lookup z gs) $ listToMaybe
$ M.elems $ M.filter ((z `elem`) . W.integrate) gs $ M.elems $ M.filter ((z `elem`) . W.integrate) gs
-- catchLayoutMess :: LayoutMessages -> X (Maybe (Sublayout l Window))
-- This l must be the same as from the instance head, catchLayoutMess :: LayoutMessages -> X (Maybe (Sublayout l Window))
-- -XScopedTypeVariables should bring it into scope, but we are
-- trying to avoid warnings with ghc-6.8.2 and avoid CPP
catchLayoutMess x = do catchLayoutMess x = do
let m' = x `asTypeOf` (undefined :: LayoutMessages) let m' = x `asTypeOf` (undefined :: LayoutMessages)
ms' <- zip (repeat $ SomeMessage m') . W.integrate' ms' <- zip (repeat $ SomeMessage m') . W.integrate'