Remove redundant imports

This commit is contained in:
Spencer Janssen 2007-12-07 23:38:27 +00:00
parent 5f190a315e
commit dc11825588
45 changed files with 17 additions and 94 deletions

View File

@ -31,7 +31,6 @@ import XMonad.StackSet hiding (workspaces)
import XMonad.Util.Dmenu (dmenu)
import XMonad.Layouts
import Control.Monad.Reader
import qualified Data.Map as M
import System.Exit
import Data.Maybe

View File

@ -21,10 +21,8 @@ module XMonad.Actions.CopyWindow (
) where
import Prelude hiding ( filter )
import Graphics.X11.Xlib ( Window )
import Control.Monad.State ( gets )
import qualified Data.List as L
import XMonad
import XMonad hiding (modify)
import XMonad.Operations ( windows, kill )
import XMonad.StackSet

View File

@ -24,8 +24,6 @@ module XMonad.Actions.CycleWS (
toggleWS,
) where
import Control.Monad.Reader ( asks )
import Control.Monad.State ( gets )
import Data.List ( sortBy, findIndex )
import Data.Maybe ( fromMaybe )
import Data.Ord ( comparing )

View File

@ -36,7 +36,6 @@ module XMonad.Actions.DeManage (
import qualified XMonad.StackSet as W
import XMonad
import XMonad.Operations
import Control.Monad.State
import Graphics.X11 (Window)
-- $usage

View File

@ -22,11 +22,9 @@ module XMonad.Actions.DynamicWorkspaces (
toNthWorkspace, withNthWorkspace
) where
import Control.Monad.Reader ( asks )
import Control.Monad.State ( gets )
import Data.List ( sort )
import XMonad ( X, XState(..), WindowSet, config, layoutHook )
import XMonad hiding (workspaces)
import XMonad.Operations
import XMonad.StackSet hiding (filter, modify, delete)
import XMonad.Prompt.Workspace

View File

@ -18,7 +18,6 @@ module XMonad.Actions.FindEmptyWorkspace (
viewEmptyWorkspace, tagToEmptyWorkspace
) where
import Control.Monad.State
import Data.List
import Data.Maybe ( isNothing )

View File

@ -24,10 +24,10 @@ import XMonad.Operations
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import Control.Monad.Reader
import Data.IORef
import qualified Data.Map as M
import Data.Map (Map)
import Control.Monad
import System.IO

View File

@ -18,7 +18,6 @@ module XMonad.Actions.RotView (
rotView
) where
import Control.Monad.State ( gets )
import Data.List ( sortBy, find )
import Data.Maybe ( isJust )
import Data.Ord ( comparing )

View File

@ -18,13 +18,12 @@ module XMonad.Actions.Submap (
submap
) where
import Control.Monad.Reader
import XMonad hiding (keys)
import XMonad.Operations (cleanMask)
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import qualified Data.Map as M
import Control.Monad.Fix (fix)
{- $usage

View File

@ -26,14 +26,11 @@ module XMonad.Actions.TagWindows (
) where
import Data.List (nub,concat,sortBy)
import Control.Monad
import Control.Monad.State
import XMonad.StackSet hiding (filter)
import XMonad.Operations (windows, withFocused)
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import XMonad.Prompt
import XMonad hiding (workspaces)
@ -88,7 +85,7 @@ getTags w = withDisplay $ \d ->
-- | check a window for the given tag
hasTag :: String -> Window -> X Bool
hasTag s w = (s `elem`) `liftM` getTags w
hasTag s w = (s `elem`) `fmap` getTags w
-- | add a tag to the existing ones
addTag :: String -> Window -> X ()

View File

@ -21,9 +21,6 @@ module XMonad.Actions.Warp (
import Data.Ratio
import Data.List
import Control.Monad.RWS
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import XMonad.Operations
import XMonad
import XMonad.StackSet as W

View File

@ -20,14 +20,12 @@ module XMonad.Actions.WindowBringer (
gotoMenu, bringMenu, windowMapWith
) where
import Control.Monad.State (gets)
import Data.Char (toLower)
import qualified Data.Map as M
import Graphics.X11.Xlib (Window())
import XMonad.Operations (windows)
import qualified XMonad.StackSet as W
import XMonad (X)
import XMonad
import qualified XMonad as X
import XMonad.Util.Dmenu (dmenuMap)
import XMonad.Util.NamedWindows (getName)

View File

@ -21,7 +21,6 @@ module XMonad.Config.Arossato
) where
import qualified Data.Map as M
import Graphics.X11.Xlib
import XMonad
import XMonad.Layouts

View File

@ -42,7 +42,6 @@ module XMonad.Hooks.DynamicLog (
--
import XMonad
import XMonad.Layouts
import Control.Monad.Reader
import Data.Maybe ( isJust )
import Data.List
import Data.Ord ( comparing )

View File

@ -21,8 +21,8 @@ import Data.List (elemIndex, sortBy)
import Data.Ord (comparing)
import Data.Maybe (fromMaybe)
import Control.Monad.Reader
import XMonad
import Control.Monad
import qualified XMonad.StackSet as W
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras

View File

@ -45,7 +45,6 @@ module XMonad.Hooks.ManageDocks (
,avoidStruts, ToggleStruts(ToggleStruts)
) where
import Control.Monad.Reader
import XMonad
import XMonad.Operations
import qualified XMonad.StackSet as W

View File

@ -36,7 +36,6 @@ module XMonad.Hooks.SetWMName (
setWMName) where
import Control.Monad (join)
import Control.Monad.Reader (asks)
import Data.Char (ord)
import Data.List (nub)
import Data.Maybe (fromJust, listToMaybe, maybeToList)

View File

@ -38,8 +38,6 @@ import XMonad.Util.Dzen (dzenWithArgs, seconds)
import XMonad.Util.NamedWindows (getName)
import Control.Monad (when)
import Control.Monad.Reader (asks)
import Control.Monad.State (gets)
import Data.Bits (testBit, clearBit)
import Data.IORef
import Data.List ((\\), delete)

View File

@ -20,11 +20,8 @@ module XMonad.Hooks.XPropManage (
import Data.Char (chr)
import Data.List (concat)
import Data.Monoid (mconcat, Endo(..))
import Control.Monad.Reader
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import Control.Monad.Trans (lift)
import XMonad
import XMonad.ManageHook ((-->))
@ -70,7 +67,7 @@ pmP f _ = return f
xPropManageHook :: [XPropMatch] -> ManageHook
xPropManageHook tms = mconcat $ map propToHook tms
where
propToHook (ms, f) = liftM and (mapM mkQuery ms) --> mkHook f
propToHook (ms, f) = fmap and (mapM mkQuery ms) --> mkHook f
mkQuery (a, tf) = fmap tf (getQuery a)
mkHook func = ask >>= Query . lift . fmap Endo . func

View File

@ -21,7 +21,6 @@ module XMonad.Layout.Circle (
) where -- actually it's an ellipse
import Data.List
import Graphics.X11.Xlib
import XMonad
import XMonad.StackSet (integrate, peek)

View File

@ -28,8 +28,6 @@ module XMonad.Layout.DragPane (
, DragPane, DragType (..)
) where
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import XMonad
import Data.Bits
import Data.Unique

View File

@ -27,7 +27,7 @@ import qualified XMonad.StackSet as W
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import Control.Applicative ((<$>))
import Control.Monad.Reader
import Control.Monad
-- $usage
-- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:

View File

@ -20,11 +20,8 @@ module XMonad.Layout.LayoutHints (
LayoutHints) where
import XMonad.Operations ( applySizeHints, D )
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras ( getWMNormalHints )
import XMonad hiding ( trace )
import XMonad.Layout.LayoutModifier
import Control.Monad.Reader ( asks )
-- $usage
-- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:

View File

@ -20,7 +20,6 @@ module XMonad.Layout.LayoutModifier (
LayoutModifier(..), ModifiedLayout(..)
) where
import Graphics.X11.Xlib ( Rectangle )
import XMonad
import XMonad.StackSet ( Stack )

View File

@ -18,13 +18,9 @@ module XMonad.Layout.LayoutScreens (
layoutScreens, fixedLayout
) where
import Control.Monad.Reader ( asks )
import XMonad
import qualified XMonad.StackSet as W
import qualified XMonad.Operations as O
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
-- $usage
-- This module allows you to pretend that you have more than one screen by

View File

@ -19,7 +19,6 @@ module XMonad.Layout.MagicFocus
MagicFocus(MagicFocus)
) where
import Graphics.X11.Xlib
import XMonad
import XMonad.StackSet

View File

@ -25,7 +25,6 @@ module XMonad.Layout.Magnifier
MagnifyMsg (..)
) where
import Graphics.X11.Xlib (Window, Rectangle(..))
import XMonad
import XMonad.StackSet
import XMonad.Layout.LayoutModifier

View File

@ -23,7 +23,6 @@ module XMonad.Layout.Maximize (
maximizeRestore
) where
import Graphics.X11.Xlib
import XMonad
import XMonad.Layout.LayoutModifier
import Data.List ( partition )

View File

@ -26,8 +26,6 @@ import Control.Monad.State ( State, put, get, runState )
import System.Random ( StdGen, mkStdGen )
import Data.Maybe ( isJust )
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras ( SizeHints, getWMNormalHints, sh_aspect, sh_min_size, sh_max_size )
import XMonad hiding ( trace )
import XMonad.Layouts ( Resize(Shrink, Expand) )
import qualified XMonad.StackSet as W

View File

@ -25,10 +25,6 @@ module XMonad.Layout.NoBorders (
withBorder
) where
import Control.Monad.State (gets)
import Control.Monad.Reader (asks)
import Graphics.X11.Xlib
import XMonad
import XMonad.Layout.LayoutModifier
import qualified XMonad.StackSet as W

View File

@ -24,7 +24,6 @@ module XMonad.Layout.PerWorkspace (
import XMonad
import qualified XMonad.StackSet as W
import Control.Monad.State (gets)
import Data.Maybe (fromMaybe)
-- $usage

View File

@ -25,7 +25,6 @@ import XMonad
import XMonad.Layouts (Resize(..), IncMasterN(..))
import qualified XMonad.StackSet as W
import Graphics.X11.Xlib
import Control.Monad.State
import Control.Monad
-- $usage

View File

@ -23,7 +23,6 @@ module XMonad.Layout.Spiral (
, Direction (..)
) where
import Graphics.X11.Xlib
import Data.Ratio
import XMonad
import XMonad.Layouts

View File

@ -22,14 +22,9 @@ module XMonad.Layout.Tabbed (
, Shrinker(..)
) where
import Control.Monad.State ( gets )
import Control.Monad.Reader
import Data.Maybe
import Data.List
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import XMonad
import XMonad.Operations
import qualified XMonad.StackSet as W

View File

@ -26,10 +26,7 @@ import XMonad.Layouts ( Resize(..), IncMasterN(..), splitVertically, splitHorizo
import Data.Ratio
--import Control.Monad.State
import Control.Monad.Reader
import Graphics.X11.Xlib
import Control.Monad
-- $usage
-- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:

View File

@ -25,11 +25,8 @@ module XMonad.Layout.WindowNavigation (
noNavigateBorders, defaultWNConfig
) where
import Graphics.X11.Xlib ( Rectangle(..), Window, Pixel, setWindowBorder )
import Control.Monad.Reader ( ask )
import Control.Monad.State ( gets, modify )
import Data.List ( nub, sortBy, (\\) )
import XMonad
import XMonad hiding (Point)
import qualified XMonad.StackSet as W
import XMonad.Operations ( windows )
import XMonad.Layout.LayoutModifier

View File

@ -41,8 +41,6 @@ module XMonad.Prompt (
, uniqSort
) where
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import XMonad hiding (config, io)
import XMonad.Operations (initColor)
import qualified XMonad.StackSet as W

View File

@ -18,7 +18,6 @@ module XMonad.Prompt.Layout (
layoutPrompt
) where
import Control.Monad.State ( gets )
import Data.List ( sort, nub )
import XMonad hiding ( workspaces )
import XMonad.Operations ( sendMessage )

View File

@ -18,7 +18,6 @@ module XMonad.Prompt.Workspace (
workspacePrompt
) where
import Control.Monad.State ( gets )
import Data.List ( sort )
import XMonad hiding ( workspaces )
import XMonad.Prompt

View File

@ -19,9 +19,9 @@ module XMonad.Util.CustomKeys (
) where
import XMonad
import Control.Monad.Reader
import Graphics.X11.Xlib
import Control.Monad.Reader
import qualified Data.Map as M
-- $usage

View File

@ -23,7 +23,6 @@ module XMonad.Util.Dmenu (
import XMonad
import qualified XMonad.StackSet as W
import qualified Data.Map as M
import Control.Monad.State
import XMonad.Util.Run
-- $usage
@ -37,7 +36,7 @@ import XMonad.Util.Run
-- <http://www.jcreigh.com/dmenu/dmenu-3.2-xinerama.patch>
dmenuXinerama :: [String] -> X String
dmenuXinerama opts = do
curscreen <- (fromIntegral . W.screen . W.current) `liftM` gets windowset :: X Int
curscreen <- (fromIntegral . W.screen . W.current) `fmap` gets windowset :: X Int
io $ runProcessWithInput "dmenu" ["-xs", show (curscreen+1)] (unlines opts)
dmenu :: [String] -> X String

View File

@ -29,8 +29,6 @@ module XMonad.Util.Font (
) where
import Graphics.X11.Xlib
import Control.Monad.Reader
import XMonad
import Foreign
import XMonad.Operations

View File

@ -22,13 +22,8 @@ module XMonad.Util.NamedWindows (
unName
) where
import Control.Monad.Reader ( asks )
import Control.Monad.State ( gets )
import qualified XMonad.StackSet as W ( peek )
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import XMonad

View File

@ -28,7 +28,6 @@ module XMonad.Util.Run (
spawnPipe
) where
import Control.Monad.Reader
import System.Posix.IO
import System.Posix.Process (createSession, forkProcess, executeFile,
getProcessStatus)
@ -38,6 +37,7 @@ import System.Exit (ExitCode(ExitSuccess), exitWith)
import System.IO
import System.Process (runInteractiveProcess, waitForProcess)
import XMonad
import Control.Monad
-- $usage
-- For an example usage of 'runInTerm' see "XMonad.Prompt.Ssh"

View File

@ -26,13 +26,10 @@ module XMonad.Util.XUtils (
) where
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Extras
import Control.Monad.Reader
import Data.Maybe
import XMonad
import XMonad.Util.Font
import Control.Monad
-- $usage
-- See "XMonad.Layout.Tabbed" or "XMonad.Layout.DragPane" for usage