neocturne/xmonad-conf
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary debug output

Browse source
This commit is contained in:
Matthias Schiffer 2011-02-25 21:11:04 +01:00
parent cd08ed8a00
commit 7cecc3bf51
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ProcessWorkspaces.hs
View file

@ -18,8 +18,6 @@ import Graphics.X11.Types (Window)
import System.Posix.Process (getProcessPriority) import System.Posix.Process (getProcessPriority)
import System.Posix.Types (ProcessID) import System.Posix.Types (ProcessID)
import Prelude hiding ( catch )
import Control.OldException (catch)
import Control.Monad import Control.Monad
import Data.Maybe import Data.Maybe
import Data.Monoid import Data.Monoid
@ -31,14 +29,11 @@ import Storage
moveWindowHook :: ManageHook moveWindowHook :: ManageHook
moveWindowHook = do moveWindowHook = do
mp <- pid mp <- pid
io $ appendFile "/tmp/test" $ "Pid: " ++ show mp ++ "\n"
case mp of case mp of
Just p -> do Just p -> do
mws <- liftX $ getProcessWorkspace p mws <- liftX $ getProcessWorkspace p
io $ appendFile "/tmp/test" $ "WS: " ++ show mws ++ "\n"
case mws of case mws of
Just ws -> do Just ws ->
io $ appendFile "/tmp/test" $ show ws ++ "\n"
doShift ws doShift ws
_ -> _ ->
idHook idHook
@ -55,11 +50,9 @@ processWorkspaceStorage = storage $ ProcessWorkspaceStoreData M.empty
setProcessWorkspace :: ProcessID -> WorkspaceId -> X () setProcessWorkspace :: ProcessID -> WorkspaceId -> X ()
setProcessWorkspace pid ws = do setProcessWorkspace pid ws = do
io $ appendFile "/tmp/test" $ "Added " ++ show (pid, ws) ++ "\n"
ProcessWorkspaceStoreData map <- liftM (fromMaybe $ ProcessWorkspaceStoreData M.empty) $ getStoreData ProcessWorkspaceStoreData map <- liftM (fromMaybe $ ProcessWorkspaceStoreData M.empty) $ getStoreData
map' <- filterPIDMap $ M.insert pid ws map map' <- filterPIDMap $ M.insert pid ws map
setStoreData $ ProcessWorkspaceStoreData map' setStoreData $ ProcessWorkspaceStoreData map'
io (appendFile "/tmp/test" $ show map' ++ "\n")
getProcessWorkspace :: ProcessID -> X (Maybe WorkspaceId) getProcessWorkspace :: ProcessID -> X (Maybe WorkspaceId)
getProcessWorkspace pid = getStoreData >>= return . join . fmap (\(ProcessWorkspaceStoreData map) -> M.lookup pid map) getProcessWorkspace pid = getStoreData >>= return . join . fmap (\(ProcessWorkspaceStoreData map) -> M.lookup pid map)
@ -74,16 +67,8 @@ spawnOnCurrent :: String -> X ()
spawnOnCurrent x = gets (W.currentTag . windowset) >>= \ws -> spawnOn ws x spawnOnCurrent x = gets (W.currentTag . windowset) >>= \ws -> spawnOn ws x
catchX' :: X a -> X a -> X a
catchX' job errcase = do
st <- get
c <- ask
(a, s') <- io $ runX c st job `catch` \_ -> runX c st errcase
put s'
return a
filterPIDMap :: M.Map ProcessID a -> X (M.Map ProcessID a) filterPIDMap :: M.Map ProcessID a -> X (M.Map ProcessID a)
filterPIDMap = liftM M.fromAscList . filterM (pidExists . fst) . M.toAscList filterPIDMap = liftM M.fromAscList . filterM (pidExists . fst) . M.toAscList
where where
pidExists :: ProcessID -> X Bool pidExists :: ProcessID -> X Bool
pidExists pid = catchX' (io (getProcessPriority pid) >> return True) (return False) pidExists pid = io $ ((getProcessPriority pid) >> return True) `catch` (\_ -> return False)