Skip to content

Windows: Correct result of Terminal::size #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
murarth wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Windows: Correct result of Terminal::size #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57c8301
Windows: Correct result of `Terminal::size`
murarth Jan 22, 2020
68456c5
Add 1 to console lines and columns setting
murarth Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions src/windows/terminal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use winapi::um::consoleapi::{
SetConsoleMode,
};
use winapi::um::handleapi::{
CloseHandle,
CloseHandle, INVALID_HANDLE_VALUE,
};
use winapi::um::processenv::{
GetStdHandle,
Expand Down Expand Up @@ -1019,7 +1019,13 @@ unsafe fn console_mode(handle: HANDLE) -> io::Result<DWORD> {
unsafe fn console_size(handle: HANDLE) -> io::Result<Size> {
let info = console_info(handle)?;

Ok(coord_to_size(info.dwSize))
let lines = (info.srWindow.Right - info.srWindow.Left + 1) as usize;
let columns = (info.srWindow.Bottom - info.srWindow.Top + 1) as usize;

Ok(Size {
lines,
columns,
})
}

unsafe fn set_console_mode(handle: HANDLE, mode: DWORD) -> io::Result<()> {
Expand Down Expand Up @@ -1102,13 +1108,6 @@ fn coord_to_cursor(pos: COORD) -> Cursor {
}
}

fn coord_to_size(size: COORD) -> Size {
Size{
lines: size.Y as usize,
columns: size.X as usize,
}
}

fn cursor_to_coord(pos: Cursor) -> COORD {
COORD{
Y: to_short(pos.line),
Expand All @@ -1118,8 +1117,8 @@ fn cursor_to_coord(pos: Cursor) -> COORD {

fn size_to_coord(size: Size) -> COORD {
COORD{
Y: to_short(size.lines),
X: to_short(size.columns),
Y: to_short(size.lines + 1),
X: to_short(size.columns + 1),
}
}

Expand Down Expand Up @@ -1257,7 +1256,7 @@ fn result_bool(b: BOOL) -> io::Result<()> {
}

fn result_handle(ptr: HANDLE) -> io::Result<HANDLE> {
if ptr.is_null() {
if ptr == INVALID_HANDLE_VALUE {
Err(io::Error::last_os_error())
} else {
Ok(ptr)
Expand Down