added builtin commands to the stlxterm emulator

FlareCoding · FlareCoding · commit 611792a9f3a3 · 2025-06-26T14:31:02.000-07:00
diff --git a/userland/apps/stlxterm/include/builtin_commands.h b/userland/apps/stlxterm/include/builtin_commands.h
@@ -0,0 +1,33 @@
+#ifndef STLXTERM_BUILTIN_COMMANDS_H
+#define STLXTERM_BUILTIN_COMMANDS_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "terminal.h"
+
+// Built-in command function type
+typedef int (*builtin_command_func_t)(terminal_t* term, int argc, char* argv[]);
+
+// Built-in command structure
+typedef struct {
+    const char* name;
+    const char* description;
+    builtin_command_func_t func;
+} builtin_command_t;
+
+// Built-in command functions
+int cmd_echo(terminal_t* term, int argc, char* argv[]);
+int cmd_clear(terminal_t* term, int argc, char* argv[]);
+int cmd_getpid(terminal_t* term, int argc, char* argv[]);
+int cmd_help(terminal_t* term, int argc, char* argv[]);
+
+// Command processing functions
+void process_command(terminal_t* term, const char* command_line);
+int execute_builtin_command(terminal_t* term, const char* command, int argc, char* argv[]);
+void split_command_line(const char* line, char* argv[], int max_args, int* argc);
+
+// Available built-in commands
+extern const builtin_command_t builtin_commands[];
+extern const int builtin_command_count;
+
+#endif // STLXTERM_BUILTIN_COMMANDS_H
diff --git a/userland/apps/stlxterm/include/terminal.h b/userland/apps/stlxterm/include/terminal.h
@@ -88,6 +88,11 @@ typedef struct {
     // Output buffer (for child process communication)
     char output_buffer[4096];
     int output_buffer_pos;
+    
+    // Command line handling
+    char command_line[1024];
+    int command_line_pos;
+    bool command_ready;
 } terminal_t;
 
 // Function prototypes
diff --git a/userland/apps/stlxterm/src/builtin_commands.c b/userland/apps/stlxterm/src/builtin_commands.c
@@ -0,0 +1,192 @@
+#define _POSIX_C_SOURCE 199309L
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+#include "builtin_commands.h"
+
+// Built-in command implementations
+
+// Echo command - prints its arguments
+int cmd_echo(terminal_t* term, int argc, char* argv[]) {
+    if (!term) {
+        return -1;
+    }
+    
+    // Print all arguments separated by spaces
+    for (int i = 1; i < argc; i++) {
+        if (i > 1) {
+            terminal_write_string(term, " ");
+        }
+        terminal_write_string(term, argv[i]);
+    }
+    
+    // Add newline at the end
+    terminal_write_string(term, "\r\n");
+    
+    return 0;
+}
+
+// Clear command - clears the terminal screen
+int cmd_clear(terminal_t* term, int argc, char* argv[]) {
+    (void)argc; // Unused parameter
+    (void)argv; // Unused parameter
+    
+    if (!term) {
+        return -1;
+    }
+    
+    terminal_clear_screen(term);
+    return 0;
+}
+
+// Getpid command - prints the current process ID
+int cmd_getpid(terminal_t* term, int argc, char* argv[]) {
+    (void)argc; // Unused parameter
+    (void)argv; // Unused parameter
+    
+    if (!term) {
+        return -1;
+    }
+    
+    pid_t pid = getpid();
+    char pid_str[32];
+    snprintf(pid_str, sizeof(pid_str), "%d\r\n", (int)pid);
+    terminal_write_string(term, pid_str);
+    
+    return 0;
+}
+
+// Help command - shows available built-in commands
+int cmd_help(terminal_t* term, int argc, char* argv[]) {
+    (void)argc; // Unused parameter
+    (void)argv; // Unused parameter
+    
+    if (!term) {
+        return -1;
+    }
+    
+    terminal_write_string(term, "Available built-in commands:\r\n");
+    terminal_write_string(term, "============================\r\n");
+    
+    for (int i = 0; i < builtin_command_count; i++) {
+        char help_line[256];
+        snprintf(help_line, sizeof(help_line), "  %-10s - %s\r\n", 
+                builtin_commands[i].name, builtin_commands[i].description);
+        terminal_write_string(term, help_line);
+    }
+    
+    terminal_write_string(term, "\r\n");
+    return 0;
+}
+
+// Command processing functions
+
+// Split a command line into arguments
+void split_command_line(const char* line, char* argv[], int max_args, int* argc) {
+    if (!line || !argv || !argc || max_args <= 0) {
+        if (argc) *argc = 0;
+        return;
+    }
+    
+    *argc = 0;
+    
+    // Make a copy of the line since we need to modify it
+    char* line_copy = malloc(strlen(line) + 1);
+    if (!line_copy) {
+        if (argc) *argc = 0;
+        return;
+    }
+    strcpy(line_copy, line);
+    
+    char* p = line_copy;
+    
+    // Skip leading whitespace
+    while (*p && (*p == ' ' || *p == '\t')) {
+        p++;
+    }
+    
+    while (*p && *argc < max_args - 1) {
+        argv[*argc] = p;
+        (*argc)++;
+        
+        // Find end of argument
+        while (*p && *p != ' ' && *p != '\t') {
+            p++;
+        }
+        
+        // Null-terminate the argument
+        if (*p) {
+            *p = '\0';
+            p++;
+        }
+        
+        // Skip whitespace
+        while (*p && (*p == ' ' || *p == '\t')) {
+            p++;
+        }
+    }
+    
+    argv[*argc] = NULL; // Null-terminate the argument list
+}
+
+// Execute a built-in command
+int execute_builtin_command(terminal_t* term, const char* command, int argc, char* argv[]) {
+    if (!term || !command) {
+        return -1;
+    }
+    
+    // Find the command
+    for (int i = 0; i < builtin_command_count; i++) {
+        if (strcmp(command, builtin_commands[i].name) == 0) {
+            return builtin_commands[i].func(term, argc, argv);
+        }
+    }
+    
+    // Command not found
+    char error_msg[256];
+    snprintf(error_msg, sizeof(error_msg), "Command not found: %s\r\n", command);
+    terminal_write_string(term, error_msg);
+    return -1;
+}
+
+// Process a complete command line
+void process_command(terminal_t* term, const char* command_line) {
+    if (!term || !command_line) {
+        return;
+    }
+    
+    // Skip empty lines
+    if (strlen(command_line) == 0) {
+        return;
+    }
+    
+    char* argv[32];
+    int argc = 0;
+    
+    // Split the command line into arguments
+    split_command_line(command_line, argv, 32, &argc);
+    
+    if (argc > 0) {
+        // Execute the command
+        execute_builtin_command(term, argv[0], argc, argv);
+        
+        // Free the allocated memory
+        if (argv[0]) {
+            free(argv[0]);
+        }
+    }
+}
+
+// Built-in commands table
+const builtin_command_t builtin_commands[] = {
+    {"echo", "Print arguments to the terminal", cmd_echo},
+    {"clear", "Clear the terminal screen", cmd_clear},
+    {"getpid", "Print the current process ID", cmd_getpid},
+    {"help", "Show available built-in commands", cmd_help}
+};
+
+const int builtin_command_count = sizeof(builtin_commands) / sizeof(builtin_commands[0]);
diff --git a/userland/apps/stlxterm/src/terminal.c b/userland/apps/stlxterm/src/terminal.c
@@ -11,6 +11,7 @@
 #include <stlxgfx/stlxgfx.h>
 
 #include "terminal.h"
