X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Fresizeterm.c;h=01b5cb60f28d4d194e39add0667436288001f98c;hp=e5b852c70d3a6c2b634b5ffafbee406b9ca269dc;hb=2639531af0c3ca25b48e7bcb9c790fa566cc5892;hpb=a8987e73ec254703634802b4f7ee30d3a485524d;ds=sidebyside diff --git a/ncurses/base/resizeterm.c b/ncurses/base/resizeterm.c index e5b852c7..01b5cb60 100644 --- a/ncurses/base/resizeterm.c +++ b/ncurses/base/resizeterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -41,18 +41,52 @@ #include #include -MODULE_ID("$Id: resizeterm.c,v 1.15 2002/12/28 01:21:34 tom Exp $") +MODULE_ID("$Id: resizeterm.c,v 1.21 2007/03/10 23:45:14 tom Exp $") #define stolen_lines (screen_lines - SP->_lines_avail) +/* + * If we're trying to be reentrant, do not want any local statics. + */ +#if USE_REENTRANT +#define EXTRA_ARGS , CurLines, CurCols +#define EXTRA_DCLS , int CurLines, int CurCols +#else static int current_lines; static int current_cols; +#define CurLines current_lines +#define CurCols current_cols +#define EXTRA_ARGS /* nothing */ +#define EXTRA_DCLS /* nothing */ +#endif + +#ifdef TRACE +static void +show_window_sizes(const char *name) +{ + WINDOWLIST *wp; + + _tracef("%s resizing: %2d x %2d (%2d x %2d)", name, LINES, COLS, + screen_lines, screen_columns); + for (wp = _nc_windows; wp != 0; wp = wp->next) { + _tracef(" window %p is %2ld x %2ld at %2ld,%2ld", + &(wp->win), + (long) wp->win._maxy + 1, + (long) wp->win._maxx + 1, + (long) wp->win._begy, + (long) wp->win._begx); + } +} +#endif NCURSES_EXPORT(bool) is_term_resized(int ToLines, int ToCols) { - return (ToLines != screen_lines - || ToCols != screen_columns); + T((T_CALLED("is_term_resized(%d, %d)"), ToLines, ToCols)); + returnCode(ToLines > 0 + && ToCols > 0 + && (ToLines != screen_lines + || ToCols != screen_columns)); } /* @@ -99,26 +133,26 @@ parent_depth(WINDOW *cmp) * FIXME: must adjust position so it's within the parent! */ static int -adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen) +adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen EXTRA_DCLS) { int result; - int bottom = current_lines + SP->_topstolen - stolen; + int bottom = CurLines + SP->_topstolen - stolen; int myLines = win->_maxy + 1; int myCols = win->_maxx + 1; - T((T_CALLED("adjust_window(%p,%d,%d) currently %dx%d at %d,%d"), + T((T_CALLED("adjust_window(%p,%d,%d) currently %ldx%ld at %ld,%ld"), win, ToLines, ToCols, - getmaxy(win), getmaxx(win), - getbegy(win), getbegx(win))); + (long) getmaxy(win), (long) getmaxx(win), + (long) getbegy(win), (long) getbegx(win))); if (win->_begy >= bottom) { - win->_begy += (ToLines - current_lines); + win->_begy += (ToLines - CurLines); } else { - if (myLines == current_lines - stolen - && ToLines != current_lines) + if (myLines == CurLines - stolen + && ToLines != CurLines) myLines = ToLines - stolen; - else if (myLines == current_lines - && ToLines != current_lines) + else if (myLines == CurLines + && ToLines != CurLines) myLines = ToLines; } @@ -128,12 +162,12 @@ adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen) if (myCols > ToCols) myCols = ToCols; - if (myLines == current_lines - && ToLines != current_lines) + if (myLines == CurLines + && ToLines != CurLines) myLines = ToLines; - if (myCols == current_cols - && ToCols != current_cols) + if (myCols == CurCols + && ToCols != CurCols) myCols = ToCols; result = wresize(win, myLines, myCols); @@ -145,7 +179,7 @@ adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen) * children, decrease those to fit, then decrease the containing window, etc. */ static int -decrease_size(int ToLines, int ToCols, int stolen) +decrease_size(int ToLines, int ToCols, int stolen EXTRA_DCLS) { bool found; int depth = 0; @@ -162,7 +196,9 @@ decrease_size(int ToLines, int ToCols, int stolen) if (!(win->_flags & _ISPAD)) { if (child_depth(win) == depth) { - if (adjust_window(win, ToLines, ToCols, stolen) != OK) + found = TRUE; + if (adjust_window(win, ToLines, ToCols, + stolen EXTRA_ARGS) != OK) returnCode(ERR); } } @@ -177,7 +213,7 @@ decrease_size(int ToLines, int ToCols, int stolen) * parent, increase those to fit, then increase the contained window, etc. */ static int -increase_size(int ToLines, int ToCols, int stolen) +increase_size(int ToLines, int ToCols, int stolen EXTRA_DCLS) { bool found; int depth = 0; @@ -194,7 +230,9 @@ increase_size(int ToLines, int ToCols, int stolen) if (!(win->_flags & _ISPAD)) { if (parent_depth(win) == depth) { - if (adjust_window(win, ToLines, ToCols, stolen) != OK) + found = TRUE; + if (adjust_window(win, ToLines, ToCols, + stolen EXTRA_ARGS) != OK) returnCode(ERR); } } @@ -211,7 +249,7 @@ increase_size(int ToLines, int ToCols, int stolen) NCURSES_EXPORT(int) resize_term(int ToLines, int ToCols) { - int result = OK; + int result = OK EXTRA_ARGS; int was_stolen = (screen_lines - SP->_lines_avail); T((T_CALLED("resize_term(%d,%d) old(%d,%d)"), @@ -219,24 +257,28 @@ resize_term(int ToLines, int ToCols) screen_lines, screen_columns)); if (is_term_resized(ToLines, ToCols)) { - int myLines = current_lines = screen_lines; - int myCols = current_cols = screen_columns; + int myLines = CurLines = screen_lines; + int myCols = CurCols = screen_columns; +#ifdef TRACE + if (_nc_tracing & TRACE_UPDATE) + show_window_sizes("before"); +#endif if (ToLines > screen_lines) { - increase_size(myLines = ToLines, myCols, was_stolen); - current_lines = myLines; - current_cols = myCols; + increase_size(myLines = ToLines, myCols, was_stolen EXTRA_ARGS); + CurLines = myLines; + CurCols = myCols; } if (ToCols > screen_columns) { - increase_size(myLines, myCols = ToCols, was_stolen); - current_lines = myLines; - current_cols = myCols; + increase_size(myLines, myCols = ToCols, was_stolen EXTRA_ARGS); + CurLines = myLines; + CurCols = myCols; } if (ToLines < myLines || ToCols < myCols) { - decrease_size(ToLines, ToCols, was_stolen); + decrease_size(ToLines, ToCols, was_stolen EXTRA_ARGS); } screen_lines = lines = ToLines; @@ -250,14 +292,21 @@ resize_term(int ToLines, int ToCols) if (SP->newhash) { FreeAndNull(SP->newhash); } +#ifdef TRACE + if (_nc_tracing & TRACE_UPDATE) { + SET_LINES(ToLines - was_stolen); + SET_COLS(ToCols); + show_window_sizes("after"); + } +#endif } /* * Always update LINES, to allow for call from lib_doupdate.c which * needs to have the count adjusted by the stolen (ripped off) lines. */ - LINES = ToLines - was_stolen; - COLS = ToCols; + SET_LINES(ToLines - was_stolen); + SET_COLS(ToCols); returnCode(result); }