diff options
| author | Christopher Faylor <me@cgf.cx> | 2014-01-31 04:23:22 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2014-01-31 04:23:22 +0000 |
| commit | 63b1a850b3347230b1660f3b3f02f05b8c535cd7 (patch) | |
| tree | 477d4219f896b6fd84f452404ca21179ce2665b9 /winsup/cygwin/fhandler_console.cc | |
| parent | ed94d4a4aa8ee4cd5c863c6ce38ea15c64508c43 (diff) | |
| download | cygnal-63b1a850b3347230b1660f3b3f02f05b8c535cd7.tar.gz cygnal-63b1a850b3347230b1660f3b3f02f05b8c535cd7.tar.bz2 cygnal-63b1a850b3347230b1660f3b3f02f05b8c535cd7.zip | |
* fhandler.h (cltype): Add cl_buf_beg, cl_buf_end.
* fhandler_console.cc (dev_console::console_attrs::set_cl_x): Honor buffer
locations.
(dev_console::console_attrs::set_cl_y): Ditto.
(fhandler_console::write): On reset, use absolute positioning to go to
beginning of buffer. Clear entire buffer.
Diffstat (limited to 'winsup/cygwin/fhandler_console.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_console.cc | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 4228ffabb..caaf5eae2 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -42,14 +42,6 @@ details. */ #define ALT_PRESSED (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED) #define CTRL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) -/* - * Scroll the screen context. - * x1, y1 - ul corner - * x2, y2 - dr corner - * xn, yn - new ul corner - * Negative values represents current screen dimensions - */ - #define dev_state (shared_console_info->dev_state) #define srTop (dev_state.info.winTop + dev_state.scroll_region.Top) #define srBottom ((dev_state.scroll_region.Bottom < 0) ? dev_state.info.winBottom : dev_state.info.winTop + dev_state.scroll_region.Bottom) @@ -768,6 +760,12 @@ dev_console::fillin_info (HANDLE h) return ret; } +/* Scroll the screen context. + x1, y1 - ul corner + x2, y2 - dr corner + xn, yn - new ul corner + Negative values represents current screen dimensions +*/ void fhandler_console::scroll_screen (int x1, int y1, int x2, int y2, int xn, int yn) { @@ -1193,20 +1191,26 @@ dev_console::set_default_attr () int dev_console::console_attrs::set_cl_x (cltype x) { - if (x == cl_disp_beg) + if (x == cl_disp_beg || x == cl_buf_beg) return 0; if (x == cl_disp_end) return dwWinSize.X - 1; + if (x == cl_buf_end) + return dwBufferSize.X - 1; return dwCursorPosition.X; } int dev_console::console_attrs::set_cl_y (cltype y) { - if (y == cl_disp_end) - return winBottom; + if (y == cl_buf_beg) + return 0; if (y == cl_disp_beg) return winTop; + if (y == cl_disp_end) + return winBottom; + if (y == cl_buf_end) + return dwBufferSize.Y - 1; return dwCursorPosition.Y; } @@ -2164,8 +2168,8 @@ fhandler_console::write (const void *vsrc, size_t len) dev_state.vt100_graphics_mode_G0 = false; dev_state.vt100_graphics_mode_G1 = false; dev_state.iso_2022_G1 = false; - clear_screen (cl_disp_beg, cl_disp_beg, cl_disp_end, cl_disp_end); - cursor_set (true, 0, 0); + cursor_set (false, 0, 0); + clear_screen (cl_buf_beg, cl_buf_beg, cl_buf_end, cl_buf_end); dev_state.state_ = normal; } else if (*src == '8') /* DECRC Restore cursor position */ |