summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpencer Janssen <sjanssen@cse.unl.edu>2007-03-31 03:00:24 +0200
committerSpencer Janssen <sjanssen@cse.unl.edu>2007-03-31 03:00:24 +0200
commit8cd6c6a3aa9f06546a93a2ed25848682b72e3ddd (patch)
treef284f916c2eeb11f946bf587c3ae1b6e1fec63ba
parent9a248e6bd9493099b6dd6db56c0b89a123dc522e (diff)
downloadmetatile-8cd6c6a3aa9f06546a93a2ed25848682b72e3ddd.tar
metatile-8cd6c6a3aa9f06546a93a2ed25848682b72e3ddd.zip
Move safeFocus from Main to Operations
darcs-hash:20070331010024-a5988-73c72204cd204872dd7a2339c1e805e2a0578a58
-rw-r--r--Main.hs7
-rw-r--r--Operations.hs7
2 files changed, 7 insertions, 7 deletions
diff --git a/Main.hs b/Main.hs
index bfa6247..71d7eb2 100644
--- a/Main.hs
+++ b/Main.hs
@@ -121,13 +121,6 @@ grabKeys dpy rootw = do
-- override_redirect member is True.
--
-safeFocus :: Window -> X ()
-safeFocus w = do ws <- gets workspace
- if W.member w ws
- then setFocus w
- else do b <- isRoot w
- when b setTopFocus
-
handle :: Event -> X ()
-- run window manager command
diff --git a/Operations.hs b/Operations.hs
index 9b0a229..c0e4450 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -136,6 +136,13 @@ withServerX f = withDisplay $ \dpy -> do
f
io $ ungrabServer dpy
+safeFocus :: Window -> X ()
+safeFocus w = do ws <- gets workspace
+ if W.member w ws
+ then setFocus w
+ else do b <- isRoot w
+ when b setTopFocus
+
-- | Explicitly set the keyboard focus to the given window
setFocus :: Window -> X ()
setFocus w = do