Mercurial > octave-nkf
changeset 16495:b98ad20e4880
backout changeset 98155e2b6d42
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 11 Apr 2013 11:57:23 -0400 |
| parents | 3a2daa39c682 |
| children | d3b01ae21259 |
| files | liboctave/system/lo-sysdep.cc liboctave/system/lo-sysdep.h liboctave/util/cmd-edit.cc |
| diffstat | 3 files changed, 0 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/system/lo-sysdep.cc Thu Apr 11 01:51:38 2013 -0400 +++ b/liboctave/system/lo-sysdep.cc Thu Apr 11 11:57:23 2013 -0400 @@ -140,36 +140,6 @@ return pid; } -int -w32_terminal_rows (void) -{ - int retval = 0; - - HANDLE console = GetStdHandle (STD_OUTPUT_HANDLE); - - CONSOLE_SCREEN_BUFFER_INFO csbi; - - if (GetConsoleScreenBufferInfo (console, &csbi)) - retval = csbi.dwSize.Y; - - return retval; -} - -int -w32_terminal_cols (void) -{ - int retval = 0; - - HANDLE console = GetStdHandle (STD_OUTPUT_HANDLE); - - CONSOLE_SCREEN_BUFFER_INFO csbi; - - if (GetConsoleScreenBufferInfo (console, &csbi)) - retval = csbi.dwSize.X; - - return retval; -} - void w32_clear_console_window (void) {
--- a/liboctave/system/lo-sysdep.h Thu Apr 11 01:51:38 2013 -0400 +++ b/liboctave/system/lo-sysdep.h Thu Apr 11 11:57:23 2013 -0400 @@ -36,8 +36,6 @@ extern pid_t octave_popen2 (const std::string&, const string_vector&, bool, int *, std::string&); -extern int w32_terminal_rows (void); -extern int w32_terminal_cols (void); extern void w32_clear_console_window (void); #endif
--- a/liboctave/util/cmd-edit.cc Thu Apr 11 01:51:38 2013 -0400 +++ b/liboctave/util/cmd-edit.cc Thu Apr 11 11:57:23 2013 -0400 @@ -302,11 +302,7 @@ int gnu_readline::do_terminal_rows (void) { -#if defined (__WIN32__) && ! defined (__CYGWIN__) - int sh = w32_terminal_rows (); -#else int sh = ::octave_rl_screen_height (); -#endif return sh > 0 ? sh : 24; } @@ -314,11 +310,7 @@ int gnu_readline::do_terminal_cols (void) { -#if defined (__WIN32__) && ! defined (__CYGWIN__) - int sw = w32_terminal_cols (); -#else int sw = ::octave_rl_screen_width (); -#endif return sw > 0 ? sw : 80; }