629cb6e · vty · git.iko.soy

src/Graphics/Vty.hs−2

compare with master

unifiedsplit

@@ -62,8 +62,6 @@ module Graphics.Vty

62 )

63where

64

65−import Graphics.Vty.Prelude

66−

67import Graphics.Vty.Config

65import Graphics.Vty.Config

68import Graphics.Vty.Input

66import Graphics.Vty.Input

69import Graphics.Vty.Output

67import Graphics.Vty.Output

src/Graphics/Vty/Debug.hs+1−2

@@ -5,9 +5,8 @@ module Graphics.Vty.Debug

5 )

6where

7

8−import Graphics.Vty.Prelude

9−

10import Graphics.Vty.Attributes

8import Graphics.Vty.Attributes

9+import Graphics.Vty.Image (DisplayRegion)

11import Graphics.Vty.Debug.Image

10import Graphics.Vty.Debug.Image

12import Graphics.Vty.Span

11import Graphics.Vty.Span

13

12

src/Graphics/Vty/Image.hs+12

@@ -4,6 +4,9 @@

4{-# LANGUAGE DisambiguateRecordFields #-}

5module Graphics.Vty.Image

6 ( DisplayText

7+ , DisplayRegion

8+ , regionWidth

9+ , regionHeight

7 , Image

10 , Image

8 , imageWidth

11 , imageWidth

9 , imageHeight

12 , imageHeight

@@ -55,6 +58,15 @@ import qualified Data.Text.Lazy as TL

55import qualified Data.Text.Lazy.Encoding as TL

58import qualified Data.Text.Lazy.Encoding as TL

56import Data.Word

59import Data.Word

57

60

61+-- | Named alias for a Int pair

62+type DisplayRegion = (Int,Int)

63+

64+regionWidth :: DisplayRegion -> Int

65+regionWidth = fst

66+

67+regionHeight :: DisplayRegion -> Int

68+regionHeight = snd

69+

58infixr 5 <|>

70infixr 5 <|>

59infixr 4 <->

71infixr 4 <->

60

72

src/Graphics/Vty/Output.hs+2−2

@@ -32,10 +32,10 @@ module Graphics.Vty.Output

32 )

33where

34

35−import Graphics.Vty.Prelude

35+import Control.Monad (when)

36

37import Graphics.Vty.Config

38−

38+import Graphics.Vty.Image (regionWidth, regionHeight)

39import Graphics.Vty.Output.Interface

40import Graphics.Vty.Output.XTermColor as XTermColor

41import Graphics.Vty.Output.TerminfoBased as TerminfoBased

src/Graphics/Vty/Output/Interface.hs+1−2

@@ -13,9 +13,8 @@

13

14module Graphics.Vty.Output.Interface where

15

16−import Graphics.Vty.Prelude

17−

18import Graphics.Vty.Attributes

16import Graphics.Vty.Attributes

17+import Graphics.Vty.Image (DisplayRegion, regionHeight)

19import Graphics.Vty.Picture

18import Graphics.Vty.Picture

20import Graphics.Vty.PictureToSpans

19import Graphics.Vty.PictureToSpans

21import Graphics.Vty.Span

20import Graphics.Vty.Span

src/Graphics/Vty/Output/Mock.hs+1−2

@@ -10,8 +10,7 @@ module Graphics.Vty.Output.Mock

10 )

11where

12

13−import Graphics.Vty.Prelude

13+import Graphics.Vty.Image (DisplayRegion)

14−

15import Graphics.Vty.Output.Interface

14import Graphics.Vty.Output.Interface

16

15

17import Blaze.ByteString.Builder.Word (writeWord8)

16import Blaze.ByteString.Builder.Word (writeWord8)

src/Graphics/Vty/Output/TerminfoBased.hs+2−2

@@ -20,13 +20,13 @@ module Graphics.Vty.Output.TerminfoBased

20 )

21where

22

23−import Graphics.Vty.Prelude

23+import Control.Monad (when)

24−

25import Data.ByteString.Internal (toForeignPtr)

24import Data.ByteString.Internal (toForeignPtr)

26import Data.Terminfo.Parse

25import Data.Terminfo.Parse

27import Data.Terminfo.Eval

26import Data.Terminfo.Eval

28

27

29import Graphics.Vty.Attributes

28import Graphics.Vty.Attributes

29+import Graphics.Vty.Image (DisplayRegion)

30import Graphics.Vty.DisplayAttributes

31import Graphics.Vty.Output.Interface

32

src/Graphics/Vty/PictureToSpans.hs−2

@@ -13,8 +13,6 @@

13-- | Transforms an image into rows of operations.

14module Graphics.Vty.PictureToSpans where

15

16−import Graphics.Vty.Prelude

17−

18import Graphics.Vty.Attributes (Attr, currentAttr)

16import Graphics.Vty.Attributes (Attr, currentAttr)

19import Graphics.Vty.Image

17import Graphics.Vty.Image

20import Graphics.Vty.Image.Internal

18import Graphics.Vty.Image.Internal

src/Graphics/Vty/Prelude.hsdeleted−19

@@ -1,19 +0,0 @@

1−-- | Prelude for Vty modules. Not particularly useful outside of Vty.

2−module Graphics.Vty.Prelude

3− ( module Graphics.Vty.Prelude

4− , module Control.Applicative

5− , module Control.Monad

6− )

7−where

8−

9−import Control.Applicative hiding ((<|>))

10−import Control.Monad

11−

12−-- | Named alias for a Int pair

13−type DisplayRegion = (Int,Int)

14−

15−regionWidth :: DisplayRegion -> Int

16−regionWidth = fst

17−

18−regionHeight :: DisplayRegion -> Int

19−regionHeight = snd

src/Graphics/Vty/Span.hs−2

@@ -15,8 +15,6 @@

15-- to the serialized representation of the various attributes.

16module Graphics.Vty.Span where

17

18−import Graphics.Vty.Prelude

19−

20import Graphics.Vty.Attributes (Attr)

18import Graphics.Vty.Attributes (Attr)

21import Graphics.Vty.Image

19import Graphics.Vty.Image

22import Graphics.Vty.Image.Internal ( clipText )

20import Graphics.Vty.Image.Internal ( clipText )

vty.cabal−1

@@ -73,7 +73,6 @@ library

73 Graphics.Vty.Input

74 Graphics.Vty.Input.Events

75 Graphics.Vty.Picture

76− Graphics.Vty.Prelude

77 Graphics.Vty.Output

76 Graphics.Vty.Output

78 Graphics.Text.Width

77 Graphics.Text.Width

79 -- the modules below are only meant to be used by the tests.

78 -- the modules below are only meant to be used by the tests.