git.iko.soy/vty
on master help sign in
API: remove some module re-exports

This removes the Image module's re-export of Attributes and the Picture module's re-export of Image. Attributes and Image are re-exported by the top-level Vty module to ensure compatibility, but any programs using the Picture and Image modules directly will need to update their imports accordingly.

commitafe575770068b776568b11b7b0b101b5b3929a9d authorJonathan Daugherty <cygnus@foobox.com> dateSun 22 Jan 2017, 09:36 (10 years ago) parent1fcdf94
6 files changed+17−5
compare with master
unifiedsplit
src/Graphics/Vty.hs+4 src/Graphics/Vty/Image.hs−3 src/Graphics/Vty/Output/Interface.hs+1 src/Graphics/Vty/Picture.hs+10−2 src/Graphics/Vty/PictureToSpans.hs+1 src/Graphics/Vty/Span.hs+1
src/Graphics/Vty.hs+4
@@ -55,6 +55,8 @@ module Graphics.Vty
5555 , module Graphics.Vty.Input
5656 , module Graphics.Vty.Output
5757 , module Graphics.Vty.Picture
58+ , module Graphics.Vty.Image
59+ , module Graphics.Vty.Attributes
5860 , DisplayRegion
5961 , Mode(..)
6062 )
@@ -67,6 +69,8 @@ import Graphics.Vty.Input
6769import Graphics.Vty.Output
6870import Graphics.Vty.Output.Interface
6971import Graphics.Vty.Picture
72+import Graphics.Vty.Image
73+import Graphics.Vty.Attributes
7074
7175import Control.Concurrent.STM
7276
src/Graphics/Vty/Image.hs−3
@@ -40,9 +40,6 @@ module Graphics.Vty.Image
4040 , translate
4141 , translateX
4242 , translateY
43− -- | The possible display attributes used in
44− -- constructing an `Image`.
45− , module Graphics.Vty.Attributes
4643 )
4744where
4845
src/Graphics/Vty/Output/Interface.hs+1
@@ -15,6 +15,7 @@ module Graphics.Vty.Output.Interface where
1515
1616import Graphics.Vty.Prelude
1717
18+import Graphics.Vty.Attributes
1819import Graphics.Vty.Picture
1920import Graphics.Vty.PictureToSpans
2021import Graphics.Vty.Span
src/Graphics/Vty/Picture.hs+10−2
@@ -4,12 +4,20 @@
44--
55-- A 'Picture' is a background paired with a layer of 'Image's.
66module Graphics.Vty.Picture
7− ( module Graphics.Vty.Picture
8− , module Graphics.Vty.Image
7+ ( Picture(..)
8+ , Cursor(..)
9+ , Background(..)
10+ , emptyPicture
11+ , addToTop
12+ , addToBottom
13+ , picForImage
14+ , picForLayers
15+ , picImage
916 )
1017where
1118
1219import Graphics.Vty.Image
20+import Graphics.Vty.Attributes
1321
1422import Control.DeepSeq
1523
src/Graphics/Vty/PictureToSpans.hs+1
@@ -15,6 +15,7 @@ module Graphics.Vty.PictureToSpans where
1515
1616import Graphics.Vty.Prelude
1717
18+import Graphics.Vty.Attributes (Attr, currentAttr)
1819import Graphics.Vty.Image
1920import Graphics.Vty.Image.Internal
2021import Graphics.Vty.Picture
src/Graphics/Vty/Span.hs+1
@@ -17,6 +17,7 @@ module Graphics.Vty.Span where
1717
1818import Graphics.Vty.Prelude
1919
20+import Graphics.Vty.Attributes (Attr)
2021import Graphics.Vty.Image
2122import Graphics.Vty.Image.Internal ( clipText )
2223