ncurses 5.9 - patch 20130713

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

diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c
index 0d7fa27bcc3da457cec3b7097d8ddb65275ca9c0..9302f022b89cdf584075cc50eb7aa3c4a13b1ef0 100644 (file)
--- a/ncurses/tinfo/lib_baudrate.c
+++ b/ncurses/tinfo/lib_baudrate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2009,2010 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            *
@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -37,10 +38,48 @@
  */
 
 #include <curses.priv.h>
-#include <term.h>              /* cur_term, pad_char */
 #include <termcap.h>           /* ospeed */
+#if defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
 
-MODULE_ID("$Id: lib_baudrate.c,v 1.17 2000/10/08 00:59:08 tom Exp $")
+/*
+ * These systems use similar header files, which define B1200 as 1200, etc.,
+ * but can be overridden by defining USE_OLD_TTY so B1200 is 9, which makes all
+ * of the indices up to B115200 fit nicely in a 'short', allowing us to retain
+ * ospeed's type for compatibility.
+ */
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__)
+#undef B0
+#undef B50
+#undef B75
+#undef B110
+#undef B134
+#undef B150
+#undef B200
+#undef B300
+#undef B600
+#undef B1200
+#undef B1800
+#undef B2400
+#undef B4800
+#undef B9600
+#undef B19200
+#undef EXTA
+#undef B38400
+#undef EXTB
+#undef B57600
+#undef B115200
+#undef B230400
+#undef B460800
+#undef B921600
+#define USE_OLD_TTY
+#include <sys/ttydev.h>
+#else
+#undef USE_OLD_TTY
+#endif /* USE_OLD_TTY */
+
+MODULE_ID("$Id: lib_baudrate.c,v 1.31 2010/12/19 01:50:50 tom Exp $")
 
 /*
  *     int
@@ -51,8 +90,8 @@ MODULE_ID("$Id: lib_baudrate.c,v 1.17 2000/10/08 00:59:08 tom Exp $")
  */
 
 struct speed {
-    int s;     /* value for 'ospeed' is an index */
-    int sp;    /* the actual speed */
+    int s;                     /* value for 'ospeed' is an index */
+    int sp;                    /* the actual speed */
 };
 
 static struct speed const speeds[] =
@@ -97,21 +136,28 @@ static struct speed const speeds[] =
 #ifdef B460800
     {B460800, 460800},
 #endif
+#ifdef B921600
+    {B921600, 921600},
+#endif
 };
 
-int
+NCURSES_EXPORT(int)
 _nc_baudrate(int OSpeed)
 {
+#if !USE_REENTRANT
     static int last_OSpeed;
     static int last_baudrate;
+#endif
 
-    int result;
+    int result = ERR;
     unsigned i;
 
+#if !USE_REENTRANT
     if (OSpeed == last_OSpeed) {
        result = last_baudrate;
-    } else {
-       result = ERR;
+    }
+#endif
+    if (result == ERR) {
        if (OSpeed >= 0) {
            for (i = 0; i < SIZEOF(speeds); i++) {
                if (speeds[i].s == OSpeed) {
@@ -120,12 +166,17 @@ _nc_baudrate(int OSpeed)
                }
            }
        }
-       last_baudrate = result;
+#if !USE_REENTRANT
+       if (OSpeed == last_OSpeed) {
+           last_OSpeed = OSpeed;
+           last_baudrate = result;
+       }
+#endif
     }
     return (result);
 }
 
-int
+NCURSES_EXPORT(int)
 _nc_ospeed(int BaudRate)
 {
     int result = 1;
@@ -142,12 +193,12 @@ _nc_ospeed(int BaudRate)
     return (result);
 }
 
-int
-baudrate(void)
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
 {
     int result;
 
-    T((T_CALLED("baudrate()")));
+    T((T_CALLED("baudrate(%p)"), (void *) SP_PARM));
 
     /*
      * In debugging, allow the environment symbol to override when we're
@@ -155,24 +206,41 @@ baudrate(void)
      * that take into account costs that depend on baudrate.
      */
 #ifdef TRACE
-    if (SP && !isatty(fileno(SP->_ofp))
+    if (IsValidTIScreen(SP_PARM)
+       && !isatty(fileno(SP_PARM ? SP_PARM->_ofp : stdout))
        && getenv("BAUDRATE") != 0) {
        int ret;
        if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)
            ret = 9600;
-       ospeed = _nc_ospeed(ret);
+       ospeed = (NCURSES_OSPEED) _nc_ospeed(ret);
        returnCode(ret);
-    } else
+    }
 #endif
 
+    if (IsValidTIScreen(SP_PARM)) {
+#ifdef USE_OLD_TTY
+       result = cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb));
+       ospeed = _nc_ospeed(result);
+#else /* !USE_OLD_TTY */
 #ifdef TERMIOS
-       ospeed = cfgetospeed(&cur_term->Nttyb);
+       ospeed = (NCURSES_OSPEED) cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb));
 #else
-       ospeed = cur_term->Nttyb.sg_ospeed;
+       ospeed = (NCURSES_OSPEED) TerminalOf(SP_PARM)->Nttyb.sg_ospeed;
 #endif
-    result = _nc_baudrate(ospeed);
-    if (cur_term != 0)
-       cur_term->_baudrate = result;
+       result = _nc_baudrate(ospeed);
+#endif
+       TerminalOf(SP_PARM)->_baudrate = result;
+    } else {
+       result = ERR;
+    }
 
     returnCode(result);
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+baudrate(void)
+{
+    return NCURSES_SP_NAME(baudrate) (CURRENT_SCREEN);
+}
+#endif