diff options
author | rafan <rafan@FreeBSD.org> | 2007-01-20 07:32:02 +0000 |
---|---|---|
committer | rafan <rafan@FreeBSD.org> | 2007-01-20 07:32:02 +0000 |
commit | a35ca3ffa07d253f729abfe49e019438658f9333 (patch) | |
tree | 1351fbc560fb430cd5e493287f4950d583f23af3 /contrib/ncurses/ncurses/base/lib_restart.c | |
parent | 61ebc4fdc6ffaff63296473b0fef0ff5e17067f7 (diff) | |
parent | de9cbef68d4c3ea6cd003ce086e2d3487600ace7 (diff) | |
download | FreeBSD-src-a35ca3ffa07d253f729abfe49e019438658f9333.zip FreeBSD-src-a35ca3ffa07d253f729abfe49e019438658f9333.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r166124,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/ncurses/ncurses/base/lib_restart.c')
-rw-r--r-- | contrib/ncurses/ncurses/base/lib_restart.c | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/contrib/ncurses/ncurses/base/lib_restart.c b/contrib/ncurses/ncurses/base/lib_restart.c index 0068554..ca27a0f 100644 --- a/contrib/ncurses/ncurses/base/lib_restart.c +++ b/contrib/ncurses/ncurses/base/lib_restart.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2002,2006 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 * ****************************************************************************/ /* @@ -47,46 +48,52 @@ #include <term.h> /* lines, columns, cur_term */ -MODULE_ID("$Id: lib_restart.c,v 1.4 2000/12/10 01:26:52 tom Exp $") +MODULE_ID("$Id: lib_restart.c,v 1.6 2006/01/14 15:58:23 tom Exp $") NCURSES_EXPORT(int) -restartterm -(NCURSES_CONST char *termp, int filenum, int *errret) +restartterm(NCURSES_CONST char *termp, int filenum, int *errret) { int saveecho = SP->_echo; int savecbreak = SP->_cbreak; int saveraw = SP->_raw; int savenl = SP->_nl; + int result; T((T_CALLED("restartterm(%s,%d,%p)"), termp, filenum, errret)); - setupterm(termp, filenum, errret); + _nc_handle_sigwinch(0); + if (setupterm(termp, filenum, errret) != OK) { + result = ERR; + } else { - if (saveecho) - echo(); - else - noecho(); + if (saveecho) + echo(); + else + noecho(); - if (savecbreak) { - cbreak(); - noraw(); - } else if (saveraw) { - nocbreak(); - raw(); - } else { - nocbreak(); - noraw(); - } - if (savenl) - nl(); - else - nonl(); + if (savecbreak) { + cbreak(); + noraw(); + } else if (saveraw) { + nocbreak(); + raw(); + } else { + nocbreak(); + noraw(); + } + if (savenl) + nl(); + else + nonl(); - reset_prog_mode(); + reset_prog_mode(); #if USE_SIZECHANGE - _nc_update_screensize(); + _nc_update_screensize(); #endif - returnCode(OK); + result = OK; + } + _nc_handle_sigwinch(1); + returnCode(result); } |