Skip to content

Update capi PR #15 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmatsushita wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update capi PR #15 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e07992
Enable CApiFFI extension
jmatsushita Jul 3, 2022
e231292
Fix terminal-ev prettyprinter deprecation
jmatsushita Jul 3, 2022
229c8f8
posix: Use capi for ioctl foreign import
bgamari Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions example/terminal-ev/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Control.Monad.IO.Class
import Data.Char
import Data.Function (fix)

import Data.Text.Prettyprint.Doc
import Prettyprinter
import System.Terminal

main :: IO ()
Expand All @@ -27,7 +27,7 @@ main = withTerminal $ runTerminalT $ do
KeyEvent {} -> putDocLn $ annotate (foreground $ bright blue) (pretty $ show ev)
WindowEvent {} -> do
sz <- getWindowSize
putDocLn $ annotate (foreground $ bright magenta) (pretty $ show ev <> ": " <> show sz)
putDocLn $ annotate (foreground $ bright magenta) (pretty $ show ev <> ": " <> show sz)
_ -> putDocLn $ pretty $ show ev
flush
loop
15 changes: 8 additions & 7 deletions platform/posix/src/System/Terminal/Platform.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CApiFFI #-}
module System.Terminal.Platform
( withTerminal
, LocalTerminal ()
Expand Down Expand Up @@ -64,7 +65,7 @@ withTerminal action = do
withTermiosSettings $ \termios->
withInterruptHandler (handleInterrupt mainThread interrupt) $
withResizeHandler (handleResize windowChanged) $
withInputProcessing termios cursorPosition events $
withInputProcessing termios cursorPosition events $
action LocalTerminal
{ localType = term
, localEvent = do
Expand Down Expand Up @@ -159,7 +160,7 @@ withInputProcessing termios cursorPosition events =
-- There are sequences depending on timing (escape either is literal
-- escape or the beginning of a sequence).
-- This block evaluates whether more input is available within
-- a limited timespan. If this is the case it just recurses
-- a limited timespan. If this is the case it just recurses
-- with the decoder continuation.
-- Otherwise, a NUL character is fed in order to tell the decoder
-- that there is no more input belonging to the sequence.
Expand Down Expand Up @@ -212,7 +213,7 @@ getWindowSize =
_ -> undefined

getTermios :: IO Termios
getTermios =
getTermios =
alloca $ \ptr->
unsafeGetTermios 0 ptr >>= \case
0 -> peek ptr
Expand All @@ -222,7 +223,7 @@ setTermios :: Termios -> IO ()
setTermios t =
alloca $ \ptr->
unsafeGetTermios 0 ptr >>= \case
0 -> do
0 -> do
poke ptr t
unsafeSetTermios 0 (#const TCSANOW) ptr >>= \case
0 -> pure ()
Expand Down Expand Up @@ -277,7 +278,7 @@ instance Storable Termios where
peekVINTR = (#peek struct termios, c_cc[VINTR]) ptr :: IO CUChar
peekVKILL = (#peek struct termios, c_cc[VKILL]) ptr :: IO CUChar
peekVQUIT = (#peek struct termios, c_cc[VQUIT]) ptr :: IO CUChar
peekLFlag = (#peek struct termios, c_lflag) ptr :: IO CUInt
peekLFlag = (#peek struct termios, c_lflag) ptr :: IO CUInt
poke ptr termios = do
pokeVEOF $ fromIntegral $ fromEnum $ termiosVEOF termios
pokeVERASE $ fromIntegral $ fromEnum $ termiosVERASE termios
Expand All @@ -302,8 +303,8 @@ foreign import ccall unsafe "tcgetattr"
foreign import ccall unsafe "tcsetattr"
unsafeSetTermios :: CInt -> CInt -> Ptr Termios -> IO CInt

foreign import ccall unsafe "ioctl"
unsafeIOCtl :: CInt -> CInt -> Ptr a -> IO CInt
foreign import capi unsafe "ioctl"
unsafeIOCtl :: CInt -> CULong -> Ptr a -> IO CInt

foreign import ccall unsafe
stg_sig_install :: CInt -> CInt -> Ptr a -> IO CInt