ilyakooo0/vty
1
0
Fork 0
mirror of https://github.com/ilyakooo0/vty.git synced 2024-11-29 08:49:40 +03:00
Code Issues Projects Releases Wiki Activity

Avoid discarding input bytes after multi-byte encoded codepoint

Browse Source 
Previous when pasting text into the console the pasted text
following a unicode codepoint that encoded to multiple bytes
would be lost.
This commit is contained in:
Eric Mertens 2015-07-31 11:30:11 -07:00
parent 0a9f5df75a
commit 78c1940570
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Graphics/Vty/Input/Classify.hs
View File

@ -60,14 +60,21 @@ classify :: ClassifyMap -> [Char] -> KClass
classify table =
let standardClassifier = compile table
in \s -> case s of
(c:_) | ord c >= 0xC2 && utf8Length (ord c) > length s -> Prefix -- beginning of an utf8 sequence
(c:_) | ord c >= 0xC2 -> classifyUtf8 s -- As soon as
_ -> standardClassifier s
c:cs | ord c >= 0xC2 -> classifyUtf8 c cs
_ -> standardClassifier s
classifyUtf8 :: [Char] -> KClass
classifyUtf8 s = case decode ((map (fromIntegral . ord) s) :: [Word8]) of
Just (unicodeChar, _) -> Valid (EvKey (KChar unicodeChar) []) []
_ -> Invalid -- something bad happened; just ignore and continue.
classifyUtf8 :: Char -> [Char] -> KClass
classifyUtf8 c cs =
let n = utf8Length (ord c)
(codepoint,rest) = splitAt n (c:cs)
codepoint8 :: [Word8]
codepoint8 = map (fromIntegral . ord) codepoint
in case decode codepoint8 of
_ | n < length codepoint -> Prefix
Just (unicodeChar, _) -> Valid (EvKey (KChar unicodeChar) []) rest
Nothing -> Invalid -- something bad happened; just ignore and continue.
utf8Length :: (Num t, Ord a, Num a) => a -> t
utf8Length c