ncurses 5.7 - patch 20100424
[ncurses.git] / ncurses / tinfo / lib_setup.c
index d00ecb0ab567dcc2aef0c022e9e3a1354e7dae85..0b8aeba5a8cfa9ebc35115d1eed33040bf8d6d2e 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 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            *
@@ -42,7 +42,6 @@
 
 #include <curses.priv.h>
 #include <tic.h>               /* for MAX_NAME_SIZE */
-#include <term_entry.h>
 
 #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
 #define _POSIX_SOURCE
@@ -52,7 +51,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.123 2009/10/31 20:39:36 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.128 2010/04/03 13:54:45 tom Exp $")
 
 /****************************************************************************
  *
@@ -268,6 +267,7 @@ _nc_get_screensize(SCREEN *sp,
        sp->_TABSIZE = my_tabsize;
     }
 #else
+    (void) sp;
     TABSIZE = my_tabsize;
 #endif
     T(("TABSIZE = %d", my_tabsize));
@@ -278,25 +278,14 @@ _nc_get_screensize(SCREEN *sp,
     /* figure out the size of the screen */
     T(("screen size: terminfo lines = %d columns = %d", lines, columns));
 
-    if (!_nc_prescreen.use_env) {
-       *linep = (int) lines;
-       *colp = (int) columns;
-    } else {                   /* usually want to query LINES and COLUMNS from environment */
-       int value;
-
-       *linep = *colp = 0;
+    *linep = (int) lines;
+    *colp = (int) columns;
 
-       /* first, look for environment variables */
-       if ((value = _nc_getenv_num("LINES")) > 0) {
-           *linep = value;
-       }
-       if ((value = _nc_getenv_num("COLUMNS")) > 0) {
-           *colp = value;
-       }
-       T(("screen size: environment LINES = %d COLUMNS = %d", *linep, *colp));
+    if (_nc_prescreen.use_env) {
+       int value;
 
 #ifdef __EMX__
-       if (*linep <= 0 || *colp <= 0) {
+       {
            int screendata[2];
            _scrsize(screendata);
            *colp = screendata[0];
@@ -306,33 +295,41 @@ _nc_get_screensize(SCREEN *sp,
        }
 #endif
 #if HAVE_SIZECHANGE
-       /* if that didn't work, maybe we can try asking the OS */
-       if (*linep <= 0 || *colp <= 0) {
-           if (isatty(cur_term->Filedes)) {
-               STRUCT_WINSIZE size;
-
-               errno = 0;
-               do {
-                   if (ioctl(cur_term->Filedes, IOCTL_WINSIZE, &size) < 0
-                       && errno != EINTR)
-                       goto failure;
-               } while
-                   (errno == EINTR);
-
-               /*
-                * Solaris lets users override either dimension with an
-                * environment variable.
-                */
-               if (*linep <= 0)
-                   *linep = (sp != 0 && sp->_filtered) ? 1 : WINSIZE_ROWS(size);
-               if (*colp <= 0)
+       /* try asking the OS */
+       if (isatty(cur_term->Filedes)) {
+           STRUCT_WINSIZE size;
+
+           errno = 0;
+           do {
+               if (ioctl(cur_term->Filedes, IOCTL_WINSIZE, &size) >= 0) {
+                   *linep = ((sp != 0 && sp->_filtered)
+                             ? 1
+                             : WINSIZE_ROWS(size));
                    *colp = WINSIZE_COLS(size);
-           }
-           /* FALLTHRU */
-         failure:;
+                   T(("SYS screen size: environment LINES = %d COLUMNS = %d",
+                      *linep, *colp));
+                   break;
+               }
+           } while
+               (errno == EINTR);
        }
 #endif /* HAVE_SIZECHANGE */
 
+       /*
+        * Finally, look for environment variables.
+        *
+        * Solaris lets users override either dimension with an environment
+        * variable.
+        */
+       if ((value = _nc_getenv_num("LINES")) > 0) {
+           *linep = value;
+           T(("screen size: environment LINES = %d", *linep));
+       }
+       if ((value = _nc_getenv_num("COLUMNS")) > 0) {
+           *colp = value;
+           T(("screen size: environment COLUMNS = %d", *colp));
+       }
+
        /* if we can't get dynamic info about the size, use static */
        if (*linep <= 0) {
            *linep = (int) lines;
@@ -662,7 +659,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
        }
 #ifdef USE_TERM_DRIVER
        TCB = (TERMINAL_CONTROL_BLOCK *) termp;
-       code = _nc_get_driver(TCB, tname, errret);
+       code = _nc_globals.term_driver(TCB, tname, errret);
        if (code == OK) {
            termp->Filedes = Filedes;
            termp->_termname = strdup(tname);
@@ -749,6 +746,44 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
     returnCode(code);
 }
 
+#if NCURSES_SP_FUNCS
+/*
+ * In case of handling multiple screens, we need to have a screen before
+ * initialization in setupscreen takes place.  This is to extend the substitute
+ * for some of the stuff in _nc_prescreen, especially for slk and ripoff
+ * handling which should be done per screen.
+ */
+NCURSES_EXPORT(SCREEN *)
+new_prescr(void)
+{
+    static SCREEN *sp;
+
+    START_TRACE();
+    T((T_CALLED("new_prescr()")));
+
+    if (sp == 0) {
+       sp = _nc_alloc_screen_sp();
+       if (sp != 0) {
+           sp->rsp = sp->rippedoff;
+           sp->_filtered = _nc_prescreen.filter_mode;
+           sp->_use_env = _nc_prescreen.use_env;
+#if NCURSES_NO_PADDING
+           sp->_no_padding = _nc_prescreen._no_padding;
+#endif
+           sp->slk_format = 0;
+           sp->_slk = 0;
+           sp->_prescreen = TRUE;
+           SP_PRE_INIT(sp);
+#if USE_REENTRANT
+           sp->_TABSIZE = _nc_prescreen._TABSIZE;
+           sp->_ESCDELAY = _nc_prescreen._ESCDELAY;
+#endif
+       }
+    }
+    returnSP(sp);
+}
+#endif
+
 #ifdef USE_TERM_DRIVER
 /*
  * This entrypoint is called from tgetent() to allow a special case of reusing