on master help sign in
put_default_attr replaced by the original default_all AttrChange action
9bf5dcfcoreyoconnor
src/Graphics/Vty/Inline.hs+3−8
@@ -34,14 +34,8 @@ remove_style s_mask = modify $ \attr ->
34 SetTo s -> s .&. complement s_mask
34 SetTo s -> s .&. complement s_mask
35 in attr { attr_style = SetTo style' }
35 in attr { attr_style = SetTo style' }
36
36
37−put_default_attr :: ( Applicative m, MonadIO m ) => TerminalHandle -> m ()
37+default_all :: AttrChange ()
38−put_default_attr t = do
38+default_all = put def_attr
39− bounds <- display_bounds t
40− d <- display_context t bounds
41− marshall_to_terminal t ( default_attr_required_bytes d )
42− ( serialize_default_attr d )
43− liftIO $ modifyIORef ( state_ref t ) $ \s -> s { known_fattr = Just $ FixedAttr default_style_mask Nothing Nothing }
44− inline_hack d
45
39
46put_attr_change :: ( Applicative m, MonadIO m ) => TerminalHandle -> AttrChange () -> m ()
40put_attr_change :: ( Applicative m, MonadIO m ) => TerminalHandle -> AttrChange () -> m ()
47put_attr_change t c = do
41put_attr_change t c = do
@@ -60,4 +54,5 @@ put_attr_change t c = do
60 marshall_to_terminal t ( attr_required_bytes d fattr attr' diffs )
54 marshall_to_terminal t ( attr_required_bytes d fattr attr' diffs )
61 ( serialize_set_attr d fattr attr' diffs )
55 ( serialize_set_attr d fattr attr' diffs )
62 liftIO $ modifyIORef ( state_ref t ) $ \s -> s { known_fattr = Just fattr' }
56 liftIO $ modifyIORef ( state_ref t ) $ \s -> s { known_fattr = Just fattr' }
57+ inline_hack d
63
58
test/interactive_terminal_test.hs+2−2
@@ -856,7 +856,7 @@ inline_test_0 = Test
856 putStrLn "line 1."
856 putStrLn "line 1."
857 put_attr_change t $ back_color red >> apply_style underline
857 put_attr_change t $ back_color red >> apply_style underline
858 putStrLn "line 2."
858 putStrLn "line 2."
859− put_default_attr t
859+ put_attr_change t $ default_all
860 putStrLn "line 3."
860 putStrLn "line 3."
861 release_terminal t
861 release_terminal t
862 return ()
862 return ()
@@ -877,7 +877,7 @@ inline_test_1 = Test
877 putStr "Not styled. "
877 putStr "Not styled. "
878 put_attr_change t $ back_color red >> apply_style underline
878 put_attr_change t $ back_color red >> apply_style underline
879 putStr " Styled! "
879 putStr " Styled! "
880− put_default_attr t
880+ put_attr_change t $ default_all
881 putStrLn "Not styled."
881 putStrLn "Not styled."
882 release_terminal t
882 release_terminal t
883 return ()
883 return ()