summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Stewart <dons@cse.unsw.edu.au>2007-03-07 03:23:32 +0100
committerDon Stewart <dons@cse.unsw.edu.au>2007-03-07 03:23:32 +0100
commit3dc06f20fd102531a005818e28552284786091a7 (patch)
tree91d4b3472bf485575d63e67a4d7a4721f6e31fef
parent89b9e95bf8a51dbab41a89626ab6a613b0593bf6 (diff)
downloadmetatile-3dc06f20fd102531a005818e28552284786091a7.tar
metatile-3dc06f20fd102531a005818e28552284786091a7.zip
Flatten module hierarchy
darcs-hash:20070307022332-9c5c1-4b24108ce990c0b74183fedf99e6de26d2e7a15c
-rw-r--r--Wm.hs (renamed from Thunk/Wm.hs)2
-rw-r--r--XlibExtras.hsc (renamed from Thunk/XlibExtras.hsc)2
-rw-r--r--thunk.cabal2
-rw-r--r--thunk.hs5
4 files changed, 6 insertions, 5 deletions
diff --git a/Thunk/Wm.hs b/Wm.hs
index 69b1de1..542f66f 100644
--- a/Thunk/Wm.hs
+++ b/Wm.hs
@@ -1,6 +1,6 @@
{-# OPTIONS_GHC -fglasgow-exts #-}
-module Thunk.Wm where
+module Wm where
import Data.Sequence
import Control.Monad.State
diff --git a/Thunk/XlibExtras.hsc b/XlibExtras.hsc
index 4be16b3..103a149 100644
--- a/Thunk/XlibExtras.hsc
+++ b/XlibExtras.hsc
@@ -1,4 +1,4 @@
-module Thunk.XlibExtras where
+module XlibExtras where
import Graphics.X11.Xlib
import Graphics.X11.Xlib.Types
diff --git a/thunk.cabal b/thunk.cabal
index 42e3d4e..8d9b3b3 100644
--- a/thunk.cabal
+++ b/thunk.cabal
@@ -12,7 +12,7 @@ build-depends: base >= 2.0, X11, unix, mtl
executable: thunk
main-is: thunk.hs
extensions: ForeignFunctionInterface
-other-modules: Thunk.XlibExtras
+other-modules: XlibExtras
ghc-options: -O
include-dirs: include
-- OpenBSD:
diff --git a/thunk.hs b/thunk.hs
index 9b63116..3a8f92b 100644
--- a/thunk.hs
+++ b/thunk.hs
@@ -10,8 +10,9 @@ import System.IO
import Graphics.X11.Xlib
import System.Process (runCommand)
import System.Exit
-import Thunk.Wm
-import Thunk.XlibExtras
+
+import Wm
+import XlibExtras
handler :: Event -> Wm ()
handler (MapRequestEvent {window = w}) = manage w