From a2455141466a046b06709a41911b094e08fc0eb0 Mon Sep 17 00:00:00 2001 From: John Novak Date: Wed, 30 Nov 2016 21:12:35 +1000 Subject: [PATCH] Use imported symbols & remove non-POSIX stuff * All symbols were hardcoded using Linux specific values, using imports now (because of this, the module was broken on OS X, for example) * There were many non-POSIX (Linux specific) symbols and functions included, these have been removed --- lib/posix/termios.nim | 271 +++++++++++++++++------------------------- 1 file changed, 111 insertions(+), 160 deletions(-) diff --git a/lib/posix/termios.nim b/lib/posix/termios.nim index 1fbccba9c8..af62bdb3dd 100644 --- a/lib/posix/termios.nim +++ b/lib/posix/termios.nim @@ -16,7 +16,7 @@ type {.deprecated: [Tcflag: Cflag].} const - NCCS* = 32 + NCCS* = when defined(macosx): 20 else: 32 type Termios* {.importc: "struct termios", header: "".} = object @@ -28,174 +28,136 @@ type # cc characters -const - VINTR* = 0 - VQUIT* = 1 - VERASE* = 2 - VKILL* = 3 - VEOF* = 4 - VTIME* = 5 - VMIN* = 6 - VSWTC* = 7 - VSTART* = 8 - VSTOP* = 9 - VSUSP* = 10 - VEOL* = 11 - VREPRINT* = 12 - VDISCARD* = 13 - VWERASE* = 14 - VLNEXT* = 15 - VEOL2* = 16 +var + VINTR* {.importc, header: "".}: cint + VQUIT* {.importc, header: "".}: cint + VERASE* {.importc, header: "".}: cint + VKILL* {.importc, header: "".}: cint + VEOF* {.importc, header: "".}: cint + VTIME* {.importc, header: "".}: cint + VMIN* {.importc, header: "".}: cint + VSTART* {.importc, header: "".}: cint + VSTOP* {.importc, header: "".}: cint + VSUSP* {.importc, header: "".}: cint + VEOL* {.importc, header: "".}: cint # iflag bits -const - IGNBRK* = 1 - BRKINT* = 2 - IGNPAR* = 4 - PARMRK* = 10 - INPCK* = 20 - ISTRIP* = 40 - INLCR* = 100 - IGNCR* = 200 - ICRNL* = 400 - IUCLC* = 1000 - IXON* = 2000 - IXANY* = 4000 - IXOFF* = 10000 - IMAXBEL* = 20000 - IUTF8* = 40000 +var + IGNBRK* {.importc, header: "".}: Cflag + BRKINT* {.importc, header: "".}: Cflag + IGNPAR* {.importc, header: "".}: Cflag + PARMRK* {.importc, header: "".}: Cflag + INPCK* {.importc, header: "".}: Cflag + ISTRIP* {.importc, header: "".}: Cflag + INLCR* {.importc, header: "".}: Cflag + IGNCR* {.importc, header: "".}: Cflag + ICRNL* {.importc, header: "".}: Cflag + IUCLC* {.importc, header: "".}: Cflag + IXON* {.importc, header: "".}: Cflag + IXANY* {.importc, header: "".}: Cflag + IXOFF* {.importc, header: "".}: Cflag # oflag bits -const - OPOST* = 1 - OLCUC* = 2 - ONLCR* = 4 - OCRNL* = 10 - ONOCR* = 20 - ONLRET* = 40 - OFILL* = 100 - OFDEL* = 200 - NLDLY* = 400 - NL0* = 0 - NL1* = 400 - CRDLY* = 3000 - CR0* = 0 - CR1* = 1000 - CR2* = 2000 - CR3* = 3000 - TABDLY* = 14000 - TAB0* = 0 - TAB1* = 4000 - TAB2* = 10000 - TAB3* = 14000 - BSDLY* = 20000 - BS0* = 0 - BS1* = 20000 - FFDLY* = 0o000000100000 - FF0* = 0 - FF1* = 0o000000100000 - VTDLY* = 40000 - VT0* = 0 - VT1* = 40000 - XTABS* = 14000 +var + OPOST* {.importc, header: "".}: Cflag + ONLCR* {.importc, header: "".}: Cflag + OCRNL* {.importc, header: "".}: Cflag + ONOCR* {.importc, header: "".}: Cflag + ONLRET* {.importc, header: "".}: Cflag + OFILL* {.importc, header: "".}: Cflag + OFDEL* {.importc, header: "".}: Cflag + NLDLY* {.importc, header: "".}: Cflag + NL0* {.importc, header: "".}: Cflag + NL1* {.importc, header: "".}: Cflag + CRDLY* {.importc, header: "".}: Cflag + CR0* {.importc, header: "".}: Cflag + CR1* {.importc, header: "".}: Cflag + CR2* {.importc, header: "".}: Cflag + CR3* {.importc, header: "".}: Cflag + TABDLY* {.importc, header: "".}: Cflag + TAB0* {.importc, header: "".}: Cflag + TAB1* {.importc, header: "".}: Cflag + TAB2* {.importc, header: "".}: Cflag + TAB3* {.importc, header: "".}: Cflag + BSDLY* {.importc, header: "".}: Cflag + BS0* {.importc, header: "".}: Cflag + BS1* {.importc, header: "".}: Cflag + FFDLY* {.importc, header: "".}: Cflag + FF0* {.importc, header: "".}: Cflag + FF1* {.importc, header: "".}: Cflag + VTDLY* {.importc, header: "".}: Cflag + VT0* {.importc, header: "".}: Cflag + VT1* {.importc, header: "".}: Cflag # cflag bit meaning -const - CBAUD* = 10017 - B0* = 0 - B50* = 1 - B75* = 2 - B110* = 3 - B134* = 4 - B150* = 5 - B200* = 6 - B300* = 7 - B600* = 10 - B1200* = 11 - B1800* = 12 - B2400* = 13 - B4800* = 14 - B9600* = 15 - B19200* = 16 - B38400* = 17 - EXTA* = B19200 - EXTB* = B38400 - CSIZE* = 60 - CS5* = 0 - CS6* = 20 - CS7* = 40 - CS8* = 60 - CSTOPB* = 100 - CREAD* = 200 - PARENB* = 400 - PARODD* = 1000 - HUPCL* = 2000 - 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 +var + B0* {.importc, header: "".}: Speed + B50* {.importc, header: "".}: Speed + B75* {.importc, header: "".}: Speed + B110* {.importc, header: "".}: Speed + B134* {.importc, header: "".}: Speed + B150* {.importc, header: "".}: Speed + B200* {.importc, header: "".}: Speed + B300* {.importc, header: "".}: Speed + B600* {.importc, header: "".}: Speed + B1200* {.importc, header: "".}: Speed + B1800* {.importc, header: "".}: Speed + B2400* {.importc, header: "".}: Speed + B4800* {.importc, header: "".}: Speed + B9600* {.importc, header: "".}: Speed + B19200* {.importc, header: "".}: Speed + B38400* {.importc, header: "".}: Speed + EXTA* {.importc, header: "".}: Speed + EXTB* {.importc, header: "".}: Speed + CSIZE* {.importc, header: "".}: Cflag + CS5* {.importc, header: "".}: Cflag + CS6* {.importc, header: "".}: Cflag + CS7* {.importc, header: "".}: Cflag + CS8* {.importc, header: "".}: Cflag + CSTOPB* {.importc, header: "".}: Cflag + CREAD* {.importc, header: "".}: Cflag + PARENB* {.importc, header: "".}: Cflag + PARODD* {.importc, header: "".}: Cflag + HUPCL* {.importc, header: "".}: Cflag + CLOCAL* {.importc, header: "".}: Cflag # lflag bits -const - ISIG* = 1 - ICANON* = 2 - XCASE* = 4 - ECHO* = 10 - ECHOE* = 20 - ECHOK* = 40 - ECHONL* = 100 - NOFLSH* = 200 - TOSTOP* = 400 - ECHOCTL* = 1000 - ECHOPRT* = 2000 - ECHOKE* = 4000 - FLUSHO* = 10000 - PENDIN* = 40000 - IEXTEN* = 0o000000100000 - EXTPROC* = 0o000000200000 +var + ISIG* {.importc, header: "".}: Cflag + ICANON* {.importc, header: "".}: Cflag + ECHO* {.importc, header: "".}: Cflag + ECHOE* {.importc, header: "".}: Cflag + ECHOK* {.importc, header: "".}: Cflag + ECHONL* {.importc, header: "".}: Cflag + NOFLSH* {.importc, header: "".}: Cflag + TOSTOP* {.importc, header: "".}: Cflag + IEXTEN* {.importc, header: "".}: Cflag # tcflow() and TCXONC use these -const - TCOOFF* = 0 - TCOON* = 1 - TCIOFF* = 2 - TCION* = 3 +var + TCOOFF* {.importc, header: "".}: cint + TCOON* {.importc, header: "".}: cint + TCIOFF* {.importc, header: "".}: cint + TCION* {.importc, header: "".}: cint # tcflush() and TCFLSH use these -const - TCIFLUSH* = 0 - TCOFLUSH* = 1 - TCIOFLUSH* = 2 +var + TCIFLUSH* {.importc, header: "".}: cint + TCOFLUSH* {.importc, header: "".}: cint + TCIOFLUSH* {.importc, header: "".}: cint # tcsetattr uses these -const - TCSANOW* = 0 - TCSADRAIN* = 1 - TCSAFLUSH* = 2 +var + TCSANOW* {.importc, header: "".}: cint + TCSADRAIN* {.importc, header: "".}: cint + TCSAFLUSH* {.importc, header: "".}: cint # 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. @@ -221,10 +183,6 @@ proc cfSetIspeed*(termios: ptr Termios; speed: Speed): cint {. importc: "cfsetispeed", header: "".} # Set both the input and output baud rates in *TERMIOS_OP to SPEED. -proc cfSetSpeed*(termios: ptr Termios; speed: Speed): cint {. - importc: "cfsetspeed", header: "".} -# Put the state of FD into *TERMIOS_P. - proc tcGetAttr*(fd: cint; termios: ptr Termios): cint {. importc: "tcgetattr", header: "".} # 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: "".} # Set *TERMIOS_P to indicate raw mode. -proc cfMakeRaw*(termios: ptr Termios) {.importc: "cfmakeraw", - header: "".} -# Send zero bits on FD. - proc tcSendBreak*(fd: cint; duration: cint): cint {.importc: "tcsendbreak", header: "".} # Wait for pending output to be written on FD. @@ -258,13 +212,10 @@ proc tcFlow*(fd: cint; action: cint): cint {.importc: "tcflow", header: "".} # Get process group ID for session leader for controlling terminal FD. -proc tcGetSid*(fd: cint): Pid {.importc: "tcgetsid", header: "".} - # Window size ioctl. Should work on on any Unix that xterm has been ported to. var TIOCGWINSZ*{.importc, header: "".}: culong -type IOctl_WinSize* {.importc: "struct winsize", header: "", - final, pure.} = object +type IOctl_WinSize* = object ws_row*, ws_col*, ws_xpixel*, ws_ypixel*: cushort proc ioctl*(fd: cint, request: culong, reply: ptr IOctl_WinSize): int {.