git.iko.soy/vty
on master help sign in
Spurious whitespace cleanup in LLInput.hs
eb390a8Mikolaj
src/Graphics/Vty/LLInput.hs+34−34
compare with master
unifiedsplit
@@ -5,12 +5,12 @@ module Graphics.Vty.LLInput ( Key(..)
5 , Modifier(..)
5 , Modifier(..)
6 , Button(..)
6 , Button(..)
7 , Event(..)
7 , Event(..)
8− , initTermInput
8+ , initTermInput
9− )
9+ )
10 where
10 where
11
11
12import Data.Char
12import Data.Char
13−import Data.Maybe ( mapMaybe
13+import Data.Maybe ( mapMaybe
14 )
14 )
15import Data.List( inits )
15import Data.List( inits )
16import Data.Word
16import Data.Word
@@ -36,22 +36,22 @@ import System.Posix.IO ( stdInput
36-- |Representations of non-modifier keys.
36-- |Representations of non-modifier keys.
37data Key = KEsc | KFun Int | KBackTab | KPrtScr | KPause | KASCII Char | KBS | KIns
37data Key = KEsc | KFun Int | KBackTab | KPrtScr | KPause | KASCII Char | KBS | KIns
38 | KHome | KPageUp | KDel | KEnd | KPageDown | KBegin | KNP5 | KUp | KMenu
38 | KHome | KPageUp | KDel | KEnd | KPageDown | KBegin | KNP5 | KUp | KMenu
39− | KLeft | KDown | KRight | KEnter
39+ | KLeft | KDown | KRight | KEnter
40 deriving (Eq,Show,Ord)
40 deriving (Eq,Show,Ord)
41
41
42-- |Modifier keys. Key codes are interpreted such that users are more likely to
42-- |Modifier keys. Key codes are interpreted such that users are more likely to
43-- have Meta than Alt; for instance on the PC Linux console, 'MMeta' will
43-- have Meta than Alt; for instance on the PC Linux console, 'MMeta' will
44-- generally correspond to the physical Alt key.
44-- generally correspond to the physical Alt key.
45−data Modifier = MShift | MCtrl | MMeta | MAlt
45+data Modifier = MShift | MCtrl | MMeta | MAlt
46 deriving (Eq,Show,Ord)
46 deriving (Eq,Show,Ord)
47
47
48-- |Mouse buttons. Not yet used.
48-- |Mouse buttons. Not yet used.
49−data Button = BLeft | BMiddle | BRight
49+data Button = BLeft | BMiddle | BRight
50 deriving (Eq,Show,Ord)
50 deriving (Eq,Show,Ord)
51
51
52-- |Generic events.
52-- |Generic events.
53data Event = EvKey Key [Modifier] | EvMouse Int Int Button [Modifier]
53data Event = EvKey Key [Modifier] | EvMouse Int Int Button [Modifier]
54− | EvResize Int Int
54+ | EvResize Int Int
55 deriving (Eq,Show,Ord)
55 deriving (Eq,Show,Ord)
56
56
57data KClass = Valid Key [Modifier] | Invalid | Prefix | MisPfx Key [Modifier] [Char]
57data KClass = Valid Key [Modifier] | Invalid | Prefix | MisPfx Key [Modifier] [Char]
@@ -70,7 +70,7 @@ initTermInput escDelay terminal = do
70 setTerminalAttributes stdInput nattr Immediately
70 setTerminalAttributes stdInput nattr Immediately
71 set_term_timing
71 set_term_timing
72 let inputToEventThread :: IO ()
72 let inputToEventThread :: IO ()
73− inputToEventThread = loop []
73+ inputToEventThread = loop []
74 where loop kb = case (classify kb) of
74 where loop kb = case (classify kb) of
75 Prefix -> do c <- readChan inputChannel
75 Prefix -> do c <- readChan inputChannel
76 loop (kb ++ [c])
76 loop (kb ++ [c])
@@ -82,7 +82,7 @@ initTermInput escDelay terminal = do
82
82
83 inputThread :: IO ()
83 inputThread :: IO ()
84 inputThread = loop
84 inputThread = loop
85− where
85+ where
86 loop = do
86 loop = do
87 setFdOption stdInput NonBlockingRead False
87 setFdOption stdInput NonBlockingRead False
88 threadWaitRead stdInput
88 threadWaitRead stdInput
@@ -97,7 +97,7 @@ initTermInput escDelay terminal = do
97 writeChan inputChannel (head bytes)
97 writeChan inputChannel (head bytes)
98 readAll
98 readAll
99 -- | If there is no input for some time, this thread puts '\xFFFE' in the
99 -- | If there is no input for some time, this thread puts '\xFFFE' in the
100− -- inputChannel.
100+ -- inputChannel.
101 noInputThread :: IO ()
101 noInputThread :: IO ()
102 noInputThread = when (escDelay > 0) loop
102 noInputThread = when (escDelay > 0) loop
103 where loop = do
103 where loop = do
@@ -107,7 +107,7 @@ initTermInput escDelay terminal = do
107 when hadNoInput $ do
107 when hadNoInput $ do
108 finishAtomicInput
108 finishAtomicInput
109 loop
109 loop
110−
110+
111
111
112 compile :: [[([Char],(Key,[Modifier]))]] -> [Char] -> KClass
112 compile :: [[([Char],(Key,[Modifier]))]] -> [Char] -> KClass
113 compile lst = cl' where
113 compile lst = cl' where
@@ -120,25 +120,25 @@ initTermInput escDelay terminal = do
120 Just (k,m) -> Valid k m
120 Just (k,m) -> Valid k m
121 Nothing -> case head $ mapMaybe (\s -> (,) s `fmap` M.lookup s mlst) $ init $ inits str of
121 Nothing -> case head $ mapMaybe (\s -> (,) s `fmap` M.lookup s mlst) $ init $ inits str of
122 (s,(k,m)) -> MisPfx k m (drop (length s) str)
122 (s,(k,m)) -> MisPfx k m (drop (length s) str)
123−
123+
124 -- ANSI specific bits
124 -- ANSI specific bits
125
125
126
126
127 classify, classifyTab :: [Char] -> KClass
127 classify, classifyTab :: [Char] -> KClass
128−
128+
129 -- As soon as
129 -- As soon as
130 classify "\xFFFE" = Invalid
130 classify "\xFFFE" = Invalid
131− classify s@(c:_) | ord c >= 0xC2 =
131+ classify s@(c:_) | ord c >= 0xC2 =
132 if utf8Length (ord c) > length s then Prefix else classifyUtf8 s -- beginning of an utf8 sequence
132 if utf8Length (ord c) > length s then Prefix else classifyUtf8 s -- beginning of an utf8 sequence
133 classify other = classifyTab other
133 classify other = classifyTab other
134
134
135 classifyUtf8 s = case decode ((map (fromIntegral . ord) s) :: [Word8]) of
135 classifyUtf8 s = case decode ((map (fromIntegral . ord) s) :: [Word8]) of
136 Just (unicodeChar, _) -> Valid (KASCII unicodeChar) []
136 Just (unicodeChar, _) -> Valid (KASCII unicodeChar) []
137 _ -> Invalid -- something bad happened; just ignore and continue.
137 _ -> Invalid -- something bad happened; just ignore and continue.
138−
138+
139 classifyTab = compile (caps_classify_table : ansi_classify_table)
139 classifyTab = compile (caps_classify_table : ansi_classify_table)
140−
140+
141− caps_tabls = [("khome", (KHome, [])),
141+ caps_tabls = [("khome", (KHome, [])),
142 ("kend", (KEnd, [])),
142 ("kend", (KEnd, [])),
143 ("cbt", (KBackTab, [])),
143 ("cbt", (KBackTab, [])),
144 ("kcud1", (KDown, [])),
144 ("kcud1", (KDown, [])),
@@ -149,9 +149,9 @@ initTermInput escDelay terminal = do
149 ("kLFT", (KLeft, [MShift])),
149 ("kLFT", (KLeft, [MShift])),
150 ("kRIT", (KRight, [MShift]))
150 ("kRIT", (KRight, [MShift]))
151 ]
151 ]
152−
152+
153 caps_classify_table = [(x,y) | (Just x,y) <- map (first (getCapability terminal . tiGetStr)) $ caps_tabls]
153 caps_classify_table = [(x,y) | (Just x,y) <- map (first (getCapability terminal . tiGetStr)) $ caps_tabls]
154−
154+
155 ansi_classify_table :: [[([Char], (Key, [Modifier]))]]
155 ansi_classify_table :: [[([Char], (Key, [Modifier]))]]
156 ansi_classify_table =
156 ansi_classify_table =
157 [ let k c s = ("\ESC["++c,(s,[])) in [ k "G" KNP5
157 [ let k c s = ("\ESC["++c,(s,[])) in [ k "G" KNP5
@@ -159,22 +159,23 @@ initTermInput escDelay terminal = do
159 , k "A" KUp
159 , k "A" KUp
160 , k "B" KDown
160 , k "B" KDown
161 , k "C" KRight
161 , k "C" KRight
162− , k "D" KLeft
162+ , k "D" KLeft
163 , k "H" KHome
163 , k "H" KHome
164 , k "F" KEnd
164 , k "F" KEnd
165 , k "E" KBegin
165 , k "E" KBegin
166 ],
166 ],
167
167
168 -- Support for arrows
168 -- Support for arrows
169− [("\ESC[" ++ charCnt ++ show mc++c,(s,m))
169+ [("\ESC[" ++ charCnt ++ show mc++c,(s,m))
170 | charCnt <- ["1;", ""], -- we can have a count or not
170 | charCnt <- ["1;", ""], -- we can have a count or not
171− (m,mc) <- [([MShift],2::Int), ([MCtrl],5), ([MMeta],3),
171+ (m,mc) <- [([MShift],2::Int), ([MCtrl],5), ([MMeta],3),
172 ([MShift, MCtrl],6), ([MShift, MMeta],4)], -- modifiers and their codes
172 ([MShift, MCtrl],6), ([MShift, MMeta],4)], -- modifiers and their codes
173 (c,s) <- [("A", KUp), ("B", KDown), ("C", KRight), ("D", KLeft)] -- directions and their codes
173 (c,s) <- [("A", KUp), ("B", KDown), ("C", KRight), ("D", KLeft)] -- directions and their codes
174 ],
174 ],
175−
175+
176+ let k n s = ("\ESC["++show n++"~",(s,[]))
176− let k n s = ("\ESC["++show n++"~",(s,[])) in zipWith k [2::Int,3,5,6,1,4]
177+ in zipWith k [2::Int,3,5,6,1,4]
177− [KIns,KDel,KPageUp,KPageDown,KHome,KEnd],
178+ [KIns,KDel,KPageUp,KPageDown,KHome,KEnd],
178
179
179 -- Support for simple characters.
180 -- Support for simple characters.
180 [ (x:[],(KASCII x,[])) | x <- map toEnum [0..255] ],
181 [ (x:[],(KASCII x,[])) | x <- map toEnum [0..255] ],
@@ -186,25 +187,25 @@ initTermInput escDelay terminal = do
186 [ ('\ESC':[x],(KASCII x,[MMeta])) | x <- '\ESC':'\t':[' ' .. '\DEL'] ],
187 [ ('\ESC':[x],(KASCII x,[MMeta])) | x <- '\ESC':'\t':[' ' .. '\DEL'] ],
187
188
188 -- Ctrl+Char
189 -- Ctrl+Char
189− [ ([toEnum x],(KASCII y,[MCtrl]))
190+ [ ([toEnum x],(KASCII y,[MCtrl]))
190 | (x,y) <- zip ([0..31]) ('@':['a'..'z']++['['..'_']),
191 | (x,y) <- zip ([0..31]) ('@':['a'..'z']++['['..'_']),
191 y /= 'i' -- Resolve issue #3 where CTRL-i hides TAB.
192 y /= 'i' -- Resolve issue #3 where CTRL-i hides TAB.
192 ],
193 ],
193−
194+
194 -- Ctrl+Meta+Char
195 -- Ctrl+Meta+Char
195 [ ('\ESC':[toEnum x],(KASCII y,[MMeta,MCtrl])) | (x,y) <- zip [0..31] ('@':['a'..'z']++['['..'_']) ],
196 [ ('\ESC':[toEnum x],(KASCII y,[MMeta,MCtrl])) | (x,y) <- zip [0..31] ('@':['a'..'z']++['['..'_']) ],
196
197
197 -- Special support
198 -- Special support
198− [ -- special support for ESC
199+ [ -- special support for ESC
199− ("\ESC",(KEsc,[])) , ("\ESC\ESC",(KEsc,[MMeta])),
200+ ("\ESC",(KEsc,[])) , ("\ESC\ESC",(KEsc,[MMeta])),
200
201
201 -- Special support for backspace
202 -- Special support for backspace
202 ("\DEL",(KBS,[])), ("\ESC\DEL",(KBS,[MMeta])),
203 ("\DEL",(KBS,[])), ("\ESC\DEL",(KBS,[MMeta])),
203−
204+
204 -- Special support for Enter
205 -- Special support for Enter
205− ("\ESC\^J",(KEnter,[MMeta])), ("\^J",(KEnter,[])) ]
206+ ("\ESC\^J",(KEnter,[MMeta])), ("\^J",(KEnter,[])) ]
206 ]
207 ]
207−
208+
208 eventThreadId <- forkIO $ inputToEventThread
209 eventThreadId <- forkIO $ inputToEventThread
209 inputThreadId <- forkIO $ inputThread
210 inputThreadId <- forkIO $ inputThread
210 noInputThreadId <- forkIO $ noInputThread
211 noInputThreadId <- forkIO $ noInputThread
@@ -225,11 +226,10 @@ first :: (a -> b) -> (a,c) -> (b,c)
225first f (x,y) = (f x, y)
226first f (x,y) = (f x, y)
226
227
227utf8Length :: (Num t, Ord a, Num a) => a -> t
228utf8Length :: (Num t, Ord a, Num a) => a -> t
228−utf8Length c
229+utf8Length c
229 | c < 0x80 = 1
230 | c < 0x80 = 1
230 | c < 0xE0 = 2
231 | c < 0xE0 = 2
231 | c < 0xF0 = 3
232 | c < 0xF0 = 3
232 | otherwise = 4
233 | otherwise = 4
233
234
234foreign import ccall "set_term_timing" set_term_timing :: IO ()
235foreign import ccall "set_term_timing" set_term_timing :: IO ()
235−