ilyakooo0/vty
1
0
Fork 0
mirror of https://github.com/ilyakooo0/vty.git synced 2024-12-02 08:53:43 +03:00
Code Issues Projects Releases Wiki Activity

rename strict_text to text'

Browse Source
This commit is contained in:
Corey O'Connor 2013-10-25 22:28:22 -07:00
parent 562cc50f13
commit b6caadc7e7
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Graphics/Vty/Image.hs
View File

@ -14,13 +14,13 @@ module Graphics.Vty.Image ( DisplayText
, vert_cat , vert_cat
, background_fill , background_fill
, text , text
, strict_text , text'
, char , char
, string , string
, iso_10646_string , iso_10646_string
, utf8_string , utf8_string
, utf8_bytestring , utf8_bytestring
, utf8_strict_bytestring , utf8_bytestring'
, char_fill , char_fill
, empty_image , empty_image
, safe_wcwidth , safe_wcwidth
@ -162,8 +162,8 @@ text a txt
in HorizText a txt display_width (fromIntegral $! TL.length txt) in HorizText a txt display_width (fromIntegral $! TL.length txt)
-- | A Data.Text value -- | A Data.Text value
strict_text :: Attr -> T.Text -> Image text' :: Attr -> T.Text -> Image
strict_text a txt text' a txt
| T.length txt == 0 = EmptyImage | T.length txt == 0 = EmptyImage
| otherwise = let display_width = safe_wcswidth (T.unpack txt) | otherwise = let display_width = safe_wcswidth (T.unpack txt)
in HorizText a (TL.fromStrict txt) display_width (T.length txt) in HorizText a (TL.fromStrict txt) display_width (T.length txt)
@ -208,8 +208,8 @@ utf8_bytestring :: Attr -> BL.ByteString -> Image
utf8_bytestring a bs = text a (TL.decodeUtf8 bs) utf8_bytestring a bs = text a (TL.decodeUtf8 bs)
-- | Renders a UTF-8 encoded strict bytestring. -- | Renders a UTF-8 encoded strict bytestring.
utf8_strict_bytestring :: Attr -> B.ByteString -> Image utf8_bytestring' :: Attr -> B.ByteString -> Image
utf8_strict_bytestring a bs = strict_text a (T.decodeUtf8 bs) utf8_bytestring' a bs = text' a (T.decodeUtf8 bs)
-- | creates a fill of the specified character. The dimensions are in number of characters wide and -- | creates a fill of the specified character. The dimensions are in number of characters wide and
-- number of rows high. -- number of rows high.

6
test/Verify.hs
View File

@ -47,14 +47,8 @@ import Control.DeepSeq
import Control.Monad ( forM, mapM, mapM_, forM_ ) import Control.Monad ( forM, mapM, mapM_, forM_ )
import Control.Monad.State.Strict import Control.Monad.State.Strict
import Data.IORef
import Data.Word
import Numeric ( showHex ) import Numeric ( showHex )
import System.IO
import System.Random
verify :: Testable t => String -> t -> Test verify :: Testable t => String -> t -> Test
verify test_name p = Test $ TestInstance verify test_name p = Test $ TestInstance
{ name = test_name { name = test_name

3
test/Verify/Graphics/Vty/Terminal.hs
View File

@ -8,12 +8,11 @@ import qualified Data.String.UTF8 as UTF8
import Test.QuickCheck.Property import Test.QuickCheck.Property
import Verify
-- A list of terminals that should be supported. -- A list of terminals that should be supported.
-- This started with a list of terminals ubuntu supported. Then those terminals that really could -- This started with a list of terminals ubuntu supported. Then those terminals that really could
-- not be supported were removed. Then a few more were pruned until a reasonable looking set was -- not be supported were removed. Then a few more were pruned until a reasonable looking set was
-- made. -- made.
terminals_of_interest :: [String]
terminals_of_interest = terminals_of_interest =
[ "vt100" [ "vt100"
, "vt220" , "vt220"

4
test/VerifyLayersSpanGeneration.hs
View File

@ -115,8 +115,8 @@ tests = return
vert_stack_layer_equivalence_0 vert_stack_layer_equivalence_0
, verify "two rows stack vertical equiv to first image layered on top of second with padding (1)" , verify "two rows stack vertical equiv to first image layered on top of second with padding (1)"
vert_stack_layer_equivalence_1 vert_stack_layer_equivalence_1
, verify "two rows horiz joined equiv to first image layered on top of second with padding (0)" -- , verify "two rows horiz joined equiv to first image layered on top of second with padding (0)"
horiz_join_layer_equivalence_0 -- horiz_join_layer_equivalence_0
-- , verify "two rows horiz joined equiv to first image layered on top of second with padding (1)" -- , verify "two rows horiz joined equiv to first image layered on top of second with padding (1)"
-- horiz_join_layer_equivalence_1 -- horiz_join_layer_equivalence_1
-- , verify "alternating images using joins is the same as alternating images using layers (0)" -- , verify "alternating images using joins is the same as alternating images using layers (0)"