@@ -6,9 +6,9 @@ import Graphics.Vty
66import Graphics.Vty.Attributes
77import Graphics.Vty.Inline
88import Graphics.Vty.Picture
9−import Graphics.Vty.Terminal
10−import Graphics.Vty.DisplayRegion
9+import Graphics.Vty.Output
1110
11+import Control.Concurrent (threadDelay)
1212import Control.Exception
1313import Control.Monad
1414
@@ -18,18 +18,18 @@ import Data.Monoid
1818import Data.String.QQ
1919import Data.Word
2020
21−import Foreign.Marshal.Array
21+import Foreign.Marshal.Array
2222
2323import qualified System.Environment as Env
2424
2525import System.IO ( hFlush, hPutStr, hPutBuf, stdout )
2626
2727main = do
28− print_intro
28+ printIntro
2929
30−output_file_path = "test_results.list"
30+outputFilePath = "test_results.list"
3131
32−print_intro = do
32+printIntro = do
3333 putStr $ [s|
3434This is an interactive verification program for the terminal input and output
3535support of the VTY library. This will ask a series of questions about what you
@@ -37,7 +37,7 @@ see on screen. The goal is to verify that VTY's output and input support
3737performs as expected with your terminal.
3838
3939This program produces a file named
40− |] ++ output_file_path ++ [s|
40+ |] ++ outputFilePath ++ [s|
4141in the current directory that contains the results for each test assertion. This
4242can be emailed to coreyoconnor@gmail.com and used by the VTY authors to improve
4343support for your terminal. No personal information is contained in the report.
@@ -66,41 +66,40 @@ All the tests assume the following about the terminal display:
6666Thanks for the help! :-D
6767To exit the test early enter "q" anytime at the following menu screen.
6868
69−If any test failed then please post an issue to
69+If any test fails then please post an issue to
7070 https://github.com/coreyoconnor/vty/issues
71−with the test_results.list file pasted into the issue. The issue summary can
72−mention the specific tests that failed or just say "interactive terminal test
73−failure".
71+with the test_results.list file pasted into the issue. A suitable summary is:
72+"interactive terminal test failure".
7473|]
75− wait_for_return
76− results <- do_test_menu 1
77− env_attributes <- mapM ( \env_name -> Control.Exception.catch ( Env.getEnv env_name >>= return . (,) env_name )
78− ( \ (_ :: SomeException) -> return (env_name, "") )
79− )
80− [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
81− t <- current_terminal
82− let results_txt = show env_attributes ++ "\n"
83− ++ terminal_ID t ++ "\n"
84− ++ show results ++ "\n"
85− release_terminal t
86− writeFile output_file_path results_txt
87−
88−wait_for_return = do
74+ waitForReturn
75+ results <- doTestMenu 1
76+ envAttributes <- mapM ( \envName -> Control.Exception.catch ( Env.getEnv envName >>= return . (,) envName )
77+ ( \ (_ :: SomeException) -> return (envName, "") )
78+ )
79+ [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
80+ t <- standardIOConfig >>= outputForConfig
81+ let resultsTxt = show envAttributes ++ "\n"
82+ ++ terminalID t ++ "\n"
83+ ++ show results ++ "\n"
84+ releaseTerminal t
85+ writeFile outputFilePath resultsTxt
86+
87+waitForReturn = do
8988 putStr "\n(press return to continue)"
9089 hFlush stdout
9190 getLine
9291
93−test_menu :: [(String, Test)]
94−test_menu = zip (map show [1..]) all_tests
92+testMenu :: [(String, Test)]
93+testMenu = zip (map show [1..]) allTests
9594
96−do_test_menu :: Int -> IO [(String, Bool)]
97−do_test_menu next_ID
98− | next_ID > length all_tests = do
99− putStrLn $ "Done! Please email the " ++ output_file_path ++ " file to coreyoconnor@gmail.com"
95+doTestMenu :: Int -> IO [(String, Bool)]
96+doTestMenu nextID
97+ | nextID > length allTests = do
98+ putStrLn $ "Done! Please email the " ++ outputFilePath ++ " file to coreyoconnor@gmail.com"
10099 return []
101100 | otherwise = do
102− display_test_menu
103− putStrLn $ "Press return to start with #" ++ show next_ID ++ "."
101+ displayTestMenu
102+ putStrLn $ "Press return to start with #" ++ show nextID ++ "."
104103 putStrLn "Enter a test number to perform only that test."
105104 putStrLn "q (or control-C) to quit."
106105 putStr "> "
@@ -108,96 +107,102 @@ do_test_menu next_ID
108107 s <- getLine >>= return . filter (/= '\n')
109108 case s of
110109 "q" -> return mempty
111− "" -> do
112− r <- run_test $ show next_ID
113− rs <- do_test_menu ( next_ID + 1 )
110+ "" -> do
111+ r <- runTest $ show nextID
112+ rs <- doTestMenu ( nextID + 1 )
114113 return $ r : rs
115− i | isJust ( lookup i test_menu ) -> do
116− r <- run_test i
117− rs <- do_test_menu ( read i + 1 )
114+ i | isJust ( lookup i testMenu ) -> do
115+ r <- runTest i
116+ rs <- doTestMenu ( read i + 1 )
118117 return $ r : rs
119118 where
120− display_test_menu
121− = mapM_ display_test_menu' test_menu
122− display_test_menu' ( i, t )
123− = putStrLn $ ( if i == show next_ID
124− then "> "
119+ displayTestMenu
120+ = mapM_ displayTestMenu' testMenu
121+ displayTestMenu' ( i, t )
122+ = putStrLn $ ( if i == show nextID
123+ then "> "
125124 else " "
126− ) ++ i ++ ". " ++ test_name t
127−
128−run_test :: String -> IO (String, Bool)
129−run_test i = do
130− let t = fromJust $ lookup i test_menu
131− print_summary t
132− wait_for_return
133− test_action t
134− r <- confirm_results t
135− return (test_ID t, r)
136−
137−default_success_confirm_results = do
125+ ) ++ i ++ ". " ++ testName t
126+
127+runTest :: String -> IO (String, Bool)
128+runTest i = do
129+ let t = fromJust $ lookup i testMenu
130+ printSummary t
131+ waitForReturn
132+ testAction t
133+ r <- confirmResults t
134+ return (testID t, r)
135+
136+defaultSuccessConfirmResults = do
138137 putStr "\n"
139138 putStr "[Y/n] "
140139 hFlush stdout
141140 r <- getLine
142141 case r of
143− "" -> return True
142+ "" -> return True
144143 "y" -> return True
145144 "Y" -> return True
146145 "n" -> return False
147146
148147data Test = Test
149− { test_name :: String
150− , test_ID :: String
151− , test_action :: IO ()
152− , print_summary :: IO ()
153− , confirm_results :: IO Bool
148+ { testName :: String
149+ , testID :: String
150+ , testAction :: IO ()
151+ , printSummary :: IO ()
152+ , confirmResults :: IO Bool
154153 }
155154
156−all_tests
157− = [ reserve_output_test
158− , display_bounds_test_0
159− , display_bounds_test_1
160− , display_bounds_test_2
161− , display_bounds_test_3
162− , unicode_single_width_0
163− , unicode_single_width_1
164− , unicode_double_width_0
165− , unicode_double_width_1
166− , attributes_test_0
167− , attributes_test_1
168− , attributes_test_2
169− , attributes_test_3
170− , attributes_test_4
171− , attributes_test_5
172− , inline_test_0
173− , inline_test_1
174− , inline_test_2
175− , cursor_hide_test_0
176− , vert_crop_test_0
177− , vert_crop_test_1
178− , vert_crop_test_2
179− , vert_crop_test_3
155+allTests
156+ = [ reserveOutputTest
157+ , displayBoundsTest0
158+ , displayBoundsTest1
159+ , displayBoundsTest2
160+ , displayBoundsTest3
161+ , unicodeSingleWidth0
162+ , unicodeSingleWidth1
163+ , unicodeDoubleWidth0
164+ , unicodeDoubleWidth1
165+ , attributesTest0
166+ , attributesTest1
167+ , attributesTest2
168+ , attributesTest3
169+ , attributesTest4
170+ , attributesTest5
171+ , inlineTest0
172+ , inlineTest1
173+ , inlineTest2
174+ , cursorHideTest0
175+ , vertCropTest0
176+ , vertCropTest1
177+ , vertCropTest2
178+ , vertCropTest3
179+ , horizCropTest0
180+ , horizCropTest1
181+ , horizCropTest2
182+ , horizCropTest3
183+ , layer0
184+ , layer1
180185 ]
181186
182−reserve_output_test = Test
183− { test_name = "Initialize and reserve terminal output then restore previous state."
184− , test_ID = "reserve_output_test"
185− , test_action = do
186− t <- current_terminal
187− reserve_display t
187+reserveOutputTest = Test
188+ { testName = "Initialize and reserve terminal output then restore previous state."
189+ , testID = "reserveOutputTest"
190+ , testAction = do
191+ t <- standardIOConfig >>= outputForConfig
192+ reserveDisplay t
188193 putStrLn "Line 1"
189194 putStrLn "Line 2"
190195 putStrLn "Line 3"
191196 putStrLn "Line 4 (press return)"
192197 hFlush stdout
193198 getLine
194− release_display t
195− release_terminal t
199+ releaseDisplay t
200+ releaseTerminal t
196201 return ()
197− , print_summary = do
202+ , printSummary = do
198203 putStr $ [s|
199204Once return is pressed:
200− 0. The screen will be cleared.
205+ 0. The screen will be cleared.
201206 1. Four lines of text should be visible.
202207 1. The cursor should be visible and at the start of the fifth line.
203208
@@ -205,123 +210,123 @@ After return is pressed for the second time this test then:
205210 * The screen containing the test summary should be restored;
206211 * The cursor is visible.
207212|]
208− , confirm_results = do
213+ , confirmResults = do
209214 putStr $ [s|
210215Did the test output match the description?
211216|]
212− default_success_confirm_results
217+ defaultSuccessConfirmResults
213218 }
214219
215−display_bounds_test_0 = Test
216− { test_name = "Verify display bounds are correct test 0: Using spaces."
217− , test_ID = "display_bounds_test_0"
218− , test_action = do
219− t <- current_terminal
220− reserve_display t
221− DisplayRegion w h <- display_bounds t
222− let row_0 = replicate (fromEnum w) 'X' ++ "\n"
223− row_h = replicate (fromEnum w - 1) 'X'
224− row_n = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
225− image = row_0 ++ (concat $ replicate (fromEnum h - 2) row_n) ++ row_h
220+displayBoundsTest0 = Test
221+ { testName = "Verify display bounds are correct test 0: Using spaces."
222+ , testID = "displayBoundsTest0"
223+ , testAction = do
224+ t <- standardIOConfig >>= outputForConfig
225+ reserveDisplay t
226+ (w,h) <- displayBounds t
227+ let row0 = replicate (fromEnum w) 'X' ++ "\n"
228+ rowH = replicate (fromEnum w - 1) 'X'
229+ rowN = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
230+ image = row0 ++ (concat $ replicate (fromEnum h - 2) rowN) ++ rowH
226231 putStr image
227232 hFlush stdout
228233 getLine
229− release_display t
230− release_terminal t
234+ releaseDisplay t
235+ releaseTerminal t
231236 return ()
232− , print_summary = display_bounds_test_summary True
233− , confirm_results = generic_output_match_confirm
237+ , printSummary = displayBoundsTestSummary True
238+ , confirmResults = genericOutputMatchConfirm
234239 }
235240
236−display_bounds_test_1 = Test
237− { test_name = "Verify display bounds are correct test 0: Using cursor movement."
238− , test_ID = "display_bounds_test_1"
239− , test_action = do
240− t <- current_terminal
241− reserve_display t
242− DisplayRegion w h <- display_bounds t
243− set_cursor_pos t 0 0
244− let row_0 = replicate (fromEnum w) 'X' ++ "\n"
245− putStr row_0
241+displayBoundsTest1 = Test
242+ { testName = "Verify display bounds are correct test 0: Using cursor movement."
243+ , testID = "displayBoundsTest1"
244+ , testAction = do
245+ t <- standardIOConfig >>= outputForConfig
246+ reserveDisplay t
247+ (w,h) <- displayBounds t
248+ setCursorPos t 0 0
249+ let row0 = replicate (fromEnum w) 'X' ++ "\n"
250+ putStr row0
246251 forM_ [1 .. h - 2] $ \y -> do
247− set_cursor_pos t 0 y
252+ setCursorPos t 0 y
248253 putStr "X"
249254 hFlush stdout
250− set_cursor_pos t (w - 1) y
255+ setCursorPos t (w - 1) y
251256 putStr "X"
252257 hFlush stdout
253− set_cursor_pos t 0 (h - 1)
254− let row_h = replicate (fromEnum w - 1) 'X'
255− putStr row_h
258+ setCursorPos t 0 (h - 1)
259+ let rowH = replicate (fromEnum w - 1) 'X'
260+ putStr rowH
256261 hFlush stdout
257262 getLine
258− release_display t
259− release_terminal t
263+ releaseDisplay t
264+ releaseTerminal t
260265 return ()
261− , print_summary = display_bounds_test_summary True
262− , confirm_results = generic_output_match_confirm
266+ , printSummary = displayBoundsTestSummary True
267+ , confirmResults = genericOutputMatchConfirm
263268 }
264269
265−display_bounds_test_2 = Test
266− { test_name = "Verify display bounds are correct test 0: Using Image ops."
267− , test_ID = "display_bounds_test_2"
268− , test_action = do
269− t <- current_terminal
270− reserve_display t
271− bounds@(DisplayRegion w h) <- display_bounds t
272− let first_row = horiz_cat $ replicate (fromEnum w) (char def_attr 'X')
273− middle_rows = vert_cat $ replicate (fromEnum h - 2) middle_row
274− middle_row = (char def_attr 'X') <|> background_fill (w - 2) 1 <|> (char def_attr 'X')
275− end_row = first_row
276− image = first_row <-> middle_rows <-> end_row
277− pic = (pic_for_image image) { pic_cursor = Cursor (w - 1) (h - 1) }
278− d <- display_context t bounds
279− output_picture d pic
270+displayBoundsTest2 = Test
271+ { testName = "Verify display bounds are correct test 0: Using Image ops."
272+ , testID = "displayBoundsTest2"
273+ , testAction = do
274+ t <- standardIOConfig >>= outputForConfig
275+ reserveDisplay t
276+ bounds@(w,h) <- displayBounds t
277+ let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
278+ middleRows = vertCat $ replicate (fromEnum h - 2) middleRow
279+ middleRow = (char defAttr 'X') <|> backgroundFill (w - 2) 1 <|> (char defAttr 'X')
280+ endRow = firstRow
281+ image = firstRow <-> middleRows <-> endRow
282+ pic = (picForImage image) { picCursor = Cursor (w - 1) (h - 1) }
283+ d <- displayContext t bounds
284+ outputPicture d pic
280285 getLine
281− release_display t
282− release_terminal t
286+ releaseDisplay t
287+ releaseTerminal t
283288 return ()
284− , print_summary = display_bounds_test_summary True
285− , confirm_results = generic_output_match_confirm
289+ , printSummary = displayBoundsTestSummary True
290+ , confirmResults = genericOutputMatchConfirm
286291 }
287292
288−display_bounds_test_3 = Test
289− { test_name = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
290− , test_ID = "display_bounds_test_3"
291− , test_action = do
292− t <- current_terminal
293− reserve_display t
294− DisplayRegion w h <- display_bounds t
295− hide_cursor t
296− set_cursor_pos t 0 0
297− let row_0 = replicate (fromEnum w) 'X'
298− putStrLn row_0
293+displayBoundsTest3 = Test
294+ { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
295+ , testID = "displayBoundsTest3"
296+ , testAction = do
297+ t <- standardIOConfig >>= outputForConfig
298+ reserveDisplay t
299+ (w,h) <- displayBounds t
300+ hideCursor t
301+ setCursorPos t 0 0
302+ let row0 = replicate (fromEnum w) 'X'
303+ putStrLn row0
299304 forM_ [1 .. h - 2] $ \y -> do
300− set_cursor_pos t 0 y
305+ setCursorPos t 0 y
301306 putStr "X"
302307 hFlush stdout
303− set_cursor_pos t (w - 1) y
308+ setCursorPos t (w - 1) y
304309 putStr "X"
305310 hFlush stdout
306− set_cursor_pos t 0 (h - 1)
307− let row_h = row_0
308− putStr row_h
311+ setCursorPos t 0 (h - 1)
312+ let rowH = row0
313+ putStr rowH
309314 hFlush stdout
310315 getLine
311− show_cursor t
312− release_display t
313− release_terminal t
316+ showCursor t
317+ releaseDisplay t
318+ releaseTerminal t
314319 return ()
315− , print_summary = display_bounds_test_summary False
316− , confirm_results = generic_output_match_confirm
320+ , printSummary = displayBoundsTestSummary False
321+ , confirmResults = genericOutputMatchConfirm
317322 }
318323
319−display_bounds_test_summary has_cursor = do
324+displayBoundsTestSummary hasCursor = do
320325 putStr $ [s|
321326Once return is pressed:
322327 0. The screen will be cleared.
323328|]
324− if has_cursor
329+ if hasCursor
325330 then putStr " 1. The cursor will be visible."
326331 else putStr " 1. The cursor will NOT be visible."
327332 putStr [s|
@@ -332,7 +337,7 @@ Once return is pressed:
332337 |XXXXXXXXXXXXX|
333338 |X X||]
334339
335− if has_cursor
340+ if hasCursor
336341 then putStr $ [s|
337342
338343 |XXXXXXXXXXXXC| |]
@@ -353,13 +358,13 @@ After return is pressed for the second time:
353358 1. The cursor should be visible.
354359|]
355360
356−generic_output_match_confirm = do
361+genericOutputMatchConfirm = do
357362 putStr $ [s|
358363Did the test output match the description?
359364|]
360− default_success_confirm_results
365+ defaultSuccessConfirmResults
361366
362−-- Explicitely definethe bytes that encode each example text.
367+-- Explicitly define the bytes that encode each example text.
363368-- This avoids any issues with how the compiler represents string literals.
364369--
365370-- This document is UTF-8 encoded so the UTF-8 string is still included for
@@ -368,24 +373,24 @@ Did the test output match the description?
368373-- It's assumed the compiler will at least not barf on UTF-8 encoded text in
369374-- comments ;-)
370375--
371−-- txt_0 = ↑↑↓↓←→←→BA
372−
373−utf8_txt_0 :: [[Word8]]
374−utf8_txt_0 = [ [ 0xe2 , 0x86 , 0x91 ]
375− , [ 0xe2 , 0x86 , 0x91 ]
376− , [ 0xe2 , 0x86 , 0x93 ]
377− , [ 0xe2 , 0x86 , 0x93 ]
378− , [ 0xe2 , 0x86 , 0x90 ]
379− , [ 0xe2 , 0x86 , 0x92 ]
380− , [ 0xe2 , 0x86 , 0x90 ]
381− , [ 0xe2 , 0x86 , 0x92 ]
382− , [ 0x42 ]
383− , [ 0x41 ]
384− ]
385−
386−iso_10646_txt_0 :: String
387−iso_10646_txt_0 = map toEnum
388− [ 8593
376+-- txt0 = ↑↑↓↓←→←→BA
377+
378+utf8Txt0 :: [[Word8]]
379+utf8Txt0 = [ [ 0xe2 , 0x86 , 0x91 ]
380+ , [ 0xe2 , 0x86 , 0x91 ]
381+ , [ 0xe2 , 0x86 , 0x93 ]
382+ , [ 0xe2 , 0x86 , 0x93 ]
383+ , [ 0xe2 , 0x86 , 0x90 ]
384+ , [ 0xe2 , 0x86 , 0x92 ]
385+ , [ 0xe2 , 0x86 , 0x90 ]
386+ , [ 0xe2 , 0x86 , 0x92 ]
387+ , [ 0x42 ]
388+ , [ 0x41 ]
389+ ]
390+
391+iso10646Txt0 :: String
392+iso10646Txt0 = map toEnum
393+ [ 8593
389394 , 8593
390395 , 8595
391396 , 8595
@@ -397,46 +402,46 @@ iso_10646_txt_0 = map toEnum
397402 , 65
398403 ]
399404
400−unicode_single_width_0 = Test
401− { test_name = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
402− , test_ID = "unicode_single_width_0"
403− , test_action = do
404− t <- current_terminal
405− reserve_display t
406− hide_cursor t
407− withArrayLen (concat utf8_txt_0) (flip $ hPutBuf stdout)
405+unicodeSingleWidth0 = Test
406+ { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
407+ , testID = "unicodeSingleWidth0"
408+ , testAction = do
409+ t <- standardIOConfig >>= outputForConfig
410+ reserveDisplay t
411+ hideCursor t
412+ withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
408413 hPutStr stdout "\n"
409414 hPutStr stdout "0123456789\n"
410415 hFlush stdout
411416 getLine
412− release_display t
413− release_terminal t
417+ releaseDisplay t
418+ releaseTerminal t
414419 return ()
415− , print_summary = unicode_single_width_summary
416− , confirm_results = generic_output_match_confirm
420+ , printSummary = unicodeSingleWidthSummary
421+ , confirmResults = genericOutputMatchConfirm
417422 }
418423
419−unicode_single_width_1 = Test
420− { test_name = "Verify terminal can display unicode single-width characters. (Image ops)"
421− , test_ID = "unicode_single_width_1"
422− , test_action = do
423− t <- current_terminal
424− reserve_display t
425− let pic = pic_for_image image
426− image = line_0 <-> line_1
427− line_0 = iso_10646_string def_attr iso_10646_txt_0
428− line_1 = string def_attr "0123456789"
429− d <- display_bounds t >>= display_context t
430− output_picture d pic
424+unicodeSingleWidth1 = Test
425+ { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
426+ , testID = "unicodeSingleWidth1"
427+ , testAction = do
428+ t <- standardIOConfig >>= outputForConfig
429+ reserveDisplay t
430+ let pic = picForImage image
431+ image = line0 <-> line1
432+ line0 = iso10646String defAttr iso10646Txt0
433+ line1 = string defAttr "0123456789"
434+ d <- displayBounds t >>= displayContext t
435+ outputPicture d pic
431436 getLine
432− release_display t
433− release_terminal t
437+ releaseDisplay t
438+ releaseTerminal t
434439 return ()
435− , print_summary = unicode_single_width_summary
436− , confirm_results = generic_output_match_confirm
440+ , printSummary = unicodeSingleWidthSummary
441+ , confirmResults = genericOutputMatchConfirm
437442 }
438443
439−unicode_single_width_summary = putStr [s|
444+unicodeSingleWidthSummary = putStr [s|
440445Once return is pressed:
441446 0. The screen will be cleared.
442447 1. The cursor will be hidden.
@@ -470,55 +475,55 @@ After return is pressed for the second time:
470475
471476-- The second example is a unicode string containing double-width glyphs
472477-- 你好吗
473−utf8_txt_1 :: [[Word8]]
474−utf8_txt_1 = [ [0xe4,0xbd,0xa0]
475− , [0xe5,0xa5,0xbd]
476− , [0xe5,0x90,0x97]
477− ]
478−
479−iso_10646_txt_1 :: String
480−iso_10646_txt_1 = map toEnum [20320,22909,21527]
481−
482−unicode_double_width_0 = Test
483− { test_name = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
484− , test_ID = "unicode_double_width_0"
485− , test_action = do
486− t <- current_terminal
487− reserve_display t
488− hide_cursor t
489− withArrayLen (concat utf8_txt_1) (flip $ hPutBuf stdout)
478+utf8Txt1 :: [[Word8]]
479+utf8Txt1 = [ [0xe4,0xbd,0xa0]
480+ , [0xe5,0xa5,0xbd]
481+ , [0xe5,0x90,0x97]
482+ ]
483+
484+iso10646Txt1 :: String
485+iso10646Txt1 = map toEnum [20320,22909,21527]
486+
487+unicodeDoubleWidth0 = Test
488+ { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
489+ , testID = "unicodeDoubleWidth0"
490+ , testAction = do
491+ t <- standardIOConfig >>= outputForConfig
492+ reserveDisplay t
493+ hideCursor t
494+ withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
490495 hPutStr stdout "\n"
491496 hPutStr stdout "012345\n"
492497 hFlush stdout
493498 getLine
494− release_display t
495− release_terminal t
499+ releaseDisplay t
500+ releaseTerminal t
496501 return ()
497− , print_summary = unicode_double_width_summary
498− , confirm_results = generic_output_match_confirm
502+ , printSummary = unicodeDoubleWidthSummary
503+ , confirmResults = genericOutputMatchConfirm
499504 }
500505
501−unicode_double_width_1 = Test
502− { test_name = "Verify terminal can display unicode double-width characters. (Image ops)"
503− , test_ID = "unicode_double_width_1"
504− , test_action = do
505− t <- current_terminal
506− reserve_display t
507− let pic = pic_for_image image
508− image = line_0 <-> line_1
509− line_0 = iso_10646_string def_attr iso_10646_txt_1
510− line_1 = string def_attr "012345"
511− d <- display_bounds t >>= display_context t
512− output_picture d pic
506+unicodeDoubleWidth1 = Test
507+ { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
508+ , testID = "unicodeDoubleWidth1"
509+ , testAction = do
510+ t <- standardIOConfig >>= outputForConfig
511+ reserveDisplay t
512+ let pic = picForImage image
513+ image = line0 <-> line1
514+ line0 = iso10646String defAttr iso10646Txt1
515+ line1 = string defAttr "012345"
516+ d <- displayBounds t >>= displayContext t
517+ outputPicture d pic
513518 getLine
514− release_display t
515− release_terminal t
519+ releaseDisplay t
520+ releaseTerminal t
516521 return ()
517− , print_summary = unicode_double_width_summary
518− , confirm_results = generic_output_match_confirm
522+ , printSummary = unicodeDoubleWidthSummary
523+ , confirmResults = genericOutputMatchConfirm
519524 }
520525
521−unicode_double_width_summary = putStr [s|
526+unicodeDoubleWidthSummary = putStr [s|
522527Once return is pressed:
523528 0. The screen will be cleared.
524529 1. The cursor will be hidden.
@@ -545,32 +550,32 @@ After return is pressed for the second time:
545550 1. The cursor should be visible.
546551|]
547552
548−all_colors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
549− [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
553+allColors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
554+ [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
550555
551−all_bright_colors
552− = zip [ bright_black, bright_red, bright_green, bright_yellow, bright_blue, bright_magenta, bright_cyan, bright_white ]
556+allBrightColors
557+ = zip [ brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite ]
553558 [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
554559
555−attributes_test_0 = Test
556− { test_name = "Character attributes: foreground colors."
557− , test_ID = "attributes_test_0"
558− , test_action = do
559− t <- current_terminal
560− reserve_display t
561− let pic = pic_for_image image
562− image = border <|> column_0 <|> border <|> column_1 <|> border
563− column_0 = vert_cat $ map line_with_color all_colors
564− border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
565− column_1 = vert_cat $ map (string def_attr . snd) all_colors
566− line_with_color (c, c_name) = string (def_attr `with_fore_color` c) c_name
567− d <- display_bounds t >>= display_context t
568− output_picture d pic
560+attributesTest0 = Test
561+ { testName = "Character attributes: foreground colors."
562+ , testID = "attributesTest0"
563+ , testAction = do
564+ t <- standardIOConfig >>= outputForConfig
565+ reserveDisplay t
566+ let pic = picForImage image
567+ image = border <|> column0 <|> border <|> column1 <|> border
568+ column0 = vertCat $ map lineWithColor allColors
569+ border = vertCat $ replicate (length allColors) $ string defAttr " | "
570+ column1 = vertCat $ map (string defAttr . snd) allColors
571+ lineWithColor (c, cName) = string (defAttr `withForeColor` c) cName
572+ d <- displayBounds t >>= displayContext t
573+ outputPicture d pic
569574 getLine
570− release_display t
571− release_terminal t
575+ releaseDisplay t
576+ releaseTerminal t
572577 return ()
573− , print_summary = do
578+ , printSummary = do
574579 putStr $ [s|
575580Once return is pressed:
576581 0. The screen will be cleared.
@@ -591,32 +596,32 @@ After return is pressed for the second time:
591596 0. The screen containing the test summary should be restored.
592597 1. The cursor should be visible.
593598|]
594− , confirm_results = do
599+ , confirmResults = do
595600 putStr $ [s|
596601Did the test output match the description?
597602|]
598− default_success_confirm_results
603+ defaultSuccessConfirmResults
599604 }
600605
601−attributes_test_1 = Test
602− { test_name = "Character attributes: background colors."
603− , test_ID = "attributes_test_1"
604− , test_action = do
605− t <- current_terminal
606− reserve_display t
607− let pic = pic_for_image image
608− image = border <|> column_0 <|> border <|> column_1 <|> border
609− column_0 = vert_cat $ map line_with_color all_colors
610− border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
611− column_1 = vert_cat $ map (string def_attr . snd) all_colors
612− line_with_color (c, c_name) = string (def_attr `with_back_color` c) c_name
613− d <- display_bounds t >>= display_context t
614− output_picture d pic
606+attributesTest1 = Test
607+ { testName = "Character attributes: background colors."
608+ , testID = "attributesTest1"
609+ , testAction = do
610+ t <- standardIOConfig >>= outputForConfig
611+ reserveDisplay t
612+ let pic = picForImage image
613+ image = border <|> column0 <|> border <|> column1 <|> border
614+ column0 = vertCat $ map lineWithColor allColors
615+ border = vertCat $ replicate (length allColors) $ string defAttr " | "
616+ column1 = vertCat $ map (string defAttr . snd) allColors
617+ lineWithColor (c, cName) = string (defAttr `withBackColor` c) cName
618+ d <- displayBounds t >>= displayContext t
619+ outputPicture d pic
615620 getLine
616− release_display t
617− release_terminal t
621+ releaseDisplay t
622+ releaseTerminal t
618623 return ()
619− , print_summary = do
624+ , printSummary = do
620625 putStr $ [s|
621626Once return is pressed:
622627 0. The screen will be cleared.
@@ -646,57 +651,57 @@ After return is pressed for the second time:
646651 0. The screen containing the test summary should be restored.
647652 1. The cursor should be visible.
648653|]
649− , confirm_results = do
654+ , confirmResults = do
650655 putStr $ [s|
651656Did the test output match the description?
652657|]
653− default_success_confirm_results
658+ defaultSuccessConfirmResults
654659 }
655660
656−attributes_test_2 = Test
657− { test_name = "Character attributes: Vivid foreground colors."
658− , test_ID = "attributes_test_2"
659− , test_action = do
660− t <- current_terminal
661− reserve_display t
662− let pic = pic_for_image image
663− image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
664− border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
665− column_0 = vert_cat $ map line_with_color_0 all_colors
666− column_1 = vert_cat $ map line_with_color_1 all_bright_colors
667− column_2 = vert_cat $ map (string def_attr . snd) all_colors
668− line_with_color_0 (c, c_name) = string (def_attr `with_fore_color` c) c_name
669− line_with_color_1 (c, c_name) = string (def_attr `with_fore_color` c) c_name
670− d <- display_bounds t >>= display_context t
671− output_picture d pic
661+attributesTest2 = Test
662+ { testName = "Character attributes: Vivid foreground colors."
663+ , testID = "attributesTest2"
664+ , testAction = do
665+ t <- standardIOConfig >>= outputForConfig
666+ reserveDisplay t
667+ let pic = picForImage image
668+ image = horizCat [border, column0, border, column1, border, column2, border]
669+ border = vertCat $ replicate (length allColors) $ string defAttr " | "
670+ column0 = vertCat $ map lineWithColor0 allColors
671+ column1 = vertCat $ map lineWithColor1 allBrightColors
672+ column2 = vertCat $ map (string defAttr . snd) allColors
673+ lineWithColor0 (c, cName) = string (defAttr `withForeColor` c) cName
674+ lineWithColor1 (c, cName) = string (defAttr `withForeColor` c) cName
675+ d <- displayBounds t >>= displayContext t
676+ outputPicture d pic
672677 getLine
673− release_display t
674− release_terminal t
678+ releaseDisplay t
679+ releaseTerminal t
675680 return ()
676− , print_summary = do
681+ , printSummary = do
677682 putStr $ [s|
678683Once return is pressed:
679684 0. The screen will be cleared.
680685 1. The cursor will be hidden.
681686 2. 9 lines of text in three columns will be drawn:
682687 a. The first column will be a name of a standard color (for an 8 color
683− terminal) rendered with that color as the foreground color.
688+ terminal) rendered with that color as the foreground color.
684689 b. The next column will be also be the name of a standard color rendered
685690 with that color as the foreground color but the shade used should be
686− more vivid than the shade used in the first column.
691+ more vivid than the shade used in the first column.
687692 c. The final column will be the name of a color rendered with the
688693 default attributes.
689694
690695For instance, one line will be the word "magenta" and that word should be
691−rendered in the magenta color.
696+rendered in the magenta color.
692697
693698I'm not actually sure exactly what "vivid" means in this context. For xterm the
694−vivid colors are brighter.
699+vivid colors are brighter.
695700
696−Verify:
701+Verify:
697702 * The first column: The foreground color matches the named color.
698703 * The second column: The foreground color matches the named color but is
699− more vivid than the color used in the first column.
704+ more vivid than the color used in the first column.
700705 * The third column: All text is rendered with the default attributes.
701706 * The vertical bars used in each line to mark the border of a column are
702707 lined up.
@@ -705,34 +710,34 @@ After return is pressed for the second time:
705710 0. The screen containing the test summary should be restored.
706711 1. The cursor should be visible.
707712|]
708− , confirm_results = do
713+ , confirmResults = do
709714 putStr $ [s|
710715Did the test output match the description?
711716|]
712− default_success_confirm_results
717+ defaultSuccessConfirmResults
713718 }
714719
715−attributes_test_3 = Test
716− { test_name = "Character attributes: Vivid background colors."
717− , test_ID = "attributes_test_3"
718− , test_action = do
719− t <- current_terminal
720− reserve_display t
721− let pic = pic_for_image image
722− image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
723− border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
724− column_0 = vert_cat $ map line_with_color_0 all_colors
725− column_1 = vert_cat $ map line_with_color_1 all_bright_colors
726− column_2 = vert_cat $ map (string def_attr . snd) all_colors
727− line_with_color_0 (c, c_name) = string (def_attr `with_back_color` c) c_name
728− line_with_color_1 (c, c_name) = string (def_attr `with_back_color` c) c_name
729− d <- display_bounds t >>= display_context t
730− output_picture d pic
720+attributesTest3 = Test
721+ { testName = "Character attributes: Vivid background colors."
722+ , testID = "attributesTest3"
723+ , testAction = do
724+ t <- standardIOConfig >>= outputForConfig
725+ reserveDisplay t
726+ let pic = picForImage image
727+ image = horizCat [border, column0, border, column1, border, column2, border]
728+ border = vertCat $ replicate (length allColors) $ string defAttr " | "
729+ column0 = vertCat $ map lineWithColor0 allColors
730+ column1 = vertCat $ map lineWithColor1 allBrightColors
731+ column2 = vertCat $ map (string defAttr . snd) allColors
732+ lineWithColor0 (c, cName) = string (defAttr `withBackColor` c) cName
733+ lineWithColor1 (c, cName) = string (defAttr `withBackColor` c) cName
734+ d <- displayBounds t >>= displayContext t
735+ outputPicture d pic
731736 getLine
732− release_display t
733− release_terminal t
737+ releaseDisplay t
738+ releaseTerminal t
734739 return ()
735− , print_summary = do
740+ , printSummary = do
736741 putStr $ [s|
737742Once return is pressed:
738743 0. The screen will be cleared.
@@ -740,23 +745,23 @@ Once return is pressed:
740745 2. 9 lines of text in three columns will be drawn:
741746 a. The first column will contain be a name of a standard color for an 8
742747 color terminal rendered with the default foreground color with a
743− background the named color.
748+ background the named color.
744749 b. The first column will contain be a name of a standard color for an 8
745750 color terminal rendered with the default foreground color with the
746− background a vivid version of the named color.
751+ background a vivid version of the named color.
747752 c. The third column will be the name of a standard color rendered with
748753 the default attributes.
749−
754+
750755For instance, one line will contain be the word "magenta" and the word should
751−be rendered in the default foreground color over a magenta background.
756+be rendered in the default foreground color over a magenta background.
752757
753758I'm not actually sure exactly what "vivid" means in this context. For xterm the
754759vivid colors are brighter.
755760
756−Verify:
761+Verify:
757762 * The first column: The background color matches the named color.
758763 * The second column: The background color matches the named color and is
759− more vivid than the color used in the first column.
764+ more vivid than the color used in the first column.
760765 * The third column column: All text is rendered with the default attributes.
761766 * The vertical bars used in each line to mark the border of a column are
762767 lined up.
@@ -772,51 +777,51 @@ After return is pressed for the second time:
772777 0. The screen containing the test summary should be restored.
773778 1. The cursor should be visible.
774779|]
775− , confirm_results = do
780+ , confirmResults = do
776781 putStr $ [s|
777782Did the test output match the description?
778783|]
779− default_success_confirm_results
784+ defaultSuccessConfirmResults
780785 }
781786
782−attr_combos =
787+attrCombos =
783788 [ ( "default", id )
784− , ( "bold", flip with_style bold )
785− , ( "blink", flip with_style blink )
786− , ( "underline", flip with_style underline )
787− , ( "bold + blink", flip with_style (bold + blink) )
788− , ( "bold + underline", flip with_style (bold + underline) )
789− , ( "underline + blink", flip with_style (underline + blink) )
790− , ( "bold + blink + underline", flip with_style (bold + blink + underline) )
789+ , ( "bold", flip withStyle bold )
790+ , ( "blink", flip withStyle blink )
791+ , ( "underline", flip withStyle underline )
792+ , ( "bold + blink", flip withStyle (bold + blink) )
793+ , ( "bold + underline", flip withStyle (bold + underline) )
794+ , ( "underline + blink", flip withStyle (underline + blink) )
795+ , ( "bold + blink + underline", flip withStyle (bold + blink + underline) )
791796 ]
792797
793−attributes_test_4 = Test
794− { test_name = "Character attributes: Bold; Blink; Underline."
795− , test_ID = "attributes_test_4"
796− , test_action = do
797− t <- current_terminal
798− reserve_display t
799− let pic = pic_for_image image
800− image = horiz_cat [border, column_0, border, column_1, border]
801− border = vert_cat $ replicate (length attr_combos) $ string def_attr " | "
802− column_0 = vert_cat $ map line_with_attrs attr_combos
803− column_1 = vert_cat $ map (string def_attr . fst) attr_combos
804− line_with_attrs (desc, attr_f) = string (attr_f def_attr) desc
805− d <- display_bounds t >>= display_context t
806− output_picture d pic
798+attributesTest4 = Test
799+ { testName = "Character attributes: Bold; Blink; Underline."
800+ , testID = "attributesTest4"
801+ , testAction = do
802+ t <- standardIOConfig >>= outputForConfig
803+ reserveDisplay t
804+ let pic = picForImage image
805+ image = horizCat [border, column0, border, column1, border]
806+ border = vertCat $ replicate (length attrCombos) $ string defAttr " | "
807+ column0 = vertCat $ map lineWithAttrs attrCombos
808+ column1 = vertCat $ map (string defAttr . fst) attrCombos
809+ lineWithAttrs (desc, attrF) = string (attrF defAttr) desc
810+ d <- displayBounds t >>= displayContext t
811+ outputPicture d pic
807812 getLine
808− release_display t
809− release_terminal t
813+ releaseDisplay t
814+ releaseTerminal t
810815 return ()
811− , print_summary = do
816+ , printSummary = do
812817 putStr $ [s|
813818Once return is pressed:
814819 0. The screen will be cleared.
815820 1. The cursor will be hidden.
816− 2. 8 rows of text in two columns.
821+ 2. 8 rows of text in two columns.
817822 The rows will contain the following text:
818823 default
819− bold
824+ bold
820825 blink
821826 underline
822827 bold + blink
@@ -825,8 +830,8 @@ Once return is pressed:
825830 bold + blink + underline
826831 The first column will be rendered with the described attributes. The second
827832 column will be rendered with the default attributes.
828−
829−Verify:
833+
834+Verify:
830835 * The vertical bars used in each line to mark the border of a column are
831836 lined up.
832837 * The text in the first column is rendered as described.
@@ -835,31 +840,31 @@ After return is pressed for the second time:
835840 0. The screen containing the test summary should be restored.
836841 1. The cursor should be visible.
837842|]
838− , confirm_results = do
843+ , confirmResults = do
839844 putStr $ [s|
840845Did the test output match the description?
841846|]
842− default_success_confirm_results
847+ defaultSuccessConfirmResults
843848 }
844849
845−attributes_test_5 = Test
846− { test_name = "Character attributes: 240 color palette"
847− , test_ID = "attributes_test_5"
848− , test_action = do
849− t <- current_terminal
850− reserve_display t
851− let pic = pic_for_image image
852− image = vert_cat $ map horiz_cat $ split_color_images color_images
853− color_images = map (\i -> string (current_attr `with_back_color` Color240 i) " ") [0..239]
854− split_color_images [] = []
855− split_color_images is = (take 20 is ++ [string def_attr " "]) : (split_color_images (drop 20 is))
856− d <- display_bounds t >>= display_context t
857− output_picture d pic
850+attributesTest5 = Test
851+ { testName = "Character attributes: 240 color palette"
852+ , testID = "attributesTest5"
853+ , testAction = do
854+ t <- standardIOConfig >>= outputForConfig
855+ reserveDisplay t
856+ let pic = picForImage image
857+ image = vertCat $ map horizCat $ splitColorImages colorImages
858+ colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
859+ splitColorImages [] = []
860+ splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
861+ d <- displayBounds t >>= displayContext t
862+ outputPicture d pic
858863 getLine
859− release_display t
860− release_terminal t
864+ releaseDisplay t
865+ releaseTerminal t
861866 return ()
862− , print_summary = do
867+ , printSummary = do
863868 putStr $ [s|
864869Once return is pressed:
865870 0. The screen will be cleared.
@@ -867,171 +872,304 @@ Once return is pressed:
867872 2. A 20 character wide and 12 row high block of color squares. This should look like a palette
868873 of some sort. I'm not exactly sure if all color terminals use the same palette. I doubt it...
869874
870−Verify:
875+Verify:
871876
872877After return is pressed for the second time:
873878 0. The screen containing the test summary should be restored.
874879 1. The cursor should be visible.
875880|]
876− , confirm_results = do
881+ , confirmResults = do
877882 putStr $ [s|
878883Did the test output match the description?
879884|]
880− default_success_confirm_results
885+ defaultSuccessConfirmResults
881886 }
882887
883−inline_test_0 = Test
884− { test_name = "Verify styled output can be performed without clearing the screen."
885− , test_ID = "inline_test_0"
886− , test_action = do
888+inlineTest0 = Test
889+ { testName = "Verify styled output can be performed without clearing the screen."
890+ , testID = "inlineTest0"
891+ , testAction = do
887892 putStrLn "line 1."
888− put_attr_change_ $ back_color red >> apply_style underline
893+ putAttrChange_ $ backColor red >> applyStyle underline
889894 putStrLn "line 2."
890− put_attr_change_ $ default_all
895+ putAttrChange_ $ defaultAll
891896 putStrLn "line 3."
892− , print_summary = putStr $ [s|
897+ , printSummary = putStr $ [s|
893898lines are in order.
894899The second line "line 2" should have a red background and the text underline.
895900The third line "line 3" should be drawn in the same style as the first line.
896901|]
897902
898− , confirm_results = generic_output_match_confirm
903+ , confirmResults = genericOutputMatchConfirm
899904 }
900905
901−inline_test_1 = Test
902− { test_name = "Verify styled output can be performed without clearing the screen."
903− , test_ID = "inline_test_1"
904− , test_action = do
906+inlineTest1 = Test
907+ { testName = "Verify styled output can be performed without clearing the screen."
908+ , testID = "inlineTest1"
909+ , testAction = do
905910 putStr "Not styled. "
906− put_attr_change_ $ back_color red >> apply_style underline
911+ putAttrChange_ $ backColor red >> applyStyle underline
907912 putStr " Styled! "
908− put_attr_change_ $ default_all
913+ putAttrChange_ $ defaultAll
909914 putStrLn "Not styled."
910− , print_summary = putStr $ [s|
915+ , printSummary = putStr $ [s|
911916|]
912917
913− , confirm_results = generic_output_match_confirm
918+ , confirmResults = genericOutputMatchConfirm
914919 }
915920
916−inline_test_2 = Test
917− { test_name = "Verify styled output can be performed without clearing the screen."
918− , test_ID = "inline_test_1"
919− , test_action = do
921+inlineTest2 = Test
922+ { testName = "Verify styled output can be performed without clearing the screen."
923+ , testID = "inlineTest1"
924+ , testAction = do
920925 putStr "Not styled. "
921− put_attr_change_ $ back_color red >> apply_style underline
926+ putAttrChange_ $ backColor red >> applyStyle underline
922927 putStr " Styled! "
923− put_attr_change_ $ default_all
928+ putAttrChange_ $ defaultAll
924929 putStr "Not styled.\n"
925− , print_summary = putStr $ [s|
930+ , printSummary = putStr $ [s|
926931|]
927− , confirm_results = generic_output_match_confirm
932+ , confirmResults = genericOutputMatchConfirm
928933 }
929934
930−cursor_hide_test_0 :: Test
931−cursor_hide_test_0 = Test
932− { test_name = "Verify the cursor is hid and re-shown. issue #7"
933− , test_ID = "cursor_hide_test_0"
934− , test_action = do
935− vty <- mkVty
936− show_cursor $ terminal vty
937− set_cursor_pos (terminal vty) 5 5
938− next_event vty
939− hide_cursor $ terminal vty
940− next_event vty
935+cursorHideTest0 :: Test
936+cursorHideTest0 = Test
937+ { testName = "Verify the cursor is hid and re-shown. issue #7"
938+ , testID = "cursorHideTest0"
939+ , testAction = do
940+ vty <- mkVty defaultConfig
941+ showCursor $ outputIface vty
942+ setCursorPos (outputIface vty) 5 5
943+ nextEvent vty
944+ hideCursor $ outputIface vty
945+ nextEvent vty
941946 shutdown vty
942947 return ()
943− , print_summary = putStr $ [s|
948+ , printSummary = putStr $ [s|
944949 1. verify the cursor is displayed.
945950 2. press enter
946951 3. verify the cursor is hid.
947952 4. press enter.
948953 5. the display should return to the state before the test.
949954|]
950− , confirm_results = generic_output_match_confirm
955+ , confirmResults = genericOutputMatchConfirm
951956 }
952957
953−output_image_and_wait :: Image -> IO ()
954−output_image_and_wait image = do
955− t <- current_terminal
956− reserve_display t
957− let pic = pic_for_image image
958− d <- display_bounds t >>= display_context t
959− output_picture d pic
958+outputImageAndWait :: Image -> IO ()
959+outputImageAndWait image = do
960+ let pic = picForImage image
961+ outputPicAndWait pic
962+
963+outputPicAndWait :: Picture -> IO ()
964+outputPicAndWait pic = do
965+ t <- standardIOConfig >>= outputForConfig
966+ reserveDisplay t
967+ d <- displayBounds t >>= displayContext t
968+ outputPicture d pic
960969 getLine
961− release_display t
962− release_terminal t
970+ releaseDisplay t
971+ releaseTerminal t
963972 return ()
964973
965−vert_crop_test_0 :: Test
966−vert_crop_test_0 = Test
967− { test_name = "Verify bottom cropping works as expected with single column chars"
968− , test_ID = "crop_test_0"
969− , test_action = do
970− let block_0 = crop_bottom 2 $ vert_cat $ map (string def_attr) lorum_ipsum
971− block_1 = vert_cat $ map (string def_attr) $ take 2 lorum_ipsum
972− image = block_0 <-> background_fill 10 2 <-> block_1
973− output_image_and_wait image
974− , print_summary = putStr $ [s|
974+vertCropTest0 :: Test
975+vertCropTest0 = Test
976+ { testName = "Verify bottom cropping works as expected with single column chars"
977+ , testID = "cropTest0"
978+ , testAction = do
979+ let block0 = cropBottom 2 $ vertCat $ map (string defAttr) lorumIpsum
980+ block1 = vertCat $ map (string defAttr) $ take 2 lorumIpsum
981+ image = block0 <-> backgroundFill 10 2 <-> block1
982+ outputImageAndWait image
983+ , printSummary = putStr $ [s|
975984 1. Verify the two text blocks are identical.
976985 2. press enter.
977986 3. the display should return to the state before the test.
978987|]
979− , confirm_results = generic_output_match_confirm
988+ , confirmResults = genericOutputMatchConfirm
980989 }
981990
982−vert_crop_test_1 :: Test
983−vert_crop_test_1 = Test
984− { test_name = "Verify bottom cropping works as expected with double column chars"
985− , test_ID = "crop_test_0"
986− , test_action = do
987− let block_0 = crop_bottom 2 $ vert_cat $ map (string def_attr) lorum_ipsum_chinese
988− block_1 = vert_cat $ map (string def_attr) $ take 2 lorum_ipsum_chinese
989− image = block_0 <-> background_fill 10 2 <-> block_1
990− output_image_and_wait image
991− , print_summary = putStr $ [s|
991+vertCropTest1 :: Test
992+vertCropTest1 = Test
993+ { testName = "Verify bottom cropping works as expected with double column chars"
994+ , testID = "cropTest0"
995+ , testAction = do
996+ let block0 = cropBottom 2 $ vertCat $ map (string defAttr) lorumIpsumChinese
997+ block1 = vertCat $ map (string defAttr) $ take 2 lorumIpsumChinese
998+ image = block0 <-> backgroundFill 10 2 <-> block1
999+ outputImageAndWait image
1000+ , printSummary = putStr $ [s|
9921001 1. Verify the two text blocks are identical.
9931002 2. press enter.
9941003 3. the display should return to the state before the test.
9951004|]
996− , confirm_results = generic_output_match_confirm
1005+ , confirmResults = genericOutputMatchConfirm
9971006 }
9981007
999−vert_crop_test_2 :: Test
1000−vert_crop_test_2 = Test
1001− { test_name = "Verify top cropping works as expected with single column chars"
1002− , test_ID = "crop_test_0"
1003− , test_action = do
1004− let block_0 = crop_top 2 $ vert_cat $ map (string def_attr) lorum_ipsum
1005− block_1 = vert_cat $ map (string def_attr) $ drop (length lorum_ipsum - 2) lorum_ipsum
1006− image = block_0 <-> background_fill 10 2 <-> block_1
1007− output_image_and_wait image
1008− , print_summary = putStr $ [s|
1008+vertCropTest2 :: Test
1009+vertCropTest2 = Test
1010+ { testName = "Verify top cropping works as expected with single column chars"
1011+ , testID = "cropTest2"
1012+ , testAction = do
1013+ let block0 = cropTop 2 $ vertCat $ map (string defAttr) lorumIpsum
1014+ block1 = vertCat $ map (string defAttr) $ drop (length lorumIpsum - 2) lorumIpsum
1015+ image = block0 <-> backgroundFill 10 2 <-> block1
1016+ outputImageAndWait image
1017+ , printSummary = putStr $ [s|
10091018 1. Verify the two text blocks are identical.
10101019 2. press enter.
10111020 3. the display should return to the state before the test.
10121021|]
1013− , confirm_results = generic_output_match_confirm
1022+ , confirmResults = genericOutputMatchConfirm
10141023 }
10151024
1016−vert_crop_test_3 :: Test
1017−vert_crop_test_3 = Test
1018− { test_name = "Verify top cropping works as expected with double column chars"
1019− , test_ID = "crop_test_0"
1020− , test_action = do
1021− let block_0 = crop_top 2 $ vert_cat $ map (string def_attr) lorum_ipsum_chinese
1022− block_1 = vert_cat $ map (string def_attr) $ drop (length lorum_ipsum_chinese - 2 ) lorum_ipsum_chinese
1023− image = block_0 <-> background_fill 10 2 <-> block_1
1024− output_image_and_wait image
1025− , print_summary = putStr $ [s|
1025+vertCropTest3 :: Test
1026+vertCropTest3 = Test
1027+ { testName = "Verify top cropping works as expected with double column chars"
1028+ , testID = "cropTest0"
1029+ , testAction = do
1030+ let block0 = cropTop 2 $ vertCat $ map (string defAttr) lorumIpsumChinese
1031+ block1 = vertCat $ map (string defAttr) $ drop (length lorumIpsumChinese - 2 ) lorumIpsumChinese
1032+ image = block0 <-> backgroundFill 10 2 <-> block1
1033+ outputImageAndWait image
1034+ , printSummary = putStr $ [s|
10261035 1. Verify the two text blocks are identical.
10271036 2. press enter.
10281037 3. the display should return to the state before the test.
10291038|]
1030− , confirm_results = generic_output_match_confirm
1039+ , confirmResults = genericOutputMatchConfirm
10311040 }
10321041
1033−lorum_ipsum :: [String]
1034−lorum_ipsum = lines [s|
1042+horizCropTest0 :: Test
1043+horizCropTest0 = Test
1044+ { testName = "Verify right cropping works as expected with single column chars"
1045+ , testID = "cropTest0"
1046+ , testAction = do
1047+ let baseImage = vertCat $ map (string defAttr) lorumIpsum
1048+ croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1049+ image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1050+ outputImageAndWait image
1051+ , printSummary = putStr $ [s|
1052+ 1. Verify the bottom text block is about half the width of the top text block.
1053+ 2. press enter.
1054+ 3. the display should return to the state before the test.
1055+|]
1056+ , confirmResults = genericOutputMatchConfirm
1057+ }
1058+
1059+horizCropTest1 :: Test
1060+horizCropTest1 = Test
1061+ { testName = "Verify right cropping works as expected with double column chars"
1062+ , testID = "cropTest0"
1063+ , testAction = do
1064+ let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1065+ croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1066+ image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1067+ outputImageAndWait image
1068+ , printSummary = putStr $ [s|
1069+ 1. Verify the bottom text block is the left half of the top block. Ellipses on the right edge are OK.
1070+ 2. press enter.
1071+ 3. the display should return to the state before the test.
1072+|]
1073+ , confirmResults = genericOutputMatchConfirm
1074+ }
1075+
1076+horizCropTest2 :: Test
1077+horizCropTest2 = Test
1078+ { testName = "Verify left cropping works as expected with single column chars"
1079+ , testID = "cropTest0"
1080+ , testAction = do
1081+ let baseImage = vertCat $ map (string defAttr) lorumIpsum
1082+ croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1083+ image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1084+ outputImageAndWait image
1085+ , printSummary = putStr $ [s|
1086+ 1. Verify the bottom text block is the right half of the top text block.
1087+ 2. press enter.
1088+ 3. the display should return to the state before the test.
1089+|]
1090+ , confirmResults = genericOutputMatchConfirm
1091+ }
1092+
1093+horizCropTest3 :: Test
1094+horizCropTest3 = Test
1095+ { testName = "Verify right cropping works as expected with double column chars"
1096+ , testID = "cropTest0"
1097+ , testAction = do
1098+ let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1099+ croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1100+ image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1101+ outputImageAndWait image
1102+ , printSummary = putStr $ [s|
1103+ 1. Verify the bottom text block is the right half of the top block. Ellipses on the left edge are OK.
1104+ 2. press enter.
1105+ 3. the display should return to the state before the test.
1106+|]
1107+ , confirmResults = genericOutputMatchConfirm
1108+ }
1109+
1110+layer0 :: Test
1111+layer0 = Test
1112+ { testName = "verify layer 0"
1113+ , testID = "layer0"
1114+ , testAction = do
1115+ let upperImage = vertCat $ map (string defAttr) lorumIpsumChinese
1116+ lowerImage = vertCat $ map (string defAttr) lorumIpsum
1117+ p = picForLayers [upperImage, lowerImage]
1118+ outputPicAndWait p
1119+ , printSummary = putStr $ [s|
1120+ 1. Verify the text block appears to be Chinese text placed on top Latin text.
1121+ 2. press enter.
1122+ 3. the display should return to the state before the test.
1123+|]
1124+ , confirmResults = genericOutputMatchConfirm
1125+ }
1126+
1127+layer1 :: Test
1128+layer1 = Test
1129+ { testName = "verify layer 1"
1130+ , testID = "layer1"
1131+ , testAction = do
1132+ let upperImage = vertCat $ map (string defAttr) lorumIpsumChinese
1133+ block = resize 10 10 upperImage
1134+ layer0 = vertCat $ map (string defAttr) lorumIpsum
1135+ layer1 = charFill (defAttr `withBackColor` blue) '#' 1000 1000
1136+ cheesyAnim0 block [layer0, layer1]
1137+ , printSummary = putStr $ [s|
1138+ 1. Verify the text block appears to be Chinese text moving on top a Latin text.
1139+ Which is all on a background of '#' characters over blue.
1140+ 2. press enter.
1141+ 3. the display should return to the state before the test.
1142+|]
1143+ , confirmResults = genericOutputMatchConfirm
1144+ }
1145+
1146+cheesyAnim0 :: Image -> [Image] -> IO ()
1147+cheesyAnim0 i background = do
1148+ t <- standardIOConfig >>= outputForConfig
1149+ reserveDisplay t
1150+ bounds <- displayBounds t
1151+ d <- displayContext t bounds
1152+ forM_ [0..2] $ \t -> do
1153+ forM_ [0..100] $ \t -> do
1154+ let i_offset = translate (t `mod` fst bounds)
1155+ (t `div` 2 `mod` snd bounds)
1156+ i
1157+ let pic = picForLayers $ i_offset : background
1158+ outputPicture d pic
1159+ threadDelay 50000
1160+ forM_ [0..100] $ \t -> do
1161+ let i_offset = translate (t * (-1) `mod` fst bounds)
1162+ (t * (-1) `div` 2 `mod` snd bounds)
1163+ i
1164+ let pic = picForLayers $ i_offset : background
1165+ outputPicture d pic
1166+ threadDelay 50000
1167+ releaseDisplay t
1168+ releaseTerminal t
1169+ return ()
1170+
1171+lorumIpsum :: [String]
1172+lorumIpsum = lines [s|
10351173Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium,
10361174totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae
10371175dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
@@ -1043,13 +1181,12 @@ commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate v
10431181molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
10441182|]
10451183
1046−lorum_ipsum_chinese :: [String]
1047−lorum_ipsum_chinese = lines [s|
1184+lorumIpsumChinese :: [String]
1185+lorumIpsumChinese = lines [s|
10481186輐銛 螷蟞覮 裌覅詵 暕 鴅噮 槶 惝掭掝 婸媥媕 耏胠臿, 汫汭沎 忕汌卣 蚡袀 僣 蒮 瀁瀎瀊 渮湸湤 緌翢,
10491187腠腶舝 糲蘥蠩 樏殣氀 蒮 蹢鎒 滍 鸄齴 櫧櫋瀩 鬄鵊鵙 莃荶衒, 毸溠 橀 簎艜薤 莃荶衒 翣聜蒢
1050−
1051−斔櫅檷 晛桼桾 拻敁柧 犿玒 膣, 墐 笓粊紒 樏殣氀 鼀齕, 蔝蓶蓨 顊顃餭 姴怤 骱 暕 蹢鎒鎛 藒襓謥 鄻鎟霣
1052−鬎鯪, 鐩闤 硻禂稢 谾踘遳 撱 赲迡 箷 蛃袚觙 萇雊蜩 壿嫷 鋡 縢羱聬 跐鉠鉣 蔝蓶蓨 匢奾灱 溮煡煟 雥齆犪
1053−蔰 虈觿, 腷腯葹 鍹餳駷 蛚袲褁 蜸 皯竻 瀁瀎 蜭蜸覟 梪涫湴 揗斝湁 毼
1188+斔櫅檷 晛桼桾 拻敁柧 犿玒 膣, 墐 笓粊紒 bacon 鼀齕, 蔝蓶蓨 顊顃餭 姴怤 骱 暕 蹢鎒鎛 藒襓謥 鄻鎟霣
1189+鬎鯪, 鐩闤 硻禂稢 谾踘遳 撱 赲 迡 箷 蛃袚觙 萇雊蜩 壿嫷 鋡 縢羱聬 跐鉠鉣 蔝蓶蓨 匢奾灱 溮煡煟 雥齆犪
1190+蔰 虈觿, 腷腯葹 鍹餳駷 蛚袲褁蜸 皯竻 瀁瀎 蜭蜸覟 梪涫湴 揗斝湁 毼
10541191|]
10551192