From f86648cf7cefbd3b5f202eb5a18e5804d896c6e1 Mon Sep 17 00:00:00 2001
From: David Roundy <droundy@darcs.net>
Date: Tue, 11 Mar 2008 22:12:01 +0000
Subject: [PATCH] fix WorkspaceDir to work when there are multiple screens.

In particlar, ScratchWorkspace broke this.
---
 XMonad/Layout/WorkspaceDir.hs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/XMonad/Layout/WorkspaceDir.hs b/XMonad/Layout/WorkspaceDir.hs
index d7ff24e7..f550f467 100644
--- a/XMonad/Layout/WorkspaceDir.hs
+++ b/XMonad/Layout/WorkspaceDir.hs
@@ -30,12 +30,14 @@ module XMonad.Layout.WorkspaceDir (
                                   ) where
 
 import System.Directory ( setCurrentDirectory, getCurrentDirectory )
+import Control.Monad ( when )
 
-import XMonad
+import XMonad hiding ( focus )
 import XMonad.Util.Run ( runProcessWithInput )
 import XMonad.Prompt ( XPConfig )
 import XMonad.Prompt.Directory ( directoryPrompt )
 import XMonad.Layout.LayoutModifier
+import XMonad.StackSet ( Stack, peek, focus )
 
 -- $usage
 -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:
@@ -66,8 +68,10 @@ instance Message Chdir
 
 data WorkspaceDir a = WorkspaceDir String deriving ( Read, Show )
 
-instance LayoutModifier WorkspaceDir a where
-    hook (WorkspaceDir s) = scd s
+instance LayoutModifier WorkspaceDir Window where
+    redoLayout (WorkspaceDir d) _ s wrs = do w <- gets windowset
+                                             when (Just (focus s) == peek w) $ scd d
+                                             return (wrs, Nothing)
     handleMess (WorkspaceDir _) m
         | Just (Chdir wd) <- fromMessage m = do wd' <- cleanDir wd
                                                 return $ Just $ WorkspaceDir wd'