From d4fdc52404ae433252cfe18001452951ab899157 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 23 Feb 2006 18:14:43 +0000 Subject: [PATCH] * readline/terminal.c (_rl_get_screen_size): Get console size from the Windows API when compiling with MinGW. --- readline/ChangeLog.gdb | 5 +++++ readline/terminal.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb index 7105ea387d9..28cb1f2ff35 100644 --- a/readline/ChangeLog.gdb +++ b/readline/ChangeLog.gdb @@ -1,3 +1,8 @@ +2005-02-10 Denis Pilat + + * readline/terminal.c (_rl_get_screen_size): Get console size from + the Windows API when compiling with MinGW. + 2005-07-25 Mark Mitchell * input.c (rl_getc): Use getch to read console input on diff --git a/readline/terminal.c b/readline/terminal.c index 06bc8e94d6b..ce45d28d024 100644 --- a/readline/terminal.c +++ b/readline/terminal.c @@ -70,6 +70,11 @@ #include "rlshell.h" #include "xmalloc.h" +#if defined (__MINGW32__) +# include +# include +#endif + #define CUSTOM_REDISPLAY_FUNC() (rl_redisplay_function != rl_redisplay) #define CUSTOM_INPUT_FUNC() (rl_getc_function != rl_getc) @@ -209,6 +214,20 @@ _rl_get_screen_size (tty, ignore_env) } #endif /* TIOCGWINSZ */ + /* For MinGW, we get the console size from the Windows API. */ +#if defined (__MINGW32__) + HANDLE hConOut = GetStdHandle (STD_OUTPUT_HANDLE); + if (hConOut != INVALID_HANDLE_VALUE) + { + CONSOLE_SCREEN_BUFFER_INFO scr; + if (GetConsoleScreenBufferInfo (hConOut, &scr)) + { + _rl_screenwidth = scr.dwSize.X; + _rl_screenheight = scr.srWindow.Bottom - scr.srWindow.Top + 1; + } + } +#endif + #if defined (__EMX__) _emx_get_screensize (&_rl_screenwidth, &_rl_screenheight); #endif -- 2.30.2