diff options
Diffstat (limited to 'ncurses/tinfo/lib_raw.c')
| -rw-r--r-- | ncurses/tinfo/lib_raw.c | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c index fda6deada2a7..81e89ae1044b 100644 --- a/ncurses/tinfo/lib_raw.c +++ b/ncurses/tinfo/lib_raw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2023,2024 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -50,14 +50,13 @@ #include <curses.priv.h> -MODULE_ID("$Id: lib_raw.c,v 1.30 2024/03/30 15:54:17 tom Exp $") +MODULE_ID("$Id: lib_raw.c,v 1.35 2025/12/23 09:22:35 tom Exp $") #if HAVE_SYS_TERMIO_H #include <sys/termio.h> /* needed for ISC */ #endif #ifdef __EMX__ -#include <io.h> #define _nc_setmode(mode) setmode(SP_PARM->_ifd, mode) #else #define _nc_setmode(mode) /* nothing */ @@ -85,7 +84,7 @@ NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("raw(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("raw"); @@ -97,7 +96,7 @@ NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0) buf.c_iflag &= (unsigned) ~(COOKED_INPUT); buf.c_cc[VMIN] = 1; buf.c_cc[VTIME] = 0; -#elif defined(EXP_WIN32_DRIVER) +#elif defined(USE_WIN32CON_DRIVER) buf.dwFlagIn &= (unsigned long) ~CONMODE_NORAW; #else buf.sg_flags |= RAW; @@ -141,7 +140,7 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("cbreak(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("cbreak"); @@ -153,7 +152,7 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0) buf.c_iflag &= (unsigned) ~ICRNL; buf.c_cc[VMIN] = 1; buf.c_cc[VTIME] = 0; -#elif defined(EXP_WIN32_DRIVER) +#elif defined(USE_WIN32CON_DRIVER) buf.dwFlagIn |= CONMODE_NORAW; buf.dwFlagIn &= (unsigned long) ~CONMODE_NOCBREAK; #else @@ -179,17 +178,13 @@ cbreak(void) } #endif -/* - * Note: - * this implementation may be wrong. See the comment under intrflush(). - */ NCURSES_EXPORT(void) NCURSES_SP_NAME(qiflush) (NCURSES_SP_DCL0) { TERMINAL *termp; T((T_CALLED("qiflush(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; int result; @@ -224,7 +219,7 @@ NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("noraw(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("noraw"); @@ -235,7 +230,7 @@ NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0) buf.c_lflag |= ISIG | ICANON | (termp->Ottyb.c_lflag & IEXTEN); buf.c_iflag |= COOKED_INPUT; -#elif defined(EXP_WIN32_DRIVER) +#elif defined(USE_WIN32CON_DRIVER) buf.dwFlagIn |= CONMODE_NORAW; #else buf.sg_flags &= ~(RAW | CBREAK); @@ -279,7 +274,7 @@ NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("nocbreak(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("nocbreak"); @@ -289,7 +284,7 @@ NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0) #ifdef TERMIOS buf.c_lflag |= ICANON; buf.c_iflag |= ICRNL; -#elif defined(EXP_WIN32_DRIVER) +#elif defined(USE_WIN32CON_DRIVER) buf.dwFlagIn |= (CONMODE_NOCBREAK | CONMODE_NORAW); #else buf.sg_flags &= ~CBREAK; @@ -320,7 +315,7 @@ NCURSES_SP_NAME(noqiflush) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("noqiflush(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; int result; @@ -349,11 +344,7 @@ noqiflush(void) #endif /* - * This call does the same thing as the qiflush()/noqiflush() pair. We know - * for certain that SVr3 intrflush() tweaks the NOFLSH bit; on the other hand, - * the match (in the SVr4 man pages) between the language describing NOFLSH in - * termio(7) and the language describing qiflush()/noqiflush() in - * curs_inopts(3x) is too exact to be coincidence. + * This call does the same thing as the qiflush()/noqiflush() pair. */ NCURSES_EXPORT(int) NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag) @@ -362,10 +353,10 @@ NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag) TERMINAL *termp; T((T_CALLED("intrflush(%p,%d)"), (void *) SP_PARM, flag)); - if (SP_PARM == 0) + if (SP_PARM == NULL) returnCode(ERR); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("intrflush"); |