twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-16 04:33:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Magnifier.hs: update so it at least compiles

Browse Source 
Code modified on advice of Wachter; note I make absolutely no claims that the code runs correctly or doesn't eat your pets or does anything besides compile without any warnings.
This commit is contained in:
gwern0
2007-11-08 01:25:22 +00:00
parent a5799ec85f
commit 0e016a6fa5
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
XMonad/Layout/Magnifier.hs
View File

@@ -5,7 +5,7 @@
-- Module : XMonad.Layout.Magnifier -- Module : XMonad.Layout.Magnifier
-- Copyright : (c) Peter De Wachter 2007 -- Copyright : (c) Peter De Wachter 2007
-- License : BSD-style (see xmonad/LICENSE) -- License : BSD-style (see xmonad/LICENSE)
-- --
-- Maintainer : Peter De Wachter <pdewacht@gmail.com> -- Maintainer : Peter De Wachter <pdewacht@gmail.com>
-- Stability : unstable -- Stability : unstable
-- Portability : unportable -- Portability : unportable
@@ -20,12 +20,14 @@
module XMonad.Layout.Magnifier ( module XMonad.Layout.Magnifier (
-- * Usage -- * Usage
-- $usage -- $usage
magnifier, magnifier') where magnifier,
Magnifier(..),
Magnifier'(..)) where
import Graphics.X11.Xlib (Window, Rectangle(..)) import Graphics.X11.Xlib (Window, Rectangle(..))
import XMonad import XMonad
import XMonad.StackSet import XMonad.StackSet
-- import XMonad.Layout.LayoutHelpers import XMonad.Layout.LayoutModifier
-- $usage -- $usage
-- > import XMonad.Layout.Magnifier -- > import XMonad.Layout.Magnifier
@@ -36,18 +38,25 @@ import XMonad.StackSet
-- %layout , magnifier $ mirror tiled -- %layout , magnifier $ mirror tiled
-- | Increase the size of the window that has focus, unless it is the master window. -- | Increase the size of the window that has focus, unless it is the master window.
magnifier :: Layout Window -> Layout Window data Magnifier a = Magnifier deriving (Read, Show)
magnifier = layoutModify (unlessMaster applyMagnifier) idModMod instance LayoutModifier Magnifier Window where
modifierDescription _ = "Magnifier"
redoLayout _ = unlessMaster applyMagnifier
-- | Increase the size of the window that has focus, even if it is the master window. -- | Increase the size of the window that has focus, even if it is the master window.
magnifier' :: Layout Window -> Layout Window data Magnifier' a = Magnifier' deriving (Read, Show)
magnifier' = layoutModify applyMagnifier idModMod instance LayoutModifier Magnifier' Window where
modifierDescription _ = "Magnifier'"
redoLayout _ = applyMagnifier
unlessMaster :: ModDo Window -> ModDo Window magnifier :: l a -> ModifiedLayout Magnifier l a
magnifier = ModifiedLayout Magnifier
unlessMaster :: forall t t1 a a1 (m :: * -> *). (Monad m) => (t -> Stack a -> t1 -> m (t1, Maybe a1)) -> t -> Stack a -> t1 -> m (t1, Maybe a1)
unlessMaster mainmod r s wrs = if null (up s) then return (wrs, Nothing) unlessMaster mainmod r s wrs = if null (up s) then return (wrs, Nothing)
else mainmod r s wrs else mainmod r s wrs
applyMagnifier :: ModDo Window applyMagnifier :: Rectangle -> t -> [(Window, Rectangle)] -> X ([(Window, Rectangle)], Maybe a)
applyMagnifier r _ wrs = do focused <- withWindowSet (return . peek) applyMagnifier r _ wrs = do focused <- withWindowSet (return . peek)
let mag (w,wr) ws | focused == Just w = ws ++ [(w, shrink r $ magnify wr)] let mag (w,wr) ws | focused == Just w = ws ++ [(w, shrink r $ magnify wr)]
| otherwise = (w,wr) : ws | otherwise = (w,wr) : ws
@@ -63,7 +72,7 @@ magnify (Rectangle x y w h) = Rectangle x' y' w' h'
shrink :: Rectangle -> Rectangle -> Rectangle shrink :: Rectangle -> Rectangle -> Rectangle
shrink (Rectangle sx sy sw sh) (Rectangle x y w h) = Rectangle x' y' w' h' shrink (Rectangle sx sy sw sh) (Rectangle x y w h) = Rectangle x' y' w' h'
where x' = max sx x where x' = max sx x
y' = max sy y y' = max sy y
w' = min w (fromIntegral sx + sw - fromIntegral x') w' = min w (fromIntegral sx + sw - fromIntegral x')
h' = min h (fromIntegral sy + sh - fromIntegral y') h' = min h (fromIntegral sy + sh - fromIntegral y')