From 8cd6c6a3aa9f06546a93a2ed25848682b72e3ddd Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Sat, 31 Mar 2007 03:00:24 +0200 Subject: Move safeFocus from Main to Operations darcs-hash:20070331010024-a5988-73c72204cd204872dd7a2339c1e805e2a0578a58 --- Main.hs | 7 ------- Operations.hs | 7 +++++++ 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 -- cgit v1.2.3