7d1bcce · vty · git.iko.soy

src/Graphics/Vty/Config.hs+2

compare with master

unifiedsplit

@@ -76,7 +76,9 @@ import Control.Exception (catch, IOException, Exception(..), throwIO)

76import Control.Monad (liftM, guard, void)

77

78import qualified Data.ByteString as BS

79+#if !(MIN_VERSION_base(4,8,0))

79import Data.Monoid (Monoid(..))

80import Data.Monoid (Monoid(..))

81+#endif

80#if !(MIN_VERSION_base(4,11,0))

82#if !(MIN_VERSION_base(4,11,0))

81import Data.Semigroup (Semigroup(..))

83import Data.Semigroup (Semigroup(..))

82#endif

84#endif

src/Graphics/Vty/Input.hs+3−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE RecordWildCards #-}

1+{-# LANGUAGE RecordWildCards, CPP #-}

2

3-- | This module provides the input layer for Vty, including methods

4-- for initializing an 'Input' structure and reading 'Event's from the

@@ -132,7 +132,9 @@ import Lens.Micro

132import qualified System.Console.Terminfo as Terminfo

133import System.Posix.Signals.Exts

134

135+#if !MIN_VERSION_base(4,11,0)

135import Data.Monoid ((<>))

136import Data.Monoid ((<>))

137+#endif

136

138

137-- | Set up the terminal with file descriptor `inputFd` for input.

139-- | Set up the terminal with file descriptor `inputFd` for input.

138-- Returns an 'Input'.

140-- Returns an 'Input'.

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

@@ -1,5 +1,4 @@

1−{-# LANGUAGE RecordWildCards #-}

1+{-# LANGUAGE RecordWildCards, NamedFieldPuns, CPP #-}

2−{-# LANGUAGE NamedFieldPuns #-}

3-- | This module provides functions for accessing the current terminal

2-- | This module provides functions for accessing the current terminal

4-- or a specific terminal device.

3-- or a specific terminal device.

5--

4--

@@ -42,7 +41,10 @@ import Control.Monad.Fail (MonadFail)

42import Control.Monad.Trans

41import Control.Monad.Trans

43

42

44import Data.List (isPrefixOf)

43import Data.List (isPrefixOf)

44+

45+#if !MIN_VERSION_base(4,11,0)

45import Data.Monoid ((<>))

46import Data.Monoid ((<>))

47+#endif

46

48

47-- | Returns an `Output` for the terminal specified in `Config`.

49-- | Returns an `Output` for the terminal specified in `Config`.

48--

50--

src/Graphics/Vty/Output/TerminfoBased.hs+5−1

@@ -1,6 +1,7 @@

1{-# LANGUAGE RecordWildCards #-}

2{-# LANGUAGE FlexibleInstances #-}

3{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE CPP #-}

4{-# OPTIONS_GHC -D_XOPEN_SOURCE=500 -fno-warn-warnings-deprecations #-}

5{-# OPTIONS_GHC -D_XOPEN_SOURCE=500 -fno-warn-warnings-deprecations #-}

5{-# CFILES gwinsz.c #-}

6{-# CFILES gwinsz.c #-}

6

7

@@ -29,11 +30,14 @@ import Control.Monad.Fail (MonadFail)

29import Control.Monad.Trans

30import Control.Monad.Trans

30

31

31import Data.Bits ((.&.))

32import Data.Bits ((.&.))

32−import Data.Foldable (foldMap)

33import Data.IORef

34import Data.Maybe (isJust, isNothing, fromJust)

35import Data.Word

36

37+#if !MIN_VERSION_base(4,8,0)

38+import Data.Foldable (foldMap)

39+#endif

40+

37import Foreign.C.Types ( CInt(..), CLong(..) )

41import Foreign.C.Types ( CInt(..), CLong(..) )

38import Foreign.ForeignPtr (withForeignPtr)

42import Foreign.ForeignPtr (withForeignPtr)

39import Foreign.Ptr (Ptr, plusPtr)

43import Foreign.Ptr (Ptr, plusPtr)

src/Graphics/Vty/Output/XTermColor.hs+4

@@ -1,3 +1,4 @@

1+{-# Language CPP #-}

2-- | Xterm output driver. This uses the Terminfo driver with some

3-- | Xterm output driver. This uses the Terminfo driver with some

3-- extensions for Xterm.

4-- extensions for Xterm.

@@ -24,7 +25,10 @@ import System.Posix.Env (getEnv)

24

25

25import Data.List (isInfixOf)

26import Data.List (isInfixOf)

26import Data.Maybe (catMaybes)

27import Data.Maybe (catMaybes)

28+

29+#if !MIN_VERSION_base(4,11,0)

27import Data.Monoid ((<>))

30import Data.Monoid ((<>))

31+#endif

28

32

29-- | Construct an Xterm output driver. Initialize the display to UTF-8.

33-- | Construct an Xterm output driver. Initialize the display to UTF-8.

30reserveTerminal :: ( Applicative m, MonadIO m ) => String -> Fd -> m Output

34reserveTerminal :: ( Applicative m, MonadIO m ) => String -> Fd -> m Output

src/Graphics/Vty/PictureToSpans.hs−1

@@ -13,7 +13,6 @@ import Graphics.Vty.Image

13import Graphics.Vty.Image.Internal

14import Graphics.Vty.Picture

15import Graphics.Vty.Span

16−import Graphics.Text.Width (wctlwidth)

17

16

18import Lens.Micro

17import Lens.Micro

19import Lens.Micro.Mtl

18import Lens.Micro.Mtl

src/Graphics/Vty/Span.hs−1

@@ -14,7 +14,6 @@ module Graphics.Vty.Span where

14import Graphics.Vty.Attributes (Attr)

15import Graphics.Vty.Image

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

17−import Graphics.Text.Width (wctlwidth)

18

17

19import qualified Data.Text.Lazy as TL

18import qualified Data.Text.Lazy as TL

20import Data.Vector (Vector)

19import Data.Vector (Vector)