From 5b15ba883573eb862c53a4ed4f159cdaa45ea808 Mon Sep 17 00:00:00 2001
From: Ilya Portnov <portnov84@rambler.ru>
Date: Mon, 16 May 2011 00:22:53 +0600
Subject: [PATCH] Cleanup.

---
 lib/AppGroups.hs   |    6 +-----
 lib/GroupsSetup.hs |    2 +-
 lib/KeyBindings.hs |    8 +-------
 lib/Mouse.hs       |    3 ---
 lib/Themes.hs      |    7 +++----
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/lib/AppGroups.hs b/lib/AppGroups.hs
index 3ad3086..03ffa55 100644
--- a/lib/AppGroups.hs
+++ b/lib/AppGroups.hs
@@ -20,7 +20,7 @@ import XMonad.Actions.DynamicWorkspaces
 import XMonad.Util.WindowProperties
 import XMonad.Util.WindowPropertiesRE
 
-import CommonFunctions ((~?), selectOneWindow)
+import CommonFunctions (selectOneWindow)
 
 -- | Shortcut key
 type Key = String
@@ -68,10 +68,6 @@ instance Condition Property where
 instance Condition PropertyRE where
   toQuery (RE p) = propertyToQueryRE p
 
--- | Query WM_WINDOW_ROLE atom
-role :: Query String
-role = stringProperty "WM_WINDOW_ROLE"
-
 -- | Turn any X () operation on window into ManageHook
 fromWindowOp :: (Window -> X()) -> ManageHook
 fromWindowOp fn = ask >>= \w -> liftX (fn w) >> doF id
diff --git a/lib/GroupsSetup.hs b/lib/GroupsSetup.hs
index d8d54e4..627f008 100644
--- a/lib/GroupsSetup.hs
+++ b/lib/GroupsSetup.hs
@@ -5,7 +5,7 @@ import XMonad.Util.WindowProperties
 import XMonad.Util.WindowPropertiesRE
 
 import AppGroups
-import CommonFunctions (textEditors, recent, edit_config)
+import CommonFunctions (textEditors, recent)
 
 regex = C . RE . ClassName
 
diff --git a/lib/KeyBindings.hs b/lib/KeyBindings.hs
index 6fa0cfd..21e56e6 100644
--- a/lib/KeyBindings.hs
+++ b/lib/KeyBindings.hs
@@ -12,26 +12,20 @@ import qualified XMonad.StackSet as W
 
 import XMonad.Util.WindowProperties
 import XMonad.Hooks.ManageDocks hiding (L,R)
-import XMonad.Hooks.UrgencyHook
 
 import XMonad.Actions.Plane
 import XMonad.Actions.DwmPromote
 import XMonad.Actions.GridSelect
-import XMonad.Actions.FindEmptyWorkspace
 import XMonad.Actions.GroupNavigation
 
-import XMonad.Layout.MultiToggle
-import XMonad.Layout.MultiToggle.Instances
 import XMonad.Layout.Maximize
 import XMonad.Layout.Minimize
 import XMonad.Layout.SubLayouts
 import qualified XMonad.Layout.WindowNavigation as Nav
 
-import XMonad.Prompt.Window
-
 import CommonFunctions
 import Mouse
-import Themes      (myXPConfig, myGSConfig, searchGS)
+import Themes      (myGSConfig, searchGS)
 import AppGroups   (switchToApp, runNewApp)
 import GroupsSetup (myApps)
 
diff --git a/lib/Mouse.hs b/lib/Mouse.hs
index 05298f7..60e6685 100644
--- a/lib/Mouse.hs
+++ b/lib/Mouse.hs
@@ -5,9 +5,6 @@ module Mouse
   where
 
 import Graphics.X11.Xlib
-import Graphics.X11.Xlib.Types
-import Graphics.X11.Xlib.Misc
-import Foreign
 import Foreign.C.Types
 
 import XMonad
diff --git a/lib/Themes.hs b/lib/Themes.hs
index 28cdc5b..792a344 100644
--- a/lib/Themes.hs
+++ b/lib/Themes.hs
@@ -26,8 +26,8 @@ searchGS = defaultGSConfig {
   gs_font = myFont }
 
 search :: TwoD a (Maybe a)
-search = makeXEventhandler $ shadowWithKeymap navNSearchKeyMap navNSearchDefaultHandler
-  where navNSearchKeyMap = M.fromList [
+search = makeXEventhandler $ shadowWithKeymap keymap handler
+  where keymap = M.fromList [
            ((0,xK_Escape), cancel)
           ,((0,xK_Return), select)
           ,((0,xK_Left)  , move (-1,0) >> search)
@@ -38,8 +38,7 @@ search = makeXEventhandler $ shadowWithKeymap navNSearchKeyMap navNSearchDefault
           ,((shiftMask,xK_Tab), movePrev >> search)
           ,((0,xK_BackSpace), transformSearchString (\s -> if (s == "") then "" else init s) >> search)
           ]
-        -- The navigation handler ignores unknown key symbols, therefore we const
-        navNSearchDefaultHandler (_,s,_) = do
+        handler (_,s,_) = do
           transformSearchString (++ s)
           search
 -----------------------------------------------------------------------
-- 
1.7.2.3