From 180298def66a59af30a3b1248d748778d5616f04 Mon Sep 17 00:00:00 2001 From: Lukas Mai Date: Sat, 22 Mar 2008 19:34:57 +0000 Subject: [PATCH] XMonad.Actions.MouseGestures: reexport Direction from WindowNavigation, avoid type duplication --- XMonad/Actions/MouseGestures.hs | 6 +----- XMonad/Layout/WindowNavigation.hs | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/XMonad/Actions/MouseGestures.hs b/XMonad/Actions/MouseGestures.hs index 0a20cc53..bf652e1a 100644 --- a/XMonad/Actions/MouseGestures.hs +++ b/XMonad/Actions/MouseGestures.hs @@ -22,6 +22,7 @@ module XMonad.Actions.MouseGestures ( ) where import XMonad +import XMonad.Layout.WindowNavigation (Direction(..)) import Data.IORef import qualified Data.Map as M @@ -56,11 +57,6 @@ import Control.Monad -- For detailed instructions on editing your mouse bindings, see -- "XMonad.Doc.Extending#Editing_mouse_bindings". --- | The four cardinal screen directions. A \"gesture\" is a sequence of --- directions. -data Direction = L | U | R | D - deriving (Eq, Ord, Show, Read, Enum, Bounded) - type Pos = (Position, Position) delta :: Pos -> Pos -> Position diff --git a/XMonad/Layout/WindowNavigation.hs b/XMonad/Layout/WindowNavigation.hs index bf07483e..f21d0043 100644 --- a/XMonad/Layout/WindowNavigation.hs +++ b/XMonad/Layout/WindowNavigation.hs @@ -67,7 +67,7 @@ data MoveWindowToWindow a = MoveWindowToWindow a a deriving ( Read, Show, Typeab instance Typeable a => Message (MoveWindowToWindow a) data Navigate = Go Direction | Swap Direction | Move Direction deriving ( Read, Show, Typeable ) -data Direction = U | D | R | L deriving ( Read, Show, Eq ) +data Direction = U | D | R | L deriving ( Read, Show, Eq, Ord, Enum, Bounded ) instance Message Navigate data WNConfig =