Fix EwmhDesktops, ManageDocks, and SetWMName compilation for amd64

darcs-hash:20071010213853-bd4fb-66e3492b55dc7aeb9dee18201a66f540b52e8b53.gz

1 files changed, 64 insertions, 64 deletions

diff --git a/EwmhDesktops.hs b/EwmhDesktops.hs
index 0fbe0fa..ee69c98 100644
--- a/EwmhDesktops.hs
+++ b/EwmhDesktops.hs
@@ -12,14 +12,14 @@
 -- workspaces and the windows therein.
 -----------------------------------------------------------------------------
 module XMonadContrib.EwmhDesktops (
-	-- * Usage
-	-- $usage
-	ewmhDesktopsLogHook
-	) where
+    -- * Usage
+    -- $usage
+    ewmhDesktopsLogHook
+    ) where
 
-import Data.List	(elemIndex, sortBy)
-import Data.Ord 	(comparing)
-import Data.Maybe	(fromMaybe)
+import Data.List    (elemIndex, sortBy)
+import Data.Ord     (comparing)
+import Data.Maybe   (fromMaybe)
 
 import Control.Monad.Reader
 import XMonad
@@ -48,83 +48,83 @@ import XMonadContrib.SetWMName
 -- of the current state of workspaces and windows.
 ewmhDesktopsLogHook :: X ()
 ewmhDesktopsLogHook = withWindowSet $ \s -> do
-	-- Bad hack because xmonad forgets the original order of things, it seems
-	-- see http://code.google.com/p/xmonad/issues/detail?id=53
-	let ws = sortBy (comparing W.tag) $ W.workspaces s
-	let wins = W.allWindows s
+    -- Bad hack because xmonad forgets the original order of things, it seems
+    -- see http://code.google.com/p/xmonad/issues/detail?id=53
+    let ws = sortBy (comparing W.tag) $ W.workspaces s
+    let wins = W.allWindows s
 
-	setSupported
+    setSupported
 
-	-- Number of Workspaces
-	setNumberOfDesktops (length ws)
+    -- Number of Workspaces
+    setNumberOfDesktops (length ws)
 
-	-- Names thereof
-	setDesktopNames (map W.tag ws)
-	
-	-- Current desktop
-	fromMaybe (return ()) $ do
-		n <- W.lookupWorkspace 0 s
-		i <- elemIndex n $ map W.tag ws
-		return $ setCurrentDesktop i
+    -- Names thereof
+    setDesktopNames (map W.tag ws)
 
-	setClientList wins
+    -- Current desktop
+    fromMaybe (return ()) $ do
+        n <- W.lookupWorkspace 0 s
+        i <- elemIndex n $ map W.tag ws
+        return $ setCurrentDesktop i
 
