@@ -7,8 +7,6 @@ module Main where
77
88import Verify.Graphics.Vty.Output
99
10−import Data.List (intersperse)
11−
1210import Graphics.Vty hiding (resize)
1311import Graphics.Vty.Input.Events
1412import Graphics.Vty.Input.Loop
@@ -22,6 +20,7 @@ import Control.Monad
2220
2321import Data.Default
2422import Data.IORef
23+import Data.List (intersperse, reverse, nubBy)
2524
2625import System.Console.Terminfo
2726import System.Posix.IO
@@ -140,7 +139,9 @@ instance Show (InputBlocksUsingTable event) where
140139instance Monad m => Serial m (InputBlocksUsingTable event) where
141140 series = do
142141 n :: Int <- localDepth (const maxTableSize) series
143− return $ InputBlocksUsingTable $ \table -> concat (take n (selections table))
142+ return $ InputBlocksUsingTable $ \raw_table ->
143+ let table = reverse $ nubBy (\(s0,_) (s1,_) -> s0 == s1) $ reverse raw_table
144+ in concat (take n (selections table))
144145 where
145146 selections [] = []
146147 selections (x:xs) = let z = selections xs in [x] : (z ++ map ((:) x) z)
@@ -159,7 +160,7 @@ verifyCapsSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) ->
159160 forEachOf terminalsOfInterest $ \termName -> monadic $ do
160161 term <- setupTerm termName
161162 let table = capsClassifyTable term keysFromCapsTable
162− inputSeq = gen table
163+ inputSeq = gen table
163164 events = map snd inputSeq
164165 keydowns = map (Bytes . fst) inputSeq
165166 input = intersperse (Delay testKeyDelay) keydowns ++ [Delay testKeyDelay]
@@ -168,7 +169,7 @@ verifyCapsSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) ->
168169verifySpecialSynInputToEvent :: Property IO
169170verifySpecialSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) -> monadic $ do
170171 let table = specialSupportKeys
171− inputSeq = gen table
172+ inputSeq = gen table
172173 events = map snd inputSeq
173174 keydowns = map (Bytes . fst) inputSeq
174175 input = intersperse (Delay testKeyDelay) keydowns ++ [Delay testKeyDelay]
@@ -179,7 +180,7 @@ verifyFullSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) ->
179180 forEachOf terminalsOfInterest $ \termName -> monadic $ do
180181 term <- setupTerm termName
181182 let table = classifyTableForTerm termName term
182− inputSeq = gen table
183+ inputSeq = gen table
183184 events = map snd inputSeq
184185 keydowns = map (Bytes . fst) inputSeq
185186 input = intersperse (Delay testKeyDelay) keydowns ++ [Delay testKeyDelay]
@@ -190,7 +191,7 @@ verifyFullSynInputToEvent_2x = forAll $ \(InputBlocksUsingTable gen) ->
190191 forEachOf terminalsOfInterest $ \termName -> monadic $ do
191192 term <- setupTerm termName
192193 let table = classifyTableForTerm termName term
193− inputSeq = gen table
194+ inputSeq = gen table
194195 events = concatMap ((\s -> [s,s]) . snd) inputSeq
195196 keydowns = map (Bytes . (\s -> s ++ s) . fst) inputSeq
196197 input = intersperse (Delay testKeyDelay) keydowns ++ [Delay testKeyDelay]