Add GUI_TerminalWindow class.

Author: tthomps

MyOS_GUI_For_Windows/MyOS_GUI_For_Windows.vcxproj

@@ -151,7 +151,6 @@
   <ItemGroup>
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_Button.h" />
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_Control.h" />
-    <ClInclude Include="..\MyOS_GUI_Shell\GUI_Kernel_Messages.h" />
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_MessageBox.h" />
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_Object.h" />
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_Rect.h" />
@@ -165,9 +164,11 @@
     <ClCompile Include="..\MyOS_GUI_Shell\font.c" />
     <ClCompile Include="..\MyOS_GUI_Shell\GUI_Button.cpp" />
     <ClCompile Include="..\MyOS_GUI_Shell\GUI_Control.cpp" />
+    <ClCompile Include="..\MyOS_GUI_Shell\GUI_Kernel_Shell.cpp" />
     <ClCompile Include="..\MyOS_GUI_Shell\GUI_MessageBox.cpp" />
     <ClCompile Include="..\MyOS_GUI_Shell\GUI_Object.cpp" />
     <ClCompile Include="..\MyOS_GUI_Shell\GUI_Taskbar.cpp" />
+    <ClCompile Include="..\MyOS_GUI_Shell\GUI_TerminalWindow.cpp" />
     <ClCompile Include="..\MyOS_GUI_Shell\GUI_Window.cpp" />
     <ClCompile Include="..\MyOS_GUI_Shell\MyOS_GUI_Shell.cpp" />
     <ClCompile Include="..\MyOS_GUI_Shell\spf.c" />

MyOS_GUI_For_Windows/MyOS_GUI_For_Windows.vcxproj.filters

@@ -42,9 +42,6 @@
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_Taskbar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\MyOS_GUI_Shell\GUI_Kernel_Messages.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\MyOS_GUI_Shell\MyOS_GUI_Shell.cpp">
@@ -77,5 +74,11 @@
     <ClCompile Include="..\MyOS_GUI_Shell\GUI_Taskbar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\MyOS_GUI_Shell\GUI_TerminalWindow.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\MyOS_GUI_Shell\GUI_Kernel_Shell.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

MyOS_GUI_Shell/GUI_Kernel_Shell.cpp

@@ -0,0 +1,29 @@
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include "GUI_Kernel_Shell.h"
+#include "MyOS_GUI_Shell.h"
+#include "../MyOS_1/GUI_Messages.h"
+
+extern int lastWindowID;
+
+void GUI_Kernel_Callback(uint32_t PID, uint32_t messageType, void * pData)
+{
+    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);
+            break;
+        default:
+            MessageBox("GUI_Kernel_Callback called with unrecognized messageType.", "ERROR");
+            break;
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif

MyOS_GUI_Shell/GUI_Kernel_Shell.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <stdint.h>
+
+// Used to define the interface between the Kernel and the GUI Shell (on the shell side)
+
+// Called by the kernel to send messages to the GUI
+void GUI_Kernel_Callback(uint32_t PID, uint32_t messageType, void *pData);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */

MyOS_GUI_Shell/GUI_TerminalWindow.cpp

@@ -0,0 +1,33 @@
+#include "GUI_TerminalWindow.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifdef __MYOS
+#include "../MyOS_1/Interrupts/System_Calls.h"
+#endif
+
+GUI_TerminalWindow::GUI_TerminalWindow(const char *name)
+    : GUI_Window(NewWindowPosition(GUI_TERMINAL_DEFAULT_WIDTH, GUI_TERMINAL_DEFAULT_HEIGHT), name)
+{
+    // TODO: Check for out of memory error
+    characterBuffer = new char(characterBufferSize);
+        //(char*)malloc(characterBufferSize);
+
+    foregroundTextColor = GUI_TERMINAL_DEFAULT_TEXT_COLOR;
+    backgroundColor = GUI_TERMINAL_DEFAULT_BG_COLOR;
+
+    DrawWindow();
+}
+
+
+GUI_TerminalWindow::~GUI_TerminalWindow()
+{
+    //free(characterBuffer);
+    delete characterBuffer;
+}
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */

MyOS_GUI_Shell/GUI_TerminalWindow.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include "GUI_Window.h"
+#include "MyOS_GUI_Shell.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}
+
+#define GUI_TERMINAL_DEFAULT_WIDTH          80 * 8
+#define GUI_TERMINAL_DEFAULT_HEIGHT         60 * 8
+
+class GUI_TerminalWindow :
+    public GUI_Window
+{
+public:
+    GUI_TerminalWindow(const char *name);
+    ~GUI_TerminalWindow();
+
+    SDL_Color foregroundTextColor;
+    uint32_t characterBufferSize;
+    char *characterBuffer;
+};
+
+#ifdef __cplusplus
+}
+#endif

