diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-09-11 02:20:53 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-09-11 02:20:53 +0200 |
| commit | 44e16cb55e3564ac40b6d8ce107680bdf0dc29bc (patch) | |
| tree | 5d37c6a9d0983c5672d7c47c851cdfa0eef06197 | |
| parent | cf6ed48334aa06718b29abf45b2be8ee2683a977 (diff) | |
| download | metatile-44e16cb55e3564ac40b6d8ce107680bdf0dc29bc.tar metatile-44e16cb55e3564ac40b6d8ce107680bdf0dc29bc.zip | |
Use none for zero XIDs
| -rw-r--r-- | XMonad/Core.hs | 4 | ||||
| -rw-r--r-- | XMonad/Main.hsc | 8 | ||||
| -rw-r--r-- | XMonad/Operations.hs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/XMonad/Core.hs b/XMonad/Core.hs index 483bc28..91defbf 100644 --- a/XMonad/Core.hs +++ b/XMonad/Core.hs @@ -51,7 +51,7 @@ import System.Process import System.Directory import System.Exit import Graphics.X11.Xlib hiding (Screen) -import Graphics.X11.Xlib.Extras (Event) +import Graphics.X11.Xlib.Extras (Event, none) import Data.Typeable import Data.List ((\\)) import Data.Maybe (isJust,fromMaybe) @@ -233,7 +233,7 @@ getAtom :: String -> X Atom getAtom str = withDisplay $ \dpy -> io $ internAtom dpy str False emptyWindowState :: X WindowState -emptyWindowState = asks (defaultBorderWidth . config) >>= return . WindowState False 0 0 +emptyWindowState = asks (defaultBorderWidth . config) >>= return . WindowState False 0 none getWindowState :: Window -> X WindowState getWindowState w = do diff --git a/XMonad/Main.hsc b/XMonad/Main.hsc index d09e024..4c00b20 100644 --- a/XMonad/Main.hsc +++ b/XMonad/Main.hsc @@ -313,7 +313,7 @@ reparent :: Window -> X () reparent w = withDisplay $ \dpy -> do rootw <- asks theRoot p <- asks normalBorder - noFrame <- getsWindowState ((==0) . wsFrame) w + noFrame <- getsWindowState ((==none) . wsFrame) w when noFrame $ do trace $ "reparent: " ++ show w frame <- io $ allocaSetWindowAttributes $ \swa -> do @@ -329,15 +329,15 @@ reparent w = withDisplay $ \dpy -> do hideParent :: Window -> X () hideParent w = withDisplay $ \dpy -> do frame <- getsWindowState wsFrame w - when (frame /= 0) $ io $ unmapWindow dpy frame + when (frame /= none) $ io $ unmapWindow dpy frame unparent :: Window -> X () unparent w = withDisplay $ \dpy -> do trace $ "unparent: " ++ show w frame <- getsWindowState wsFrame w - when (frame /= 0) $ do + when (frame /= none) $ do io $ destroyWindow dpy frame - modifyWindowState (\ws -> ws { wsFrame = 0 }) w + modifyWindowState (\ws -> ws { wsFrame = none }) w -- --------------------------------------------------------------------- -- IO stuff. Doesn't require any X state diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs index ad6f8b1..1723ed8 100644 --- a/XMonad/Operations.hs +++ b/XMonad/Operations.hs @@ -202,7 +202,7 @@ reveal w = withDisplay $ \d -> do -- send absolute ConfigureNotify allocaXEvent $ \event -> do setEventType event configureNotify - setConfigureEvent event w w (fi x') (fi y') (fi width') (fi height') 0 0 False + setConfigureEvent event w w (fi x') (fi y') (fi width') (fi height') 0 none False sendEvent d w False structureNotifyMask event modifyWindowState (\ws -> ws { wsMapped = True }) w where |