Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Terminal: Don't wrap cursor right after x == cols 

This prevents scrolling when bottom right scroll is written to
This commit is contained in:
Bananymous 2025-04-23 19:25:10 +03:00
parent a8edb8870e
commit 12b9c82086
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
userspace/programs/Terminal/Terminal.cpp
View File

@ -185,6 +185,8 @@ void Terminal::run()
void Terminal::hide_cursor() void Terminal::hide_cursor()
{ {
if (m_cursor.x == cols())
return;
const uint32_t cursor_base_x = m_cursor.x * m_font.width(); const uint32_t cursor_base_x = m_cursor.x * m_font.width();
const uint32_t cursor_base_y = m_cursor.y * m_font.height(); const uint32_t cursor_base_y = m_cursor.y * m_font.height();
for (uint32_t y = 0; y < m_font.height(); y++) for (uint32_t y = 0; y < m_font.height(); y++)
@ -195,6 +197,8 @@ void Terminal::hide_cursor()
void Terminal::show_cursor() void Terminal::show_cursor()
{ {
if (m_cursor.x == cols())
return;
const uint32_t cursor_base_x = m_cursor.x * m_font.width(); const uint32_t cursor_base_x = m_cursor.x * m_font.width();
const uint32_t cursor_base_y = m_cursor.y * m_font.height(); const uint32_t cursor_base_y = m_cursor.y * m_font.height();
for (uint32_t y = 0; y < m_font.height(); y++) for (uint32_t y = 0; y < m_font.height(); y++)
@ -563,6 +567,20 @@ Rectangle Terminal::putcodepoint(uint32_t codepoint)
break; break;
default: default:
{ {
if (m_cursor.x >= cols())
{
m_cursor.x = 0;
m_cursor.y++;
}
if (m_cursor.y >= rows())
{
const uint32_t scroll = m_cursor.y - rows() + 1;
m_cursor.y -= scroll;
m_window->shift_vertical(-scroll * (int32_t)m_font.height(), m_bg_color);
should_invalidate = { 0, 0, m_window->width(), m_window->height() };
}
const uint32_t cell_w = m_font.width(); const uint32_t cell_w = m_font.width();
const uint32_t cell_h = m_font.height(); const uint32_t cell_h = m_font.height();
const uint32_t cell_x = m_cursor.x * cell_w; const uint32_t cell_x = m_cursor.x * cell_w;
@ -580,12 +598,6 @@ Rectangle Terminal::putcodepoint(uint32_t codepoint)
} }
} }
if (m_cursor.x >= cols())
{
m_cursor.x = 0;
m_cursor.y++;
}
if (m_cursor.y >= rows()) if (m_cursor.y >= rows())
{ {
const uint32_t scroll = m_cursor.y - rows() + 1; const uint32_t scroll = m_cursor.y - rows() + 1;