#include <term.h> /* cur_term */
#include <tic.h>
-MODULE_ID("$Id: lib_set_term.c,v 1.94 2007/03/03 21:12:48 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.97 2007/04/26 19:39:48 tom Exp $")
NCURSES_EXPORT(SCREEN *)
set_term(SCREEN *screenp)
_nc_set_screen(screenp);
set_curterm(SP->_term);
+#if !USE_REENTRANT
curscr = SP->_curscr;
newscr = SP->_newscr;
stdscr = SP->_stdscr;
COLORS = SP->_color_count;
COLOR_PAIRS = SP->_pair_count;
+#endif
T((T_RETURN("%p"), oldSP));
return (oldSP);
* multiple references in different screens).
*/
if (sp == SP) {
+#if !USE_REENTRANT
curscr = 0;
newscr = 0;
stdscr = 0;
COLORS = 0;
COLOR_PAIRS = 0;
+#endif
_nc_set_screen(0);
}
returnVoid;
}
-static ripoff_t rippedoff[5];
-static ripoff_t *rsp = rippedoff;
#define N_RIPS SIZEOF(SP->_rippedoff)
static bool
}
#endif
+#define ripoff_sp _nc_prescreen.rsp
+#define ripoff_stack _nc_prescreen.rippedoff
+
/* OS-independent screen initializations */
NCURSES_EXPORT(int)
-_nc_setupscreen(int slines,
- int scolumns,
+_nc_setupscreen(int slines GCC_UNUSED,
+ int scolumns GCC_UNUSED,
FILE *output,
bool filtered,
int slk_format)
if ((SP->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0)
returnCode(ERR);
+ /*
+ * We should always check the screensize, just in case.
+ */
+ _nc_get_screensize(&slines, &scolumns);
+ SET_LINES(slines);
+ SET_COLS(scolumns);
+ T((T_CREATE("screen %s %dx%d"), termname(), LINES, COLS));
+
SP->_filtered = filtered;
/* implement filter mode */
if (filtered) {
- slines = LINES = 1;
-
+ slines = 1;
+ SET_LINES(slines);
clear_screen = 0;
cursor_down = parm_down_cursor = 0;
cursor_address = 0;
SP->newhash = 0;
T(("creating newscr"));
- if ((newscr = newwin(slines, scolumns, 0, 0)) == 0)
+ if ((SP->_newscr = newwin(slines, scolumns, 0, 0)) == 0)
returnCode(ERR);
T(("creating curscr"));
- if ((curscr = newwin(slines, scolumns, 0, 0)) == 0)
+ if ((SP->_curscr = newwin(slines, scolumns, 0, 0)) == 0)
returnCode(ERR);
- SP->_newscr = newscr;
- SP->_curscr = curscr;
+#if !USE_REENTRANT
+ newscr = SP->_newscr;
+ curscr = SP->_curscr;
+#endif
#if USE_SIZECHANGE
SP->_resize = resizeterm;
#endif
def_shell_mode();
def_prog_mode();
- for (i = 0, rsp = rippedoff; rsp->line && (i < (int) N_RIPS); rsp++, i++) {
- T(("ripping off line %d at %s", i, rsp->line < 0 ? "bottom" : "top"));
- SP->_rippedoff[i] = rippedoff[i];
- if (rsp->hook) {
- int count = (rsp->line < 0) ? -rsp->line : rsp->line;
+ for (i = 0, ripoff_sp = ripoff_stack;
+ ripoff_sp->line && (i < (int) N_RIPS);
+ ripoff_sp++, i++) {
+
+ T(("ripping off line %d at %s", i,
+ ((ripoff_sp->line < 0)
+ ? "bottom"
+ : "top")));
+
+ SP->_rippedoff[i] = ripoff_stack[i];
+ if (ripoff_sp->hook) {
+ int count = (ripoff_sp->line < 0) ? -ripoff_sp->line : ripoff_sp->line;
SP->_rippedoff[i].w = newwin(count,
scolumns,
- ((rsp->line < 0)
+ ((ripoff_sp->line < 0)
? SP->_lines_avail - count
: 0),
0);
SP->_rippedoff[i].hook(SP->_rippedoff[i].w, scolumns);
else
returnCode(ERR);
- if (rsp->line < 0)
+ if (ripoff_sp->line < 0)
bottom_stolen += count;
else
SP->_topstolen += count;
SP->_lines_avail -= count;
}
- rsp->line = 0;
+ ripoff_sp->line = 0;
}
SP->_rip_count = i;
/* reset the stack */
- rsp = rippedoff;
+ ripoff_sp = ripoff_stack;
T(("creating stdscr"));
assert((SP->_lines_avail + SP->_topstolen + bottom_stolen) == slines);
- if ((stdscr = newwin(LINES = SP->_lines_avail, scolumns, 0, 0)) == 0)
+ if ((SP->_stdscr = newwin(SP->_lines_avail, scolumns, 0, 0)) == 0)
returnCode(ERR);
- SP->_stdscr = stdscr;
+
+ SET_LINES(SP->_lines_avail);
+#if !USE_REENTRANT
+ stdscr = SP->_stdscr;
+#endif
returnCode(OK);
}
if (line != 0) {
- if (rsp >= rippedoff + N_RIPS)
+ if (ripoff_sp == 0)
+ ripoff_sp = ripoff_stack;
+ if (ripoff_sp >= ripoff_stack + N_RIPS)
returnCode(ERR);
- rsp->line = line;
- rsp->hook = init;
- rsp->w = 0;
- rsp++;
+ ripoff_sp->line = line;
+ ripoff_sp->hook = init;
+ ripoff_sp->w = 0;
+ ripoff_sp++;
}
returnCode(OK);