diff options
| author | Christopher Faylor <me@cgf.cx> | 2014-05-09 18:28:48 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2014-05-09 18:28:48 +0400 |
| commit | fb1565af68af4aebff40c7c7917a51970f749b72 (patch) | |
| tree | 2684608fe40fbeea26201794b9baf6bf11fb2732 /winsup/cygwin/fhandler_console.cc | |
| parent | 7bc7b551f5db91328a59593287d2f6c2249ee231 (diff) | |
* signal.cc (sigprocmask): Fix strace output to include "how".
* fhandler_console.cc (dev_console::save_restore): Only current dwEnd line
rather than the one after that.
Diffstat (limited to 'winsup/cygwin/fhandler_console.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_console.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 27471581a..44ee1c404 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -84,6 +84,7 @@ fhandler_console::open_shared_console (HWND hw, HANDLE& h, bool& create) create = m != SH_JUSTOPEN; return res; } + class console_unit { int n; @@ -1457,7 +1458,7 @@ dev_console::save_restore (HANDLE h, char c) { fillin (h); save_bufsize.X = b.dwSize.X; - if ((save_bufsize.Y = dwEnd.Y + 2) > b.dwSize.Y) + if ((save_bufsize.Y = dwEnd.Y + 1) > b.dwSize.Y) save_bufsize.X = b.dwSize.Y; if (save_buf) @@ -1500,6 +1501,7 @@ dev_console::save_restore (HANDLE h, char c) cob.X = 0; cob.Y = save_top; + /* CGF: NOOP? Doesn't seem to position screen as expected */ /* Temporarily position at top of screen */ if (!SetConsoleCursorPosition (h, cob)) debug_printf ("SetConsoleCursorInfo(%p, cob) failed during restore, %E", h); @@ -1677,23 +1679,23 @@ fhandler_console::char_command (char c) if (con.saw_space) { CONSOLE_CURSOR_INFO console_cursor_info; - GetConsoleCursorInfo (get_output_handle (), & console_cursor_info); + GetConsoleCursorInfo (get_output_handle (), &console_cursor_info); switch (con.args[0]) { case 0: /* blinking block */ case 1: /* blinking block (default) */ case 2: /* steady block */ console_cursor_info.dwSize = 100; - SetConsoleCursorInfo (get_output_handle (), & console_cursor_info); + SetConsoleCursorInfo (get_output_handle (), &console_cursor_info); break; case 3: /* blinking underline */ case 4: /* steady underline */ console_cursor_info.dwSize = 10; /* or Windows default 25? */ - SetConsoleCursorInfo (get_output_handle (), & console_cursor_info); + SetConsoleCursorInfo (get_output_handle (), &console_cursor_info); break; default: /* use value as percentage */ console_cursor_info.dwSize = con.args[0]; - SetConsoleCursorInfo (get_output_handle (), & console_cursor_info); + SetConsoleCursorInfo (get_output_handle (), &console_cursor_info); break; } } |