Add MessageBoxf() GUI function to display a message with formatted text.

Make a little more sense of files which rely on SDL_picofont.h vs picofont.h - These files and their slightly-different functions should be modified and merged in the future.

Author: tthomps

MyOS_1/Graphics/Display_HAL.c

@@ -1,6 +1,5 @@
 #include "Display_HAL.h"
 #include "../Drivers/Bochs_VGA.h"
-#include "picofont.h"
 #include "../multiboot.h"
 #include "../misc.h"
 #include "Graphical_Terminal.h"

MyOS_1/Graphics/Graphical_Terminal.c

@@ -2,6 +2,7 @@
 #include "../Terminal.h"
 #include "../misc.h"
 #include "../printf.h"
+#include "picofont.h"
 #include "Bitmap.h"
 
 // TODO: Support multiple graphical terminals

MyOS_1/Graphics/Graphical_Terminal.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "Display_HAL.h"
-#include "picofont.h"
 
 // TODO: Support higher resolutions
 #define MAX_X_RES       800

MyOS_GUI_Shell/GUI_TerminalWindow.cpp

@@ -9,7 +9,6 @@ extern "C" {
 #endif
 
 #include <string.h>
-#include "../MyOS_1/Graphics/picofont.h"
 
 GUI_TerminalWindow::GUI_TerminalWindow(const char *name)
     : GUI_Window(NewWindowPosition(GUI_TERMINAL_DEFAULT_WIDTH, GUI_TERMINAL_DEFAULT_HEIGHT), name)

MyOS_GUI_Shell/GUI_TerminalWindow.h

@@ -6,37 +6,12 @@ extern "C" {
 
 #include "GUI_Window.h"
 #include "MyOS_GUI_Shell.h"
-#include "../MyOS_1/Graphics/picofont.h"
 
 #define GUI_TERMINAL_DEFAULT_BUFFER_SIZE    4096
 #define GUI_TERMINAL_DEFAULT_TEXT_COLOR     {255,   255,    255,    255}
 #define GUI_TERMINAL_DEFAULT_BG_COLOR       {40,     40,     40,    255}
 
 
-#ifndef FNT_FONTHEIGHT
-#define FNT_FONTHEIGHT  8
-#endif
-#ifndef FNT_FONTWIDTH
-#define FNT_FONTWIDTH   8
-#endif
-#ifndef FNT_ROWSPACING
-#define FNT_ROWSPACING  3
-#endif
-
-#ifndef FNT_xy
-typedef struct
-{
-    int x;
-    int y;
-}FNT_xy;
-#endif
-
-// put some margins around the borders
-#ifndef FNT_LEFTRIGHTMARGIN
-#define FNT_LEFTRIGHTMARGIN     3
-#define FNT_TOPBOTTOMMARGIN     3
-#endif
-
 #define GUI_TERMINAL_DEFAULT_COLUMNS    80
 #define GUI_TERMINAL_DEFAULT_ROWS       60
 #define GUI_TERMINAL_DEFAULT_WIDTH      ((GUI_TERMINAL_DEFAULT_COLUMNS + 1) * FNT_FONTWIDTH)
@@ -55,7 +30,7 @@ class GUI_TerminalWindow :
     void PutChar(char c);
     void PutEntryAt(char c, size_t x, size_t y);
 
-    // Font functions from picofont by 
+    // Font functions from picofont by Fredrik Hultin
     FNT_xy FNT_Generate(const char* text, unsigned int len, unsigned int w, uint32_t *pixels, FNT_xy position);
     void FNT_Render(const char* text, FNT_xy position);
     void FNT_RenderMax(const char* text, unsigned int len, FNT_xy position);

MyOS_GUI_Shell/GUI_Window.h

@@ -2,6 +2,7 @@
 #include "GUI_Object.h"
 #include "GUI_Rect.h"
 #include "GUI_Control.h"
+#include "SDL_picofont.h"
 
 #define MAX_WINDOW_NAME_LENGTH  64
 #define SYSTEM_MENU_CLOSE_BUTTON_ID (uint32_t)-1

MyOS_GUI_Shell/MyOS_GUI_Shell.cpp

@@ -9,6 +9,7 @@ extern "C" {
 #ifndef WIN32
 #include "../MyOS_1/Console_VGA.h"
 #include "../MyOS_1/Interrupts/System_Calls.h"
+#include "../MyOS_1/printf.h"
 //#undef _MSVC_VER
 #undef _WIN32
 //#define HAVE_LIBC 0
@@ -322,6 +323,30 @@ void MessageBox(char *messageText, char *windowTitle)
         __halt();
 }
 
+// Display MessageBox with printf-like ability
+// TODO: don't require any memory allocation so we can show out-of-memory errors
+void MessageBoxf(char *windowTitle, char *messageFormat, ...)
+{
+    for (int i = 0; i < MAX_GUI_WINDOWS; ++i)
+    {
+        if (!windowList[i])
+        {
+            char buffer[128] = { 0 };
+            va_list va;
+            va_start(va, messageFormat);
+            const int ret = vsnprintf(buffer, 128, messageFormat, va);
+            va_end(va);
+
+            windowList[i] = new GUI_MessageBox(buffer, windowTitle);
+            AddWindowToStack(windowList[i], &windowStack[i]);
+            return;
+        }
+    }
+    printf("No free spot for window\n");
+    for (;;)
+        __halt();
+}
+
 // Called by windows when they want to be destroyed
 void Shell_Destroy_Window(GUI_Window *pWindow)
 {
@@ -531,6 +556,7 @@ int main(int argc, char* argv[])
                             done = true;
                             break;
                         default:
+                            MessageBoxf("Key pressed", "Scan code: 0x%X - %c", event.key.keysym.scancode, event.key.keysym.sym);
                             if (pStackTop)
                                 pStackTop->pWindow->SendChar(event.key.keysym.sym);
                             break;

MyOS_GUI_Shell/MyOS_GUI_Shell.h

@@ -22,6 +22,7 @@ GUI_Window *CreateTextWindow(uint32_t uniqueID, const char *windowName);
 GUI_Window *GetWindowFromID(uint32_t uniqueID);
 GUI_Rect NewWindowPosition(int x, int y);
 void MessageBox(char *messageText, char *windowTitle);
+void MessageBoxf(char *windowTitle, char *messageFormat, ...);
 void Shell_Destroy_Window(GUI_Window *pWindow);
 
 

MyOS_GUI_Shell/SDL_picofont.h

@@ -33,6 +33,12 @@ extern "C" {
 #define FNT_LEFTRIGHTMARGIN     3
 #define FNT_TOPBOTTOMMARGIN     3
 
+typedef struct
+{
+    int x;
+    int y;
+}FNT_xy;
+
 SDL_Surface* FNT_Render(const char* text, SDL_Color color);
 SDL_Surface* FNT_RenderMax(const char* text, unsigned int len, SDL_Color color);
 

MyOS_GUI_Shell/spf.c

@@ -18,15 +18,6 @@ extern "C" {
 
 //#include <string.h>
 
-#define FNT_FONTHEIGHT 8
-#define FNT_FONTWIDTH 8
-
-typedef struct
-{
-	int x;
-	int y;
-}FNT_xy;
-
 FNT_xy FNT_Generate(const char* text, unsigned int len, unsigned int w, unsigned char* pixels)
 {
 	unsigned int i, x, y, col, row, stop;