curds/boredos_mirror
1
0
Fork 0
mirror of https://github.com/BoredDevNL/BoredOS.git synced 2026-05-15 10:48:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactor command input handling in terminal.c

Browse source
This commit is contained in:
Lluciocc 2026-04-17 12:06:31 +02:00 committed by GitHub
parent c4562e8778
commit d00eed4e13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 54 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/userland/gui/terminal.c
View file

@ -667,24 +667,37 @@ static void draw_session(TerminalSession *s) {
line_cols = g_cols; line_cols = g_cols;
} }
} }
for (int col = 0; col < g_cols; col++) {
char ch = ' '; int input_start = s->cursor_col - s->input_len;
uint32_t color = s->fg_color; if (input_start < 0) input_start = 0;
if (line && col < line_cols) { if (input_start >= g_cols) input_start = g_cols - 1;
ch = line[col].c;
if (ch == 0) ch = ' '; // lenght of a command
color = line[col].color;
}
if (s->scroll_offset == 0 && row == s->cursor_row) {
int cmd_len = 0; int cmd_len = 0;
while (cmd_len < s->input_len && while (cmd_len < s->input_len &&
s->current_input[cmd_len] != ' ') { s->current_input[cmd_len] != ' ') {
cmd_len++; cmd_len++;
} }
if (col < cmd_len) {
int input_end = input_start + cmd_len;
if (input_end > g_cols) input_end = g_cols;
for (int col = 0; col < g_cols; col++) {
char ch = ' ';
uint32_t color = s->fg_color;
if (line && col < line_cols) {
ch = line[col].c;
if (ch == 0) ch = ' ';
color = line[col].color;
}
if (s->scroll_offset == 0 && row == s->cursor_row) {
if (col >= input_start && col < input_end) {
color = s->input_color; color = s->input_color;
} }
} }
char str[2] = { ch, 0 }; char str[2] = { ch, 0 };
int x = col * CHAR_W; int x = col * CHAR_W;
int y = base_y + row * g_line_h; int y = base_y + row * g_line_h;
@ -826,6 +839,39 @@ static bool command_exists(const char *cmd) {
return false; return false;
} }
static bool command_starts_with(const char *prefix) {
if (!prefix || !prefix[0]) return false;
FAT32_FileInfo entries[128];
int count = sys_list("/bin", entries, 128);
if (count <= 0) return false;
for (int i = 0; i < count; i++) {
if (entries[i].is_directory) {
continue;
}
char name[256];
str_copy(name, entries[i].name, sizeof(name));
int len = (int)strlen(name);
if (len > 4 && strcmp(name + len - 4, ".elf") == 0) {
name[len - 4] = 0;
}
int j = 0;
while (prefix[j] && name[j] && prefix[j] == name[j]) {
j++;
}
if (prefix[j] == 0) {
return true;
}
}
return false;
}
static void update_input_color(TerminalSession *s) { static void update_input_color(TerminalSession *s) {
if (s->input_len == 0) { if (s->input_len == 0) {
s->input_color = 0xFFFFFFFF; s->input_color = 0xFFFFFFFF;
@ -845,6 +891,8 @@ static void update_input_color(TerminalSession *s) {
if (command_exists(cmd)) { if (command_exists(cmd)) {
s->input_color = 0xFF55FF55; // green s->input_color = 0xFF55FF55; // green
} else if (command_starts_with(cmd)) {
s->input_color = 0xFFFFFF55; // yellow
} else { } else {
s->input_color = 0xFFFF5555; // red s->input_color = 0xFFFF5555; // red
} }