MyOS_GUI_Shell/GUI_Window.cpp

@@ -27,8 +27,8 @@ void GUI_Window::CreateSurface()
         return;
      //   printf("Error! Couldn't create RGB surface for window!\n");
 
-    backgroundColor.r = backgroundColor.b = 205;
-    backgroundColor.b = 205;
+    backgroundColor = { 205, 205, 205, 255 };
+
     DrawWindow();
 }
 
@@ -102,7 +102,6 @@ void GUI_Window::SetBackgroundColor(SDL_Color color)
 void GUI_Window::DrawWindow()
 {
     // Draw the background
-    //SDL_FillRect(pSurface, NULL, SDL_MapRGB(pSurface->format, backgroundColor.r, backgroundColor.g, backgroundColor.b));
     FillSurface(backgroundColor);
 
     // Draw the system menu at the top

MyOS_GUI_Shell/GUI_Window.h

@@ -12,17 +12,19 @@ class GUI_Control;
 class GUI_Window : public GUI_Object
 {
 public:
-    GUI_Window(GUI_Rect size, char *name)
+    GUI_Window(GUI_Rect size, const char *name)
     {
         dimensions = size;
-        SDL_strlcpy(windowName, name, MAX_WINDOW_NAME_LENGTH);
+        SDL_strlcpy(windowName, name, MAX_WINDOW_NAME_LENGTH - 1);
         CreateSurface();
 
         for (int i = 0; i < MAX_WINDOW_CONTROLS; ++i)
             pControls[i] = NULL;
+
+        pClickedControl = NULL;
     }
 
-    GUI_Window(int top, int left, int width, int height, char *name)
+    GUI_Window(int top, int left, int width, int height, const char *name)
     {
         dimensions.top = top;
         dimensions.left = left;

MyOS_GUI_Shell/MyOS_GUI_Shell.cpp

@@ -29,6 +29,8 @@ extern "C" {
 #include "GUI_Window.h"
 #include "GUI_MessageBox.h"
 #include "GUI_Taskbar.h"
+#include "GUI_Kernel_Shell.h"
+#include "GUI_TerminalWindow.h"
 
 #define MAX_GUI_WINDOWS 256 /*TEMP HACK*/
 GUI_Window *windowList[MAX_GUI_WINDOWS] = { NULL };
@@ -56,6 +58,7 @@ GUI_Taskbar *pTaskbar;
 #define DELETION_QUEUE_SIZE 16
 GUI_Window *pDeletionQueue[DELETION_QUEUE_SIZE]; // UGLY HACK
 int nextDeletionQueueIndex = 0;
+int lastWindowID = 1;
 
 #define CURSOR_X        16
 #define CURSOR_Y        16
@@ -178,19 +181,21 @@ void AddWindowToStack(GUI_Window *window, GUI_WINDOW_STACK_ENTRY *pStackEntry)
 }
 
 // This would probably be called with a process' PID
-GUI_Window *CreateTextWindow(uint32_t uniqueID)
+GUI_Window *CreateTextWindow(uint32_t uniqueID, const char *windowName)
 {
     // find the first unused entry in the windowList
     for (int i = 0; i < MAX_GUI_WINDOWS; ++i)
     {
         if (!windowList[i])
         {
-            windowList[i] = new GUI_Window(nextX, nextY, DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT, "New Window");
+            windowList[i] = new GUI_TerminalWindow(windowName);
+                //new GUI_Window(nextX, nextY, DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT, windowName);
+            
             // TODO: Check for NULL
             windowIDs[i] = uniqueID;
 
             // Advance position of next window
-            nextX += WINDOW_X_INC;
+            /*nextX += WINDOW_X_INC;
             nextX %= MAX_WINDOW_X;
             nextY += WINDOW_Y_INC;
             nextY %= MAX_WINDOW_Y;
@@ -209,7 +214,7 @@ GUI_Window *CreateTextWindow(uint32_t uniqueID)
 
             bgRed %= 255;
             bgGreen %= 255;
-            bgBlue %= 255;
+            bgBlue %= 255;*/
 
             AddWindowToStack(windowList[i], &windowStack[i]);
 
@@ -223,6 +228,19 @@ GUI_Window *CreateTextWindow(uint32_t uniqueID)
     return NULL;
 }
 
+GUI_Rect NewWindowPosition(int width, int height)
+{
+    GUI_Rect windowPos = { nextY, nextX, width, height };
+
+    // Advance position of next window
+    nextX += WINDOW_X_INC;
+    nextX %= MAX_WINDOW_X;
+    nextY += WINDOW_Y_INC;
+    nextY %= MAX_WINDOW_Y;
+
+    return windowPos;
+}
+
 // This is kind of hacky and maybe I'll find a better way in the future.
 // Windows can request their own removal, but if they're deleted at that point, execution will return to deleted code
 void DeleteAllWindowsInQueue()
@@ -254,7 +272,7 @@ void MessageBox(char *messageText, char *windowTitle)
         if (!windowList[i])
         {
             windowList[i] = new GUI_MessageBox(messageText, windowTitle);
-            AddWindowToStack(windowList[i], &windowStack[i]);
+            AddWindowToStack(windowList[i], &windowStack[i]);            
             return;
         }
     }
@@ -349,7 +367,8 @@ int main(int argc, char* argv[])
     SDL_Delay(500);  // Pause execution for 500 milliseconds, for example
     */
                      // Load BMP
-    char *filename = "kghrwide.bmp";
+    //char *filename = "kghrwide.bmp";
+    char *filename = "kg2.bmp";
 #if __MYOS__
     filename = "kg2.bmp";
 #endif
@@ -373,8 +392,6 @@ int main(int argc, char* argv[])
 
     SDL_Event event;
 
-    int lastWindowID = 1;
-
     // Hide the mouse cursor
     SDL_ShowCursor(SDL_DISABLE);
 
@@ -415,6 +432,13 @@ int main(int argc, char* argv[])
     // Create Taskbar
     pTaskbar = new GUI_Taskbar(screenSurface->w, screenSurface->h);
 
+#ifdef __MYOS
+    // Tell the kernel how to talk to us
+    registerGuiCallback(GUI_Kernel_Callback);
+#endif
+
+    //GUI_Kernel_Callback(0, 0, NULL);
+
     // Keep drawing everything
     while (!done)
     {
@@ -437,9 +461,9 @@ int main(int argc, char* argv[])
 
                 case SDL_KEYDOWN:
                     //switch (event.key.keysym)
-                    CreateTextWindow(lastWindowID++);
+                    CreateTextWindow(lastWindowID++, "New Window");
 
-                    MessageBox("Here's a test message", "Test Message");
+                    //MessageBox("Here's a test message", "Test Message");
                     switch (event.key.keysym.sym)
                     {
                         case SDLK_n:
@@ -524,16 +548,16 @@ int main(int argc, char* argv[])
         }
 
         // draw the "background"
-        /*if (bitmapSurface)
+        if (bitmapSurface)
         {
             // Blit bitmap to window
             SDL_BlitScaled(bitmapSurface, NULL, screenSurface, NULL);
 
             //SDL_Delay(3000);  // Pause execution for 3000 milliseconds, for example
-        }*/
+        }
 
         // Fill the background with black instead of an image for a little while
-        SDL_FillRect(screenSurface, NULL, RGB_BLACK);
+        //SDL_FillRect(screenSurface, NULL, RGB_BLACK);
 
         // draw all of the windows
 //        bigWindow.PaintToSurface(screenSurface);

MyOS_GUI_Shell/MyOS_GUI_Shell.h

@@ -1,23 +1,25 @@
 #pragma once
 
-#include "GUI_Window.h"
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-    struct GUI_WINDOW_STACK_ENTRY;
-    typedef struct GUI_WINDOW_STACK_ENTRY
-    {
-        GUI_Window *pWindow;
-        GUI_WINDOW_STACK_ENTRY *pUnderneath;
-        GUI_WINDOW_STACK_ENTRY *pAbove;
-    } GUI_WINDOW_STACK_ENTRY;
+#include "GUI_Window.h"
+
+struct GUI_WINDOW_STACK_ENTRY;
+typedef struct GUI_WINDOW_STACK_ENTRY
+{
+    GUI_Window *pWindow;
+    GUI_WINDOW_STACK_ENTRY *pUnderneath;
+    GUI_WINDOW_STACK_ENTRY *pAbove;
+} GUI_WINDOW_STACK_ENTRY;
 
-    void BringWindowID_ToFront(uint32_t windowID);
-    void BringWindowToFront(GUI_WINDOW_STACK_ENTRY *pEntry);
-    void Shell_Destroy_Window(GUI_Window *pWindow);
+void BringWindowID_ToFront(uint32_t windowID);
+void BringWindowToFront(GUI_WINDOW_STACK_ENTRY *pEntry);
+GUI_Window *CreateTextWindow(uint32_t uniqueID, const char *windowName);
+GUI_Rect NewWindowPosition(int x, int y);
+void MessageBox(char *messageText, char *windowTitle);
+void Shell_Destroy_Window(GUI_Window *pWindow);
 
 
 #ifdef __cplusplus