Skip to content
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.

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

Explicit narrow cast to short #505

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
15 changes: 7 additions & 8 deletions clink/terminal/src/win_screen_buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ void win_screen_buffer::set_cursor(int column, int row)
int width = (window.Right - window.Left) + 1;
int height = (window.Bottom - window.Top) + 1;

column = clamp(column, 0, width);
row = clamp(row, 0, height);
SHORT s_column = clamp(column, 0, width);
SHORT s_row = clamp(row, 0, height);

COORD xy = { window.Left + column, window.Top + row };
COORD xy = { window.Left + s_column, window.Top + s_row };
SetConsoleCursorPosition(m_handle, xy);
}

Expand All @@ -172,11 +172,10 @@ void win_screen_buffer::move_cursor(int dx, int dy)
CONSOLE_SCREEN_BUFFER_INFO csbi;
GetConsoleScreenBufferInfo(m_handle, &csbi);

COORD xy = {
clamp(csbi.dwCursorPosition.X + dx, 0, csbi.dwSize.X - 1),
clamp(csbi.dwCursorPosition.Y + dy, 0, csbi.dwSize.Y - 1),
};
SetConsoleCursorPosition(m_handle, xy);
SHORT s_dx = clamp(csbi.dwCursorPosition.X + dx, 0, csbi.dwSize.X - 1);
SHORT s_dy = clamp(csbi.dwCursorPosition.Y + dy, 0, csbi.dwSize.Y - 1);

SetConsoleCursorPosition(m_handle, { s_dx, s_dy });
}

//------------------------------------------------------------------------------
Expand Down