@@ -78,7 +78,7 @@ with the test_results.list file pasted into the issue. A suitable summary is:
78 ( \ (_ :: SomeException) -> return (envName, "") )
78 ( \ (_ :: SomeException) -> return (envName, "") )
80 [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
80 [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
81− t <- outputForCurrentTerminal def
81+ t <- standardIOConfig >>= outputForConfig
82 let resultsTxt = show envAttributes ++ "\n"
82 let resultsTxt = show envAttributes ++ "\n"
83 ++ terminalID t ++ "\n"
83 ++ terminalID t ++ "\n"
84 ++ show results ++ "\n"
84 ++ show results ++ "\n"
@@ -189,7 +189,7 @@ reserveOutputTest = Test
189 { testName = "Initialize and reserve terminal output then restore previous state."
189 { testName = "Initialize and reserve terminal output then restore previous state."
190 , testID = "reserveOutputTest"
190 , testID = "reserveOutputTest"
191 , testAction = do
191 , testAction = do
192− t <- outputForCurrentTerminal def
192+ t <- standardIOConfig >>= outputForConfig
193 reserveDisplay t
193 reserveDisplay t
194 putStrLn "Line 1"
194 putStrLn "Line 1"
195 putStrLn "Line 2"
195 putStrLn "Line 2"
@@ -222,7 +222,7 @@ displayBoundsTest0 = Test
222 { testName = "Verify display bounds are correct test 0: Using spaces."
222 { testName = "Verify display bounds are correct test 0: Using spaces."
223 , testID = "displayBoundsTest0"
223 , testID = "displayBoundsTest0"
224 , testAction = do
224 , testAction = do
225− t <- outputForCurrentTerminal def
225+ t <- standardIOConfig >>= outputForConfig
226 reserveDisplay t
226 reserveDisplay t
227 (w,h) <- displayBounds t
227 (w,h) <- displayBounds t
228 let row0 = replicate (fromEnum w) 'X' ++ "\n"
228 let row0 = replicate (fromEnum w) 'X' ++ "\n"
@@ -243,7 +243,7 @@ displayBoundsTest1 = Test
243 { testName = "Verify display bounds are correct test 0: Using cursor movement."
243 { testName = "Verify display bounds are correct test 0: Using cursor movement."
244 , testID = "displayBoundsTest1"
244 , testID = "displayBoundsTest1"
245 , testAction = do
245 , testAction = do
246− t <- outputForCurrentTerminal def
246+ t <- standardIOConfig >>= outputForConfig
247 reserveDisplay t
247 reserveDisplay t
248 (w,h) <- displayBounds t
248 (w,h) <- displayBounds t
249 setCursorPos t 0 0
249 setCursorPos t 0 0
@@ -272,7 +272,7 @@ displayBoundsTest2 = Test
272 { testName = "Verify display bounds are correct test 0: Using Image ops."
272 { testName = "Verify display bounds are correct test 0: Using Image ops."
273 , testID = "displayBoundsTest2"
273 , testID = "displayBoundsTest2"
274 , testAction = do
274 , testAction = do
275− t <- outputForCurrentTerminal def
275+ t <- standardIOConfig >>= outputForConfig
276 reserveDisplay t
276 reserveDisplay t
277 bounds@(w,h) <- displayBounds t
277 bounds@(w,h) <- displayBounds t
278 let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
278 let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
@@ -295,7 +295,7 @@ displayBoundsTest3 = Test
295 { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
295 { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
296 , testID = "displayBoundsTest3"
296 , testID = "displayBoundsTest3"
297 , testAction = do
297 , testAction = do
298− t <- outputForCurrentTerminal def
298+ t <- standardIOConfig >>= outputForConfig
299 reserveDisplay t
299 reserveDisplay t
300 (w,h) <- displayBounds t
300 (w,h) <- displayBounds t
301 hideCursor t
301 hideCursor t
@@ -407,7 +407,7 @@ unicodeSingleWidth0 = Test
407 { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
407 { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
408 , testID = "unicodeSingleWidth0"
408 , testID = "unicodeSingleWidth0"
409 , testAction = do
409 , testAction = do
410− t <- outputForCurrentTerminal def
410+ t <- standardIOConfig >>= outputForConfig
411 reserveDisplay t
411 reserveDisplay t
412 hideCursor t
412 hideCursor t
413 withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
413 withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
@@ -426,7 +426,7 @@ unicodeSingleWidth1 = Test
426 { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
426 { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
427 , testID = "unicodeSingleWidth1"
427 , testID = "unicodeSingleWidth1"
428 , testAction = do
428 , testAction = do
429− t <- outputForCurrentTerminal def
429+ t <- standardIOConfig >>= outputForConfig
430 reserveDisplay t
430 reserveDisplay t
431 let pic = picForImage image
431 let pic = picForImage image
432 image = line0 <-> line1
432 image = line0 <-> line1
@@ -489,7 +489,7 @@ unicodeDoubleWidth0 = Test
489 { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
489 { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
490 , testID = "unicodeDoubleWidth0"
490 , testID = "unicodeDoubleWidth0"
491 , testAction = do
491 , testAction = do
492− t <- outputForCurrentTerminal def
492+ t <- standardIOConfig >>= outputForConfig
493 reserveDisplay t
493 reserveDisplay t
494 hideCursor t
494 hideCursor t
495 withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
495 withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
@@ -508,7 +508,7 @@ unicodeDoubleWidth1 = Test
508 { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
508 { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
509 , testID = "unicodeDoubleWidth1"
509 , testID = "unicodeDoubleWidth1"
510 , testAction = do
510 , testAction = do
511− t <- outputForCurrentTerminal def
511+ t <- standardIOConfig >>= outputForConfig
512 reserveDisplay t
512 reserveDisplay t
513 let pic = picForImage image
513 let pic = picForImage image
514 image = line0 <-> line1
514 image = line0 <-> line1
@@ -562,7 +562,7 @@ attributesTest0 = Test
562 { testName = "Character attributes: foreground colors."
562 { testName = "Character attributes: foreground colors."
563 , testID = "attributesTest0"
563 , testID = "attributesTest0"
564 , testAction = do
564 , testAction = do
565− t <- outputForCurrentTerminal def
565+ t <- standardIOConfig >>= outputForConfig
566 reserveDisplay t
566 reserveDisplay t
567 let pic = picForImage image
567 let pic = picForImage image
568 image = border <|> column0 <|> border <|> column1 <|> border
568 image = border <|> column0 <|> border <|> column1 <|> border
@@ -608,7 +608,7 @@ attributesTest1 = Test
608 { testName = "Character attributes: background colors."
608 { testName = "Character attributes: background colors."
609 , testID = "attributesTest1"
609 , testID = "attributesTest1"
610 , testAction = do
610 , testAction = do
611− t <- outputForCurrentTerminal def
611+ t <- standardIOConfig >>= outputForConfig
612 reserveDisplay t
612 reserveDisplay t
613 let pic = picForImage image
613 let pic = picForImage image
614 image = border <|> column0 <|> border <|> column1 <|> border
614 image = border <|> column0 <|> border <|> column1 <|> border
@@ -663,7 +663,7 @@ attributesTest2 = Test
663 { testName = "Character attributes: Vivid foreground colors."
663 { testName = "Character attributes: Vivid foreground colors."
664 , testID = "attributesTest2"
664 , testID = "attributesTest2"
665 , testAction = do
665 , testAction = do
666− t <- outputForCurrentTerminal def
666+ t <- standardIOConfig >>= outputForConfig
667 reserveDisplay t
667 reserveDisplay t
668 let pic = picForImage image
668 let pic = picForImage image
669 image = horizCat [border, column0, border, column1, border, column2, border]
669 image = horizCat [border, column0, border, column1, border, column2, border]
@@ -722,7 +722,7 @@ attributesTest3 = Test
722 { testName = "Character attributes: Vivid background colors."
722 { testName = "Character attributes: Vivid background colors."
723 , testID = "attributesTest3"
723 , testID = "attributesTest3"
724 , testAction = do
724 , testAction = do
725− t <- outputForCurrentTerminal def
725+ t <- standardIOConfig >>= outputForConfig
726 reserveDisplay t
726 reserveDisplay t
727 let pic = picForImage image
727 let pic = picForImage image
728 image = horizCat [border, column0, border, column1, border, column2, border]
728 image = horizCat [border, column0, border, column1, border, column2, border]
@@ -800,7 +800,7 @@ attributesTest4 = Test
800 { testName = "Character attributes: Bold; Blink; Underline."
800 { testName = "Character attributes: Bold; Blink; Underline."
801 , testID = "attributesTest4"
801 , testID = "attributesTest4"
802 , testAction = do
802 , testAction = do
803− t <- outputForCurrentTerminal def
803+ t <- standardIOConfig >>= outputForConfig
804 reserveDisplay t
804 reserveDisplay t
805 let pic = picForImage image
805 let pic = picForImage image
806 image = horizCat [border, column0, border, column1, border]
806 image = horizCat [border, column0, border, column1, border]
@@ -852,7 +852,7 @@ attributesTest5 = Test
852 { testName = "Character attributes: 240 color palette"
852 { testName = "Character attributes: 240 color palette"
853 , testID = "attributesTest5"
853 , testID = "attributesTest5"
854 , testAction = do
854 , testAction = do
855− t <- outputForCurrentTerminal def
855+ t <- standardIOConfig >>= outputForConfig
856 reserveDisplay t
856 reserveDisplay t
857 let pic = picForImage image
857 let pic = picForImage image
858 image = vertCat $ map horizCat $ splitColorImages colorImages
858 image = vertCat $ map horizCat $ splitColorImages colorImages
@@ -963,7 +963,7 @@ outputImageAndWait image = do
964outputPicAndWait :: Picture -> IO ()
964outputPicAndWait :: Picture -> IO ()
965outputPicAndWait pic = do
965outputPicAndWait pic = do
966− t <- outputForCurrentTerminal def
966+ t <- standardIOConfig >>= outputForConfig
967 reserveDisplay t
967 reserveDisplay t
968 d <- displayBounds t >>= displayContext t
968 d <- displayBounds t >>= displayContext t
969 outputPicture d pic
969 outputPicture d pic
@@ -1146,7 +1146,7 @@ layer1 = Test
1147cheesyAnim0 :: Image -> [Image] -> IO ()
1147cheesyAnim0 :: Image -> [Image] -> IO ()
1148cheesyAnim0 i background = do
1148cheesyAnim0 i background = do
1149− t <- outputForCurrentTerminal def
1149+ t <- standardIOConfig >>= outputForConfig
1150 reserveDisplay t
1150 reserveDisplay t
1151 bounds <- displayBounds t
1151 bounds <- displayBounds t
1152 d <- displayContext t bounds
1152 d <- displayContext t bounds