+#include "builtin_commands.h"
 
 // Default colors
 #define DEFAULT_FG_COLOR 0xFFE0E0E0  // Light gray
@@ -159,6 +160,11 @@ void terminal_reset(terminal_t* term) {
     // Reset buffers
     term->input_buffer_pos = 0;
     term->output_buffer_pos = 0;
+    
+    // Reset command line
+    term->command_line_pos = 0;
+    term->command_ready = false;
+    memset(term->command_line, 0, sizeof(term->command_line));
 }
 
 // Main terminal loop
@@ -265,15 +271,41 @@ void terminal_handle_event(terminal_t* term, const stlxgfx_event_t* event) {
                     term->state.cursor_x--;
                     terminal_write_char(term, ' '); // Clear the character
                     term->state.cursor_x--; // Move back again
+                    
+                    // Also remove from command line buffer
+                    if (term->command_line_pos > 0) {
+                        term->command_line_pos--;
+                        term->command_line[term->command_line_pos] = '\0';
+                    }
                 }
                 needs_redraw = true;
             } else if (event->udata1 == 0x28) { // Enter
                 terminal_write_char(term, '\r');
                 terminal_write_char(term, '\n');
+                
+                // Process the command
+                if (term->command_line_pos > 0) {
+                    process_command(term, term->command_line);
+                    
+                    // Reset command line
+                    term->command_line_pos = 0;
+                    memset(term->command_line, 0, sizeof(term->command_line));
+                }
+                
+                // Show new prompt
+                terminal_write_string(term, "$ ");
+                
                 needs_redraw = true;
             } else if (ascii_char >= 32 && ascii_char <= 126) {
                 // Handle printable characters
                 terminal_write_char(term, (char)ascii_char);
+                
+                // Add to command line buffer
+                if (term->command_line_pos < (int)sizeof(term->command_line) - 1) {
+                    term->command_line[term->command_line_pos] = (char)ascii_char;
+                    term->command_line_pos++;
+                }
+                
                 needs_redraw = true;
             }
             break;
