Merge pull request #5077 from johnnovak/termios-posix-fix
Use imported symbols & remove non-POSIX stuff
This commit is contained in:
Andreas Rumpf
GitHub
commit
7c83daee42
1 changed files with 111 additions and 160 deletions
|
|
@ -16,7 +16,7 @@ type
|
||||||
{.deprecated: [Tcflag: Cflag].}
|
{.deprecated: [Tcflag: Cflag].}
|
||||||
|
|
||||||
const
|
const
|
||||||
NCCS* = 32
|
NCCS* = when defined(macosx): 20 else: 32
|
||||||
|
|
||||||
type
|
type
|
||||||
Termios* {.importc: "struct termios", header: "<termios.h>".} = object
|
Termios* {.importc: "struct termios", header: "<termios.h>".} = object
|
||||||
|
|
@ -28,174 +28,136 @@ type
|
||||||
|
|
||||||
# cc characters
|
# cc characters
|
||||||
|
|
||||||
const
|
var
|
||||||
VINTR* = 0
|
VINTR* {.importc, header: "<termios.h>".}: cint
|
||||||
VQUIT* = 1
|
VQUIT* {.importc, header: "<termios.h>".}: cint
|
||||||
VERASE* = 2
|
VERASE* {.importc, header: "<termios.h>".}: cint
|
||||||
VKILL* = 3
|
VKILL* {.importc, header: "<termios.h>".}: cint
|
||||||
VEOF* = 4
|
VEOF* {.importc, header: "<termios.h>".}: cint
|
||||||
VTIME* = 5
|
VTIME* {.importc, header: "<termios.h>".}: cint
|
||||||
VMIN* = 6
|
VMIN* {.importc, header: "<termios.h>".}: cint
|
||||||
VSWTC* = 7
|
VSTART* {.importc, header: "<termios.h>".}: cint
|
||||||
VSTART* = 8
|
VSTOP* {.importc, header: "<termios.h>".}: cint
|
||||||
VSTOP* = 9
|
VSUSP* {.importc, header: "<termios.h>".}: cint
|
||||||
VSUSP* = 10
|
VEOL* {.importc, header: "<termios.h>".}: cint
|
||||||
VEOL* = 11
|
|
||||||
VREPRINT* = 12
|
|
||||||
VDISCARD* = 13
|
|
||||||
VWERASE* = 14
|
|
||||||
VLNEXT* = 15
|
|
||||||
VEOL2* = 16
|
|
||||||
|
|
||||||
# iflag bits
|
# iflag bits
|
||||||
|
|
||||||
const
|
var
|
||||||
IGNBRK* = 1
|
IGNBRK* {.importc, header: "<termios.h>".}: Cflag
|
||||||
BRKINT* = 2
|
BRKINT* {.importc, header: "<termios.h>".}: Cflag
|
||||||
IGNPAR* = 4
|
IGNPAR* {.importc, header: "<termios.h>".}: Cflag
|
||||||
PARMRK* = 10
|
PARMRK* {.importc, header: "<termios.h>".}: Cflag
|
||||||
INPCK* = 20
|
INPCK* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ISTRIP* = 40
|
ISTRIP* {.importc, header: "<termios.h>".}: Cflag
|
||||||
INLCR* = 100
|
INLCR* {.importc, header: "<termios.h>".}: Cflag
|
||||||
IGNCR* = 200
|
IGNCR* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ICRNL* = 400
|
ICRNL* {.importc, header: "<termios.h>".}: Cflag
|
||||||
IUCLC* = 1000
|
IUCLC* {.importc, header: "<termios.h>".}: Cflag
|
||||||
IXON* = 2000
|
IXON* {.importc, header: "<termios.h>".}: Cflag
|
||||||
IXANY* = 4000
|
IXANY* {.importc, header: "<termios.h>".}: Cflag
|
||||||
IXOFF* = 10000
|
IXOFF* {.importc, header: "<termios.h>".}: Cflag
|
||||||
IMAXBEL* = 20000
|
|
||||||
IUTF8* = 40000
|
|
||||||
|
|
||||||
# oflag bits
|
# oflag bits
|
||||||
|
|
||||||
const
|
var
|
||||||
OPOST* = 1
|
OPOST* {.importc, header: "<termios.h>".}: Cflag
|
||||||
OLCUC* = 2
|
ONLCR* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ONLCR* = 4
|
OCRNL* {.importc, header: "<termios.h>".}: Cflag
|
||||||
OCRNL* = 10
|
ONOCR* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ONOCR* = 20
|
ONLRET* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ONLRET* = 40
|
OFILL* {.importc, header: "<termios.h>".}: Cflag
|
||||||
OFILL* = 100
|
OFDEL* {.importc, header: "<termios.h>".}: Cflag
|
||||||
OFDEL* = 200
|
NLDLY* {.importc, header: "<termios.h>".}: Cflag
|
||||||
NLDLY* = 400
|
NL0* {.importc, header: "<termios.h>".}: Cflag
|
||||||
NL0* = 0
|
NL1* {.importc, header: "<termios.h>".}: Cflag
|
||||||
NL1* = 400
|
CRDLY* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CRDLY* = 3000
|
CR0* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CR0* = 0
|
CR1* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CR1* = 1000
|
CR2* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CR2* = 2000
|
CR3* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CR3* = 3000
|
TABDLY* {.importc, header: "<termios.h>".}: Cflag
|
||||||
TABDLY* = 14000
|
TAB0* {.importc, header: "<termios.h>".}: Cflag
|
||||||
TAB0* = 0
|
TAB1* {.importc, header: "<termios.h>".}: Cflag
|
||||||
TAB1* = 4000
|
TAB2* {.importc, header: "<termios.h>".}: Cflag
|
||||||
TAB2* = 10000
|
TAB3* {.importc, header: "<termios.h>".}: Cflag
|
||||||
TAB3* = 14000
|
BSDLY* {.importc, header: "<termios.h>".}: Cflag
|
||||||
BSDLY* = 20000
|
BS0* {.importc, header: "<termios.h>".}: Cflag
|
||||||
BS0* = 0
|
BS1* {.importc, header: "<termios.h>".}: Cflag
|
||||||
BS1* = 20000
|
FFDLY* {.importc, header: "<termios.h>".}: Cflag
|
||||||
FFDLY* = 0o000000100000
|
FF0* {.importc, header: "<termios.h>".}: Cflag
|
||||||
FF0* = 0
|
FF1* {.importc, header: "<termios.h>".}: Cflag
|
||||||
FF1* = 0o000000100000
|
VTDLY* {.importc, header: "<termios.h>".}: Cflag
|
||||||
VTDLY* = 40000
|
VT0* {.importc, header: "<termios.h>".}: Cflag
|
||||||
VT0* = 0
|
VT1* {.importc, header: "<termios.h>".}: Cflag
|
||||||
VT1* = 40000
|
|
||||||
XTABS* = 14000
|
|
||||||
|
|
||||||
# cflag bit meaning
|
# cflag bit meaning
|
||||||
|
|
||||||
const
|
var
|
||||||
CBAUD* = 10017
|
B0* {.importc, header: "<termios.h>".}: Speed
|
||||||
B0* = 0
|
B50* {.importc, header: "<termios.h>".}: Speed
|
||||||
B50* = 1
|
B75* {.importc, header: "<termios.h>".}: Speed
|
||||||
B75* = 2
|
B110* {.importc, header: "<termios.h>".}: Speed
|
||||||
B110* = 3
|
B134* {.importc, header: "<termios.h>".}: Speed
|
||||||
B134* = 4
|
B150* {.importc, header: "<termios.h>".}: Speed
|
||||||
B150* = 5
|
B200* {.importc, header: "<termios.h>".}: Speed
|
||||||
B200* = 6
|
B300* {.importc, header: "<termios.h>".}: Speed
|
||||||
B300* = 7
|
B600* {.importc, header: "<termios.h>".}: Speed
|
||||||
B600* = 10
|
B1200* {.importc, header: "<termios.h>".}: Speed
|
||||||
B1200* = 11
|
B1800* {.importc, header: "<termios.h>".}: Speed
|
||||||
B1800* = 12
|
B2400* {.importc, header: "<termios.h>".}: Speed
|
||||||
B2400* = 13
|
B4800* {.importc, header: "<termios.h>".}: Speed
|
||||||
B4800* = 14
|
B9600* {.importc, header: "<termios.h>".}: Speed
|
||||||
B9600* = 15
|
B19200* {.importc, header: "<termios.h>".}: Speed
|
||||||
B19200* = 16
|
B38400* {.importc, header: "<termios.h>".}: Speed
|
||||||
B38400* = 17
|
EXTA* {.importc, header: "<termios.h>".}: Speed
|
||||||
EXTA* = B19200
|
EXTB* {.importc, header: "<termios.h>".}: Speed
|
||||||
EXTB* = B38400
|
CSIZE* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CSIZE* = 60
|
CS5* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CS5* = 0
|
CS6* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CS6* = 20
|
CS7* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CS7* = 40
|
CS8* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CS8* = 60
|
CSTOPB* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CSTOPB* = 100
|
CREAD* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CREAD* = 200
|
PARENB* {.importc, header: "<termios.h>".}: Cflag
|
||||||
PARENB* = 400
|
PARODD* {.importc, header: "<termios.h>".}: Cflag
|
||||||
PARODD* = 1000
|
HUPCL* {.importc, header: "<termios.h>".}: Cflag
|
||||||
HUPCL* = 2000
|
CLOCAL* {.importc, header: "<termios.h>".}: Cflag
|
||||||
CLOCAL* = 4000
|
|
||||||
CBAUDEX* = 10000
|
|
||||||
B57600* = 10001
|
|
||||||
B115200* = 10002
|
|
||||||
B230400* = 10003
|
|
||||||
B460800* = 10004
|
|
||||||
B500000* = 10005
|
|
||||||
B576000* = 10006
|
|
||||||
B921600* = 10007
|
|
||||||
B1000000* = 10010
|
|
||||||
B1152000* = 10011
|
|
||||||
B1500000* = 10012
|
|
||||||
B2000000* = 10013
|
|
||||||
B2500000* = 10014
|
|
||||||
B3000000* = 10015
|
|
||||||
B3500000* = 10016
|
|
||||||
B4000000* = 10017
|
|
||||||
MAX_BAUD* = B4000000
|
|
||||||
CIBAUD* = 2003600000
|
|
||||||
CMSPAR* = 0o010000000000
|
|
||||||
CRTSCTS* = 0o020000000000
|
|
||||||
|
|
||||||
# lflag bits
|
# lflag bits
|
||||||
|
|
||||||
const
|
var
|
||||||
ISIG* = 1
|
ISIG* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ICANON* = 2
|
ICANON* {.importc, header: "<termios.h>".}: Cflag
|
||||||
XCASE* = 4
|
ECHO* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ECHO* = 10
|
ECHOE* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ECHOE* = 20
|
ECHOK* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ECHOK* = 40
|
ECHONL* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ECHONL* = 100
|
NOFLSH* {.importc, header: "<termios.h>".}: Cflag
|
||||||
NOFLSH* = 200
|
TOSTOP* {.importc, header: "<termios.h>".}: Cflag
|
||||||
TOSTOP* = 400
|
IEXTEN* {.importc, header: "<termios.h>".}: Cflag
|
||||||
ECHOCTL* = 1000
|
|
||||||
ECHOPRT* = 2000
|
|
||||||
ECHOKE* = 4000
|
|
||||||
FLUSHO* = 10000
|
|
||||||
PENDIN* = 40000
|
|
||||||
IEXTEN* = 0o000000100000
|
|
||||||
EXTPROC* = 0o000000200000
|
|
||||||
|
|
||||||
# tcflow() and TCXONC use these
|
# tcflow() and TCXONC use these
|
||||||
|
|
||||||
const
|
var
|
||||||
TCOOFF* = 0
|
TCOOFF* {.importc, header: "<termios.h>".}: cint
|
||||||
TCOON* = 1
|
TCOON* {.importc, header: "<termios.h>".}: cint
|
||||||
TCIOFF* = 2
|
TCIOFF* {.importc, header: "<termios.h>".}: cint
|
||||||
TCION* = 3
|
TCION* {.importc, header: "<termios.h>".}: cint
|
||||||
|
|
||||||
# tcflush() and TCFLSH use these
|
# tcflush() and TCFLSH use these
|
||||||
|
|
||||||
const
|
var
|
||||||
TCIFLUSH* = 0
|
TCIFLUSH* {.importc, header: "<termios.h>".}: cint
|
||||||
TCOFLUSH* = 1
|
TCOFLUSH* {.importc, header: "<termios.h>".}: cint
|
||||||
TCIOFLUSH* = 2
|
TCIOFLUSH* {.importc, header: "<termios.h>".}: cint
|
||||||
|
|
||||||
# tcsetattr uses these
|
# tcsetattr uses these
|
||||||
|
|
||||||
const
|
var
|
||||||
TCSANOW* = 0
|
TCSANOW* {.importc, header: "<termios.h>".}: cint
|
||||||
TCSADRAIN* = 1
|
TCSADRAIN* {.importc, header: "<termios.h>".}: cint
|
||||||
TCSAFLUSH* = 2
|
TCSAFLUSH* {.importc, header: "<termios.h>".}: cint
|
||||||
|
|
||||||
# Compare a character C to a value VAL from the `cc' array in a
|
# Compare a character C to a value VAL from the `cc' array in a
|
||||||
# `struct termios'. If VAL is _POSIX_VDISABLE, no character can match it.
|
# `struct termios'. If VAL is _POSIX_VDISABLE, no character can match it.
|
||||||
|
|
@ -221,10 +183,6 @@ proc cfSetIspeed*(termios: ptr Termios; speed: Speed): cint {.
|
||||||
importc: "cfsetispeed", header: "<termios.h>".}
|
importc: "cfsetispeed", header: "<termios.h>".}
|
||||||
# Set both the input and output baud rates in *TERMIOS_OP to SPEED.
|
# Set both the input and output baud rates in *TERMIOS_OP to SPEED.
|
||||||
|
|
||||||
proc cfSetSpeed*(termios: ptr Termios; speed: Speed): cint {.
|
|
||||||
importc: "cfsetspeed", header: "<termios.h>".}
|
|
||||||
# Put the state of FD into *TERMIOS_P.
|
|
||||||
|
|
||||||
proc tcGetAttr*(fd: cint; termios: ptr Termios): cint {.
|
proc tcGetAttr*(fd: cint; termios: ptr Termios): cint {.
|
||||||
importc: "tcgetattr", header: "<termios.h>".}
|
importc: "tcgetattr", header: "<termios.h>".}
|
||||||
# Set the state of FD to *TERMIOS_P.
|
# Set the state of FD to *TERMIOS_P.
|
||||||
|
|
@ -234,10 +192,6 @@ proc tcSetAttr*(fd: cint; optional_actions: cint; termios: ptr Termios): cint {.
|
||||||
importc: "tcsetattr", header: "<termios.h>".}
|
importc: "tcsetattr", header: "<termios.h>".}
|
||||||
# Set *TERMIOS_P to indicate raw mode.
|
# Set *TERMIOS_P to indicate raw mode.
|
||||||
|
|
||||||
proc cfMakeRaw*(termios: ptr Termios) {.importc: "cfmakeraw",
|
|
||||||
header: "<termios.h>".}
|
|
||||||
# Send zero bits on FD.
|
|
||||||
|
|
||||||
proc tcSendBreak*(fd: cint; duration: cint): cint {.importc: "tcsendbreak",
|
proc tcSendBreak*(fd: cint; duration: cint): cint {.importc: "tcsendbreak",
|
||||||
header: "<termios.h>".}
|
header: "<termios.h>".}
|
||||||
# Wait for pending output to be written on FD.
|
# Wait for pending output to be written on FD.
|
||||||
|
|
@ -258,13 +212,10 @@ proc tcFlow*(fd: cint; action: cint): cint {.importc: "tcflow",
|
||||||
header: "<termios.h>".}
|
header: "<termios.h>".}
|
||||||
# Get process group ID for session leader for controlling terminal FD.
|
# Get process group ID for session leader for controlling terminal FD.
|
||||||
|
|
||||||
proc tcGetSid*(fd: cint): Pid {.importc: "tcgetsid", header: "<termios.h>".}
|
|
||||||
|
|
||||||
# Window size ioctl. Should work on on any Unix that xterm has been ported to.
|
# Window size ioctl. Should work on on any Unix that xterm has been ported to.
|
||||||
var TIOCGWINSZ*{.importc, header: "<sys/ioctl.h>".}: culong
|
var TIOCGWINSZ*{.importc, header: "<sys/ioctl.h>".}: culong
|
||||||
|
|
||||||
type IOctl_WinSize* {.importc: "struct winsize", header: "<sys/ioctl.h>",
|
type IOctl_WinSize* = object
|
||||||
final, pure.} = object
|
|
||||||
ws_row*, ws_col*, ws_xpixel*, ws_ypixel*: cushort
|
ws_row*, ws_col*, ws_xpixel*, ws_ypixel*: cushort
|
||||||
|
|
||||||
proc ioctl*(fd: cint, request: culong, reply: ptr IOctl_WinSize): int {.
|
proc ioctl*(fd: cint, request: culong, reply: ptr IOctl_WinSize): int {.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue