ncurses 6.0 - patch 20170311

[ncurses.git] / ncurses / tinfo / lib_raw.c

diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c
index 7f67a7525e7da4b372d71f2ca6671e62e28ccf3b..a207fe0d920c5ee1e9dc17045e4c476f177c736e 100644 (file)
--- a/ncurses/tinfo/lib_raw.c
+++ b/ncurses/tinfo/lib_raw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -49,11 +49,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_raw.c,v 1.18 2009/10/24 21:56:15 tom Exp $")
-
-#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
-#define _POSIX_SOURCE
-#endif
+MODULE_ID("$Id: lib_raw.c,v 1.22 2016/05/28 23:22:52 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>                /* needed for ISC */
@@ -66,6 +62,11 @@ MODULE_ID("$Id: lib_raw.c,v 1.18 2009/10/24 21:56:15 tom Exp $")
 #define _nc_setmode(mode)      /* nothing */
 #endif
 
+#if USE_KLIBC_KBD
+#define INCL_KBD
+#include <os2.h>
+#endif
+
 #define COOKED_INPUT   (IXON|BRKINT|PARMRK)
 
 #ifdef TRACE
@@ -91,8 +92,8 @@ NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0)
 
        buf = termp->Nttyb;
 #ifdef TERMIOS
-       buf.c_lflag &= ~(ICANON | ISIG | IEXTEN);
-       buf.c_iflag &= ~(COOKED_INPUT);
+       buf.c_lflag &= (unsigned) ~(ICANON | ISIG | IEXTEN);
+       buf.c_iflag &= (unsigned) ~(COOKED_INPUT);
        buf.c_cc[VMIN] = 1;
        buf.c_cc[VTIME] = 0;
 #else
@@ -100,6 +101,17 @@ NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0)
 #endif
        result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
        if (result == OK) {
+#if USE_KLIBC_KBD
+           KBDINFO kbdinfo;
+
+           kbdinfo.cb = sizeof(kbdinfo);
+           KbdGetStatus(&kbdinfo, 0);
+
+           kbdinfo.cb = sizeof(kbdinfo);
+           kbdinfo.fsMask &= ~KEYBOARD_ASCII_MODE;
+           kbdinfo.fsMask |= KEYBOARD_BINARY_MODE;
+           KbdSetStatus(&kbdinfo, 0);
+#endif
            SP_PARM->_raw = TRUE;
            SP_PARM->_cbreak = 1;
            termp->Nttyb = buf;
@@ -132,8 +144,8 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0)
 
        buf = termp->Nttyb;
 #ifdef TERMIOS
-       buf.c_lflag &= ~ICANON;
-       buf.c_iflag &= ~ICRNL;
+       buf.c_lflag &= (unsigned) ~ICANON;
+       buf.c_iflag &= (unsigned) ~ICRNL;
        buf.c_lflag |= ISIG;
        buf.c_cc[VMIN] = 1;
        buf.c_cc[VTIME] = 0;
@@ -165,19 +177,20 @@ cbreak(void)
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(qiflush) (NCURSES_SP_DCL0)
 {
-    int result = ERR;
     TERMINAL *termp;
 
     T((T_CALLED("qiflush(%p)"), (void *) SP_PARM));
     if ((termp = TerminalOf(SP_PARM)) != 0) {
        TTY buf;
+       int result;
 
        BEFORE("qiflush");
        buf = termp->Nttyb;
 #ifdef TERMIOS
-       buf.c_lflag &= ~(NOFLSH);
+       buf.c_lflag &= (unsigned) ~(NOFLSH);
        result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
 #else
+       result = ERR;
        /* FIXME */
 #endif
        if (result == OK)
@@ -218,6 +231,17 @@ NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0)
 #endif
        result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
        if (result == OK) {
+#if USE_KLIBC_KBD
+           KBDINFO kbdinfo;
+
+           kbdinfo.cb = sizeof(kbdinfo);
+           KbdGetStatus(&kbdinfo, 0);
+
+           kbdinfo.cb = sizeof(kbdinfo);
+           kbdinfo.fsMask &= ~KEYBOARD_BINARY_MODE;
+           kbdinfo.fsMask |= KEYBOARD_ASCII_MODE;
+           KbdSetStatus(&kbdinfo, 0);
+#endif
            SP_PARM->_raw = FALSE;
            SP_PARM->_cbreak = 0;
            termp->Nttyb = buf;
@@ -276,12 +300,12 @@ nocbreak(void)
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(noqiflush) (NCURSES_SP_DCL0)
 {
-    int result = ERR;
     TERMINAL *termp;
 
     T((T_CALLED("noqiflush(%p)"), (void *) SP_PARM));
     if ((termp = TerminalOf(SP_PARM)) != 0) {
        TTY buf;
+       int result;
 
        BEFORE("noqiflush");
        buf = termp->Nttyb;
@@ -290,6 +314,7 @@ NCURSES_SP_NAME(noqiflush) (NCURSES_SP_DCL0)
        result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
 #else
        /* FIXME */
+       result = ERR;
 #endif
        if (result == OK)
            termp->Nttyb = buf;
@@ -330,7 +355,7 @@ NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag)
        buf = termp->Nttyb;
 #ifdef TERMIOS
        if (flag)
-           buf.c_lflag &= ~(NOFLSH);
+           buf.c_lflag &= (unsigned) ~(NOFLSH);
        else
            buf.c_lflag |= (NOFLSH);
        result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);