diff options
| author | Devin Mullins <me@twifkak.com> | 2007-10-06 09:09:59 +0200 |
|---|---|---|
| committer | Devin Mullins <me@twifkak.com> | 2007-10-06 09:09:59 +0200 |
| commit | fcec780f4bf68073bfad76998b05bf8663e9b83f (patch) | |
| tree | 7259dd31f4ec7a516ee63310bfbedb0bef6e9094 /WorkspaceDir.hs | |
| parent | 6ee3d30ce497d673bdc25592b846c14b4b660a17 (diff) | |
| download | XMonadContrib-fcec780f4bf68073bfad76998b05bf8663e9b83f.tar.gz XMonadContrib-fcec780f4bf68073bfad76998b05bf8663e9b83f.tar.xz XMonadContrib-fcec780f4bf68073bfad76998b05bf8663e9b83f.zip | |
change Dmenu functions to return IO/X (Maybe String)
dmenu exits with code 1 when you hit Escape, and I wanna create a contrib that
takes advantage of that.
This required changes in four contribs (Commands, DirectoryPrompt, ShellPrompt,
and WorkspaceDir), and might require changes in users' Configs. Also, I'm not
sure some of the changes I made to the client code are very Haskelly. Would
appreciate input there.
darcs-hash:20071006070959-78224-eeefb4300d6d3de7b199f2b1ad37ba43384e03f1.gz
Diffstat (limited to 'WorkspaceDir.hs')
| -rw-r--r-- | WorkspaceDir.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WorkspaceDir.hs b/WorkspaceDir.hs index 97e5f94..32f548d 100644 --- a/WorkspaceDir.hs +++ b/WorkspaceDir.hs @@ -68,8 +68,10 @@ workspaceDir :: LayoutClass l a => String -> l a workspaceDir s = ModifiedLayout (WorkspaceDir s) scd :: String -> X () -scd x = do x' <- io (runProcessWithInput "bash" [] ("echo -n " ++ x) `catch` \_ -> return x) - catchIO $ setCurrentDirectory x' +scd x = do x' <- io (runProcessWithInput "bash" [] ("echo -n " ++ x) `catch` \_ -> return Nothing) + case x' of + Just newDir -> catchIO $ setCurrentDirectory newDir + Nothing -> return () changeDir :: XPConfig -> X () changeDir c = directoryPrompt c "Set working directory: " (sendMessage . Chdir) |