mirrors/limine
1
0
Fork 0
mirror of https://github.com/limine-bootloader/limine synced 2025-01-21 03:52:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

term: Improve logic of disabling scrolling

Browse Source
This commit is contained in:
mintsuki 2021-07-11 01:51:17 +02:00
parent ed3c866187
commit 50fd990ece
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stage23/drivers/vga_textmode.s2.c
View File

@ -50,9 +50,6 @@ void text_scroll_enable(void) {
}
static void scroll(void) {
if (scroll_enabled == false)
return;
// move the text up by one row
for (size_t i = 0; i <= VIDEO_BOTTOM - VD_COLS; i++) {
current_buffer[i] = current_buffer[i + VD_COLS];
@ -207,9 +204,11 @@ void text_putchar(uint8_t c) {
break;
case '\n':
if (text_get_cursor_pos_y() == (VD_ROWS - 1)) {
if (scroll_enabled) {
clear_cursor();
scroll();
text_set_cursor_pos(0, (VD_ROWS - 1));
}
} else {
text_set_cursor_pos(0, (text_get_cursor_pos_y() + 1));
}
@ -223,8 +222,10 @@ void text_putchar(uint8_t c) {
video_mem[cursor_offset+1] = text_palette;
}
if (cursor_offset >= (VIDEO_BOTTOM - 1)) {
if (scroll_enabled) {
scroll();
cursor_offset = VIDEO_BOTTOM - (VD_COLS - 1);
}
} else {
cursor_offset += 2;
}

7
stage23/lib/gterm.c
View File

@ -276,9 +276,6 @@ void gterm_scroll_enable(void) {
}
static void scroll(void) {
if (scroll_enabled == false)
return;
clear_cursor();
for (int i = cols; i < rows * cols; i++) {
@ -402,8 +399,10 @@ void gterm_putchar(uint8_t c) {
break;
case '\n':
if (cursor_y == (rows - 1)) {
if (scroll_enabled) {
gterm_set_cursor_pos(0, rows - 1);
scroll();
}
} else {
gterm_set_cursor_pos(0, cursor_y + 1);
}
@ -415,7 +414,7 @@ void gterm_putchar(uint8_t c) {
ch.fg = text_fg;
ch.bg = text_bg;
plot_char_grid(&ch, cursor_x++, cursor_y);
if (cursor_x == cols) {
if (cursor_x == cols && (cursor_y < rows - 1 || scroll_enabled)) {
cursor_x = 0;
cursor_y++;
}