installer box drawing

Author: braindigitalis

BOOTFLOW.md

@@ -133,7 +133,7 @@ After filesystems are ready, `init_process()` loads the first userland BASIC pro
 void init_process()
 {
     process_by_pid = hashmap_new(...);
-    process_t* init = proc_load("/programs/init", current_console, 0, "/");
+    process_t* init = proc_load("/programs/init", 0, "/");
     if (!init) {
         preboot_fail("/programs/init missing or invalid!\n");
     }

include/basic/context.h

@@ -204,11 +204,6 @@ typedef struct basic_ctx {
 	 */
 	struct ub_var_double_array* double_array_variables;
 
-	/**
-	 * @brief Console object used for I/O operations in the program.
-	 */
-	struct console* cons;
-
 	/**
 	 * @brief Expected return type of the function being executed.
 	 *
@@ -308,7 +303,7 @@ typedef struct basic_ctx {
  * @param error Pointer to store any error messages.
  * @return A pointer to the initialized `basic_ctx` context.
  */
-struct basic_ctx* basic_init(const char *program, console* cons, uint32_t pid, const char* file, char** error);
+struct basic_ctx* basic_init(const char *program, uint32_t pid, const char* file, char** error);
 
 /**
  * @brief Destroy the BASIC context and free associated resources.

include/homer.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#define PANIC_BANNER setforeground(current_console, COLOUR_LIGHTYELLOW); \
+#define PANIC_BANNER setforeground(COLOUR_LIGHTYELLOW); \
       kprintf("\n\
               ___  _____ \n\
             .'/,-Y\"     \"~-. \n\
@@ -23,7 +23,7 @@
                   Y   \\          /\n\
                   |    \"x______.^ \n\
                   |           \\ \n\
-\n"); setforeground(current_console, COLOUR_LIGHTWHITE);\
+\n"); setforeground(COLOUR_LIGHTWHITE);\
 kprintf("This is a fatal system error and your system has been halted.\n\
-"); setforeground(current_console, COLOUR_LIGHTRED);
+"); setforeground(COLOUR_LIGHTRED);
 

include/input.h

@@ -54,7 +54,7 @@
  * @param cons Console to read input from.
  * @return 1 if a full line is available, 0 otherwise.
  */
-size_t kinput(size_t maxlen, console* cons);
+size_t kinput(size_t maxlen);
 
 /**
  * @brief Free the internal input buffer associated with a console.
@@ -66,7 +66,7 @@ size_t kinput(size_t maxlen, console* cons);
  *
  * @param cons Console whose input buffer should be freed.
  */
-void kfreeinput(console* cons);
+void kfreeinput();
 
 /**
  * @brief Retrieve the accumulated input string for a console.
@@ -76,4 +76,4 @@ void kfreeinput(console* cons);
  *
  * @warning Do not free the returned pointer directly; use @ref kfreeinput().
  */
-char* kgetinput(console* cons);
+char* kgetinput();

include/installer.h

@@ -41,6 +41,22 @@
  */
 #define EFI_FAT_IMAGE "/efi.fat"
 
+/* Print format for “one glyph” */
+#define GLYPH_FMT               "%s"
+
+/* Double box line-drawing: UTF-8 (U+2550..U+255D) */
+#define CP437_DBL_H             "\xE2\x95\x90"  /* U+2550 ═ */
+#define CP437_DBL_V             "\xE2\x95\x91"  /* U+2551 ║ */
+#define CP437_DBL_TL            "\xE2\x95\x94"  /* U+2554 ╔ */
+#define CP437_DBL_TR            "\xE2\x95\x97"  /* U+2557 ╗ */
+#define CP437_DBL_BL            "\xE2\x95\x9A"  /* U+255A ╚ */
+#define CP437_DBL_BR            "\xE2\x95\x9D"  /* U+255D ╝ */
+
+/* Block fills: UTF-8 (U+2588, U+258C, U+2590) */
+#define CP437_BLOCK_FULL        "\xE2\x96\x88"  /* U+2588 █ */
+#define CP437_BLOCK_HALF_LEFT   "\xE2\x96\x8C"  /* U+258C ▌ */
+#define CP437_BLOCK_HALF_RIGHT  "\xE2\x96\x90"  /* U+2590 ▐ */
+
 /**
  * @brief Mapping of a GPT GUID to user-facing labels
  */
@@ -182,7 +198,7 @@ void centre_text(const char* format, ...) PRINTF_LIKE(1,2);
  *
  * @param warning_message Message to display
  */
-void warning(const char* warning_message);
+void warning(const char* warning_message, const char* subtitle);
 
 /**
  * @brief Align a 64-bit value up to the nearest multiple
@@ -261,3 +277,83 @@ bool prepare_rfs_partition(storage_device_t* dev);
  * @return true if a summary was produced, false on low-level failure
  */
 bool probe_device_summary(const storage_device_t *dev, char *out, size_t out_len, bool *usable);
+
+/**
+ * @brief Draw a double-line CP437 box at a given position.
+ *
+ * Draws a rectangular box using DOS CP437 double line drawing characters.
+ * The box is clipped to the current text grid. The interior is left untouched.
+ * On completion, the cursor is restored to its original position.
+ *
+ * @param x       Left column (0-based).
+ * @param y       Top row (0-based).
+ * @param width   Box width in character cells (must be >= 2 after clipping).
+ * @param height  Box height in character cells (must be >= 2 after clipping).
+ */
+void draw_box_cp437_double(uint64_t x, uint64_t y, uint64_t width, uint64_t height);
+
+/**
+ * @brief Draw a centred double-line CP437 box.
+ *
+ * Computes coordinates to centre a box of the requested dimensions
+ * in the current text area. The actual box position and clipped size
+ * are written back to the provided pointers.
+ *
+ * @param req_w   Requested width in character cells.
+ * @param req_h   Requested height in character cells.
+ * @param out_x   Pointer to store the top-left x position.
+ * @param out_y   Pointer to store the top-left y position.
+ * @param out_w   Pointer to store the actual width drawn.
+ * @param out_h   Pointer to store the actual height drawn.
+ */
+void draw_box_cp437_double_center(uint64_t req_w, uint64_t req_h, uint64_t *out_x, uint64_t *out_y, uint64_t *out_w, uint64_t *out_h);
+
+/**
+ * @brief Draw a bordered CP437 progress bar at (x, y).
+ *
+ * Renders a 3-row widget:
+ *   row 0: top border
+ *   row 1: fill area (blocks)
+ *   row 2: bottom border
+ *
+ * Width includes the border; the interior fill width is (width - 2).
+ * Percent is clamped to [0, 100]. The bar uses half-cell resolution.
+ *
+ * @param x        Left column (0-based).
+ * @param y        Top row (0-based).
+ * @param width    Total width in character cells (must be >= 3 after clipping).
+ * @param percent  Completion percent (0..100).
+ */
+void draw_progress_bar_cp437(uint64_t x, uint64_t y, uint64_t width, uint64_t percent);
+
+/**
+ * @brief Draw a bordered single-line CP437 text box.
+ *
+ * Draws a 3-row box (top border, text row, bottom border) at (x, y) with the
+ * given total width. The interior row is filled with the provided text. If the
+ * text does not fit, it is truncated and an ellipsis "..." is appended when
+ * there is room (inner width >= 3). The cursor position is restored on exit.
+ *
+ * @param x      Left column (0-based).
+ * @param y      Top row (0-based).
+ * @param width  Total box width in cells (must be >= 3 after clipping).
+ * @param text   NUL-terminated string to render inside the box (may be NULL).
+ */
+void draw_text_box_cp437(uint64_t x, uint64_t y, uint64_t width, const char *text);
+
+
+/**
+ * @brief Draw a centred single-line CP437 text box.
+ *
+ * Thin wrapper around draw_text_box_cp437(). When the text fits, it is padded
+ * with leading spaces so that it appears centred within the box. When it does
+ * not fit, the truncation/ellipsis logic of draw_text_box_cp437() applies.
+ *
+ * @param x      Left column (0-based).
+ * @param y      Top row (0-based).
+ * @param width  Total box width in cells (must be >= 3 after clipping).
+ * @param text   NUL-terminated string to render inside the box (may be NULL).
+ */
+void draw_text_box_cp437_center(uint64_t x, uint64_t y, uint64_t width, const char *text);
+
+void new_page(const char* title);

include/keyboard.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include <stdnoreturn.h>
+
 /**
  * @brief Delay before held keys begin to auto-repeat.
  *
@@ -89,7 +91,7 @@ void init_keyboard();
  * @return ASCII character or extended key constant,
  *         or 255 if no input is available.
  */
-unsigned char kgetc(console* cons);
+unsigned char kgetc();
 
 /**
  * @brief Tests if the CTRL key is currently held down.
@@ -121,4 +123,6 @@ bool caps_lock_on();
 
 void load_keymap_from_string(const char* text);
 
-bool key_waiting();
+bool key_waiting();
+
+_Noreturn void reboot(void);

include/taskswitch.h

@@ -75,7 +75,6 @@ typedef struct process_t {
 	const char*		name;       /**< Filename of program */
 	uint64_t		size;       /**< Size of program in bytes */
 	const char*		csd;        /**< Current selected directory */
-	struct console*		cons;       /**< Associated console */
 	struct basic_ctx*	code;       /**< BASIC interpreter context */
 	struct process_t*	prev;       /**< Previous process in doubly linked list */
 	struct process_t*	next;       /**< Next process in doubly linked list */
@@ -126,7 +125,7 @@ typedef struct idle_timer {
  * @param csd Current selected directory
  * @return process_t* Pointer to new process details
  */
-process_t* proc_load(const char* fullpath, struct console* cons, pid_t parent_pid, const char* csd);
+process_t* proc_load(const char* fullpath, pid_t parent_pid, const char* csd);
 
 /**
  * @brief Find a process by PID.

include/video.h

@@ -72,39 +72,14 @@
 /** @brief Default text colour (white on black). */
 #define DEFAULT_COLOUR COLOUR_WHITE
 
-/**
- * @struct console
- * @brief Represents a text-mode console buffer.
- *
- * Low-level output functions (e.g. put(), putstring()) operate
- * against a console instance. Only one console is active at a time.
- */
-typedef struct {
-	char dirty;              /**< Marks console as modified (needs redraw). */
-	uint8_t x;               /**< Current cursor X position. */
-	uint8_t y;               /**< Current cursor Y position. */
-	uint8_t attributes;      /**< Text attributes (e.g. colours). */
-	uint8_t last;            /**< Last character written. */
-	char* internalbuffer;    /**< Optional backing buffer for console text. */
-	char* buffer;            /**< External buffer, if used. */
-	size_t bufcnt;           /**< Buffer size or counter. */
-} console;
-
 /* -------------------------------------------------------------------------- */
 /* Console text functions                                                     */
 /* -------------------------------------------------------------------------- */
 
 /**
  * @brief Clear the screen and reset cursor to (0,0).
- * @param c Target console.
- */
-void clearscreen(console* c);
-
-/**
- * @brief Set the software cursor to the console's current (x,y).
- * @param c Target console.
  */
-void setcursor(console* c);
+void clearscreen();
 
 /**
  * @brief Write a null-terminated string to the console.
@@ -115,7 +90,7 @@ void setcursor(console* c);
  * @param c Target console.
  * @param message String to display.
  */
-void putstring(console* c, const char* message);
+void putstring(const char* message);
 
 /**
  * @brief Write a string to the debug port (0xE9) only.
@@ -128,10 +103,9 @@ void dputstring(const char* message);
  *
  * Cursor is advanced after output, and the screen may scroll.
  *
- * @param c Target console.
  * @param n Character to display.
  */
-void put(console* c, const char n);
+void put(const char n);
 
 /**
  * @brief Write a single character directly to the debug port (0xE9).
@@ -150,17 +124,15 @@ void init_console();
 
 /**
  * @brief Set the background colour for subsequent text.
- * @param c Target console.
  * @param background VGA colour index (0–15).
  */
-void setbackground(console* c, unsigned char background);
+void setbackground(unsigned char background);
 
 /**
  * @brief Set the foreground (text) colour for subsequent output.
- * @param c Target console.
  * @param foreground VGA colour index (0–15).
  */
-void setforeground(console* c, unsigned char foreground);
+void setforeground(unsigned char foreground);
 
 /* -------------------------------------------------------------------------- */
 /* Screen geometry and framebuffer                                            */
@@ -278,11 +250,3 @@ void set_video_dirty_area(int64_t start, int64_t end);
 
 const char* ansi_colour(char *out, size_t out_len, unsigned char vga_colour, bool background);
 
-/* -------------------------------------------------------------------------- */
-/* Globals                                                                    */
-/* -------------------------------------------------------------------------- */
-
-/**
- * @brief Pointer to the currently active console.
- */
-extern console* current_console;

os/programs/charmap.rrbasic

@@ -1,4 +1,4 @@
-FOR C = &20 TO &7F
+FOR C = &20 TO &7E
 	COLOR 8
 	PRINT ~C; ": "; 
 	COLOR 15