-	-- Per window Desktop
-	forM (zip ws [(0::Int)..]) $ \(w, wn) ->
-		forM (W.integrate' (W.stack w)) $ \win -> do 
-			setWindowDesktop win wn
-	
-	return ()
+    setClientList wins
+
+    -- Per window Desktop
+    forM (zip ws [(0::Int)..]) $ \(w, wn) ->
+        forM (W.integrate' (W.stack w)) $ \win -> do
+            setWindowDesktop win wn
+
+    return ()
 
 
 setNumberOfDesktops :: (Integral a) => a -> X ()
-setNumberOfDesktops n = withDisplay $ \dpy -> do 
-        a <- getAtom "_NET_NUMBER_OF_DESKTOPS"
-        c <- getAtom "CARDINAL"
-	r <- asks theRoot
-	io $ changeProperty32 dpy r a c propModeReplace [fromIntegral n]
+setNumberOfDesktops n = withDisplay $ \dpy -> do
+    a <- getAtom "_NET_NUMBER_OF_DESKTOPS"
+    c <- getAtom "CARDINAL"
+    r <- asks theRoot
+    io $ changeProperty32 dpy r a c propModeReplace [fromIntegral n]
 
 setCurrentDesktop :: (Integral a) => a -> X ()
 setCurrentDesktop i = withDisplay $ \dpy -> do
-	a <- getAtom "_NET_CURRENT_DESKTOP"
-	c <- getAtom "CARDINAL"
-	r <- asks theRoot
-	io $ changeProperty32 dpy r a c propModeReplace [fromIntegral i]
+    a <- getAtom "_NET_CURRENT_DESKTOP"
+    c <- getAtom "CARDINAL"
+    r <- asks theRoot
+    io $ changeProperty32 dpy r a c propModeReplace [fromIntegral i]
 
 setDesktopNames :: [String] -> X ()
 setDesktopNames names = withDisplay $ \dpy -> do
-	-- Names thereof
-	r <- asks theRoot
-	a <- getAtom "_NET_DESKTOP_NAMES"
-	c <- getAtom "UTF8_STRING"
-	let names' = map (fromIntegral.fromEnum) $
-			concatMap (("Workspace "++) . (++['\0'])) names
-	io $ changeProperty8 dpy r a c propModeReplace names'
+    -- Names thereof
+    r <- asks theRoot
+    a <- getAtom "_NET_DESKTOP_NAMES"
+    c <- getAtom "UTF8_STRING"
+    let names' = map (fromIntegral.fromEnum) $
+            concatMap (("Workspace "++) . (++['\0'])) names
+    io $ changeProperty8 dpy r a c propModeReplace names'
 
 setClientList :: [Window] -> X ()
 setClientList wins = withDisplay $ \dpy -> do
-	-- (What order do we really need? Something about age and stacking)
-	r <- asks theRoot
-	c <- getAtom "WINDOW"
-	a <- getAtom "_NET_CLIENT_LIST"
-	io $ changeProperty32 dpy r a c propModeReplace wins
-	a' <- getAtom "_NET_CLIENT_LIST_STACKING"
-	io $ changeProperty32 dpy r a' c propModeReplace wins
+    -- (What order do we really need? Something about age and stacking)
+    r <- asks theRoot
+    c <- getAtom "WINDOW"
+    a <- getAtom "_NET_CLIENT_LIST"
+    io $ changeProperty32 dpy r a c propModeReplace (fmap fromIntegral wins)
+    a' <- getAtom "_NET_CLIENT_LIST_STACKING"
+    io $ changeProperty32 dpy r a' c propModeReplace (fmap fromIntegral wins)
 
 setWindowDesktop :: (Integral a) => Window -> a -> X ()
-setWindowDesktop win i = withDisplay $ \dpy -> do 
-	a <- getAtom "_NET_WM_DESKTOP"
-	c <- getAtom "CARDINAL"
-	io $ changeProperty32 dpy win a c propModeReplace [fromIntegral i]
+setWindowDesktop win i = withDisplay $ \dpy -> do
+    a <- getAtom "_NET_WM_DESKTOP"
+    c <- getAtom "CARDINAL"
+    io $ changeProperty32 dpy win a c propModeReplace [fromIntegral i]
 
 setSupported :: X ()
-setSupported = withDisplay $ \dpy -> do 
-	r <- asks theRoot
-	a <- getAtom "_NET_SUPPORTED"
-	c <- getAtom "ATOM"
-	supp <- mapM getAtom ["_NET_WM_STATE_HIDDEN"]
-	io $ changeProperty32 dpy r a c propModeReplace supp
-	
-	setWMName "xmonad"
+setSupported = withDisplay $ \dpy -> do
+    r <- asks theRoot
+    a <- getAtom "_NET_SUPPORTED"
+    c <- getAtom "ATOM"
+    supp <- mapM getAtom ["_NET_WM_STATE_HIDDEN"]
+    io $ changeProperty32 dpy r a c propModeReplace (fmap fromIntegral supp)
+
+    setWMName "xmonad"