git.iko.soy/vty
on master help sign in
cleanup
12cd6e5Corey O'Connor
src/Graphics/Vty/Input/Data.hs+2−10
compare with master
unifiedsplit
@@ -13,23 +13,15 @@ data Key = KEsc | KFun Int | KBackTab | KPrtScr | KPause | KASCII Char | KBS | K
13data Modifier = MShift | MCtrl | MMeta | MAlt
13data Modifier = MShift | MCtrl | MMeta | MAlt
14 deriving (Eq,Show,Ord)
14 deriving (Eq,Show,Ord)
15
15
16−-- |Mouse buttons. Not yet used.
16+-- | Mouse buttons. Not yet used.
17data Button = BLeft | BMiddle | BRight
17data Button = BLeft | BMiddle | BRight
18 deriving (Eq,Show,Ord)
18 deriving (Eq,Show,Ord)
19
19
20−-- |Generic events.
20+-- | Generic events.
21data Event = EvKey Key [Modifier] | EvMouse Int Int Button [Modifier]
21data Event = EvKey Key [Modifier] | EvMouse Int Int Button [Modifier]
22 | EvResize Int Int
22 | EvResize Int Int
23 deriving (Eq,Show,Ord)
23 deriving (Eq,Show,Ord)
24
24
25−data KClass
26− = Valid Key [Modifier]
27− | Invalid
28− | EndLoop
29− | Prefix
30− | MisPfx Key [Modifier] [Char]
31− deriving(Show)
32−
33type ClassifyTable = [(String, (Key, [Modifier]))]
25type ClassifyTable = [(String, (Key, [Modifier]))]
34
26
35map_to_legacy_table :: [(String, Event)] -> ClassifyTable
27map_to_legacy_table :: [(String, Event)] -> ClassifyTable
src/Graphics/Vty/Input/Internal.hs+8
@@ -12,6 +12,14 @@ import Data.Maybe ( mapMaybe )
12import qualified Data.Set as S( fromList, member )
12import qualified Data.Set as S( fromList, member )
13import Data.Word
13import Data.Word
14
14
15+data KClass
16+ = Valid Key [Modifier]
17+ | Invalid
18+ | EndLoop
19+ | Prefix
20+ | MisPfx Key [Modifier] [Char]
21+ deriving(Show)
22+
15inputToEventThread :: (String -> KClass) -> Chan Char -> Chan Event -> IO ()
23inputToEventThread :: (String -> KClass) -> Chan Char -> Chan Event -> IO ()
16inputToEventThread classifier inputChannel eventChannel = loop []
24inputToEventThread classifier inputChannel eventChannel = loop []
17 where loop kb = case (classifier kb) of
25 where loop kb = case (classifier kb) of