Include a message to send text to a windowed terminal application.

Update the printf_interrupt_handler() to send text to a windowed application if there's a GUI running.
Resize a message box if the text won't fit.
Add some graphics for minimize and maximize buttons to the system menu (they aren't active yet).
Add Resize() function to GUI_Window.
Create GetWindowFromID() to get a GUI_Window pointer from a PID.

Author: tthomps

MyOS_1/Build_Number.h

@@ -3,4 +3,4 @@
 // Define a build number. This number will be incremented by a simple console program called by a post-build event
 // It's put here in its own file to keep the other program from messing up the source
 #define \
-BUILD_NUMBER 5746
+BUILD_NUMBER 5778

MyOS_1/GUI_Kernel.c

@@ -1,9 +1,26 @@
+#include <stdarg.h>
 #include "GUI_Kernel.h"
 #include "GUI_Messages.h"
 #include "Tasks/Context.h"
+#include "printf.h"
 
 GUI_CALLBACK guiCallback = NULL;
 
+// Send a formatted text string to the console window for the currently running application
+int GUI_printf(const char *format, va_list va)
+{
+    GUI_CONSOLE_PRINT_DATA param;
+    char outString[MAX_GUI_CONSOLE_STRING_LENGTH];
+
+    int returnValue = vsnprintf(outString, MAX_GUI_CONSOLE_STRING_LENGTH, format, va);
+
+    param.textString = outString;
+
+    (*guiCallback)(tasks[currentTask].PID, GUI_MSG_CONSOLE_PRINT, &param);
+
+    return returnValue;
+}
+
 void GUI_CallbackAdded()
 {
     // Send a new window message to the GUI shell for each running application

MyOS_1/GUI_Kernel.h

@@ -8,4 +8,7 @@ typedef void(*GUI_CALLBACK)(uint32_t PID, uint32_t messageType, void *pData);
 extern GUI_CALLBACK guiCallback;
 
 // Called immediately after a callback has been registered, to transition running apps into windowed consoles
-void GUI_CallbackAdded();
+void GUI_CallbackAdded();
+
+// Sends the formatted text string to the running GUI application
+int  GUI_printf(const char *format, va_list va);

MyOS_1/GUI_Messages.h

@@ -3,15 +3,23 @@
 
 // MESSAGES
 #define GUI_MSG_NEW_CONSOLE_APP 0x1000
+#define GUI_MSG_CONSOLE_PRINT   0x1001
 // END OF MESSAGES
 
+#define MAX_GUI_CONSOLE_STRING_LENGTH   512
+
 // DATA TYPES USED BY MESSAGES
 
 // Data type used by GUI_MSG_NEW_CONSOLE_APP messages
 typedef struct GUI_NEW_CONSOLE_APP_DATA
 {
     const char *appName;
-
     // TODO: We may as well send the terminal contents over in the same message
 } GUI_NEW_CONSOLE_APP_DATA;
+
+// Data type used by GUI_MSG_CONSOLE_PRINT
+typedef struct GUI_CONSOLE_PRINT_DATA
+{
+    const char *textString;
+} GUI_CONSOLE_PRINT_DATA;
 // END OF DATA TYPES

MyOS_1/Graphics/picofont.h

@@ -20,8 +20,8 @@
 #define FNT_ROWSPACING  3
 
 // put some margins around the borders
-#define FNT_LEFTRIGHTMARGIN 3
-#define FNT_TOPBOTTOMMARGIN    3
+#define FNT_LEFTRIGHTMARGIN     3
+#define FNT_TOPBOTTOMMARGIN     3
 
 typedef struct
 {

MyOS_1/Interrupts/Interrupts.c

@@ -752,7 +752,11 @@ void _declspec(naked) printf_interrupt_handler(int eflags, int cs, const char *f
         terminal_writestring("printf interrupt handler fired.\n");
 
     // Here's where printf actually happens
-    vprintf_(fmt, va);
+    if (guiCallback)
+        GUI_printf(fmt, va);
+    else
+        vprintf_(fmt, va);
+
 
     _asm
     {

MyOS_GUI_Shell/GUI_Kernel_Shell.cpp

@@ -10,14 +10,29 @@ extern int lastWindowID;
 
 void GUI_Kernel_Callback(uint32_t PID, uint32_t messageType, void * pData)
 {
+    GUI_Window *pWindow = NULL;
+
     switch (messageType)
     {
         case GUI_MSG_NEW_CONSOLE_APP:
             // Create a new window with the app name
             CreateTextWindow(PID,
-                             //lastWindowID++,
-                             ((GUI_NEW_CONSOLE_APP_DATA *)pData)->appName);
+                            ((GUI_NEW_CONSOLE_APP_DATA *)pData)->appName);
+            break;
+
+        case GUI_MSG_CONSOLE_PRINT:
+            // Send the text to the window
+            
+            // Find the window associated with the PID
+            pWindow = GetWindowFromID(PID);
+            if (!pWindow)
+            {
+                MessageBox("GUI_Kernel_Callback called with unrecognized PID!", "ERROR");
+                return;
+            }
+            pWindow->SendWindowText( ((GUI_CONSOLE_PRINT_DATA *)pData)->textString );
             break;
+
         default:
             MessageBox("GUI_Kernel_Callback called with unrecognized messageType.", "ERROR");
             break;

MyOS_GUI_Shell/GUI_MessageBox.cpp

@@ -1,17 +1,24 @@
 #include "GUI_MessageBox.h"
 #include "GUI_Object.h"
 #include "GUI_Button.h"
+#include "MyOS_GUI_Shell.h"
 
 GUI_MessageBox::GUI_MessageBox(char * messageText, char * windowTitle)
-    :   GUI_Window(MESSAGE_BOX_X, MESSAGE_BOX_Y, MESSAGE_BOX_WIDTH, MESSAGE_BOX_HEIGHT, windowTitle)
+    :   GUI_Window( NewWindowPosition(MESSAGE_BOX_WIDTH, MESSAGE_BOX_HEIGHT), windowTitle)
 {
     // TODO: Use static memory so we can display out of memory messages
     SDL_Surface *pFont = FNT_Render(messageText, SDL_BLACK);
-    uint32_t messageMargin = 8;
+    const int messageMargin = 8;
 
+    int minTextWidth = pFont->w + (messageMargin * 2);
+    
+    // Resize the message box if the text won't fit
+    if (dimensions.width < minTextWidth)
+        Resize( { dimensions.top, dimensions.left, minTextWidth, dimensions.height  } );
+
     SDL_Rect destRect = { messageMargin, 
         messageMargin + SYSTEM_MENU_HEIGHT,
-        dimensions.width - (messageMargin * 2),
+        minTextWidth,
         dimensions.height - (messageMargin * 2) };
 
     SDL_BlitSurface(pFont, NULL, pSurface, &destRect);
@@ -20,3 +27,4 @@ GUI_MessageBox::GUI_MessageBox(char * messageText, char * windowTitle)
     // Create a button control for an "OK" button
     pControls[0] = new GUI_Button("OK", SYSTEM_MENU_CLOSE_BUTTON_ID, this);
 }
+

MyOS_GUI_Shell/GUI_Object.cpp

@@ -100,18 +100,44 @@ void GUI_Object::DrawSystemMenu(SDL_Surface *pSurface, char *windowName)
 
     // Draw the system boxes
     int margin = 4;
-    int boxHeight = SYSTEM_MENU_HEIGHT - margin;
+    int boxHeight = SYSTEM_MENU_HEIGHT - margin + 1;
     int boxWidth = boxHeight;
     int boxTop = (margin / 2);
-    int boxLeft = dimensions.width - boxWidth - margin;
+    int boxLeft = dimensions.width - boxWidth - margin + 2;
     SDL_Rect boxRect = { boxLeft, boxTop, boxWidth, boxHeight };
     uint32_t red = SDL_MapRGB(pSurface->format, 255, 120, 120 );
     SDL_FillRect(pSurface, &boxRect, red);
-    //DrawBox(pSurface, boxLeft, boxTop, boxWidth, boxHeight, black);
     Draw3D_Box(pSurface, boxLeft, boxTop, boxWidth, boxHeight);
 
     pFont = FNT_Render("X", black);
-    boxRect.x += 6;
+    boxRect.x += 7;
+    boxRect.y += 7;
+    SDL_BlitSurface(pFont, NULL, pSurface, &boxRect);
+    SDL_FreeSurface(pFont);
+
+
+    boxLeft = boxLeft - boxWidth - 2;
+    boxRect = { boxLeft, boxTop, boxWidth, boxHeight };
+    SDL_FillRect(pSurface, &boxRect, SDL_MapRGB(pSurface->format, 205, 205, 205));
+    Draw3D_Box(pSurface, boxLeft, boxTop, boxWidth, boxHeight);
+
+    pFont = FNT_Render("[", black);
+    boxRect.x += 4;
+    boxRect.y += 7;
+    SDL_BlitSurface(pFont, NULL, pSurface, &boxRect);
+    boxRect.x += 4;
+    SDL_FreeSurface(pFont);
+    pFont = FNT_Render("]", black);
+    SDL_BlitSurface(pFont, NULL, pSurface, &boxRect);
+    SDL_FreeSurface(pFont);
+
+    boxLeft = boxLeft - boxWidth - 2;
+    boxRect = { boxLeft, boxTop, boxWidth, boxHeight };
+    SDL_FillRect(pSurface, &boxRect, SDL_MapRGB(pSurface->format, 205, 205, 205));
+    Draw3D_Box(pSurface, boxLeft, boxTop, boxWidth, boxHeight);
+
+    pFont = FNT_Render("_", black);
+    boxRect.x += 7;
     boxRect.y += 7;
     SDL_BlitSurface(pFont, NULL, pSurface, &boxRect);
     SDL_FreeSurface(pFont);

MyOS_GUI_Shell/GUI_Object.h

@@ -17,7 +17,8 @@ extern "C" {
 #define SYSTEM_MENU_COLOR_G 160
 #define SYSTEM_MENU_COLOR_B 255
 
-const SDL_Color SDL_BLACK = { 0, 0, 0, 255 };
+const SDL_Color SDL_BLACK       = { 0,   0,  0, 255 };
+const SDL_Color SDL_DARKGRAY    = { 40, 40, 40, 255 };
 const uint32_t  RGB_BLACK = 0x000000;
 const SDL_Color SDL_WHITE = { 255, 255, 255, 255 };
 const SDL_Color SDL_DEFAULT_BUTTON_COLOR = { 200, 200, 200, 255 };