general refactor, and call xerrorhandler to ignore certain undetectable issues

darcs-hash:20070311102653-9c5c1-de74160d207f006000afc640dc9745d1b20ce05b.gz

1 files changed, 6 insertions, 3 deletions

diff --git a/XMonad.hs b/XMonad.hs
index 77c5a2e..8e03d78 100644
--- a/XMonad.hs
+++ b/XMonad.hs
@@ -23,14 +23,17 @@ import StackSet (StackSet)
 import Control.Monad.State
 import System.IO
 import System.Process (runCommand)
-import Graphics.X11.Xlib (Display,Window)
+import Graphics.X11.Xlib
 
 -- | XState, the window manager state.
 -- Just the display, width, height and a window list
 data XState = XState
     { display       :: Display
-    , screenWidth   :: {-# UNPACK #-} !Int
-    , screenHeight  :: {-# UNPACK #-} !Int
+    , screen        :: {-# UNPACK #-} !ScreenNumber
+    , theRoot       :: {-# UNPACK #-} !Window
+    , wmdelete      :: {-# UNPACK #-} !Atom
+    , wmprotocols   :: {-# UNPACK #-} !Atom
+    , dimensions    :: {-# UNPACK #-} !(Int,Int)
     , workspace     :: {-# UNPACK #-} !WorkSpace      -- ^ workspace list
     }