Begin implementing a Run window to run an arbitrary program.

Begin implementing a basic text-edit control (used by the run window).
Allow controls to gain and lose focus. Allow for a blinking cursor.

Author: tthomps

MyOS_GUI_For_Windows/MyOS_GUI_For_Windows.vcxproj

@@ -155,6 +155,7 @@
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_Object.h" />
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_PopupMenu.h" />
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_Rect.h" />
+    <ClInclude Include="..\MyOS_GUI_Shell\GUI_RunWindow.h" />
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_Taskbar.h" />
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_Window.h" />
     <ClInclude Include="..\MyOS_GUI_Shell\MyOS_GUI_Shell.h" />
@@ -165,10 +166,12 @@
     <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_EditControl.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_PopupMenu.cpp" />
+    <ClCompile Include="..\MyOS_GUI_Shell\GUI_RunWindow.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" />

MyOS_GUI_For_Windows/MyOS_GUI_For_Windows.vcxproj.filters

@@ -45,6 +45,9 @@
     <ClInclude Include="..\MyOS_GUI_Shell\GUI_PopupMenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\MyOS_GUI_Shell\GUI_RunWindow.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\MyOS_GUI_Shell\MyOS_GUI_Shell.cpp">
@@ -86,5 +89,11 @@
     <ClCompile Include="..\MyOS_GUI_Shell\GUI_PopupMenu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\MyOS_GUI_Shell\GUI_RunWindow.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\MyOS_GUI_Shell\GUI_EditControl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

MyOS_GUI_Shell/GUI_Control.h

@@ -13,10 +13,13 @@ class GUI_Control : public GUI_Object
         this->controlID = controlID;
     }
 
-    virtual void OnHover(int relX, int relY) {};
+    virtual void LoseFocus() {}
+    virtual void GainFocus() {}
+    virtual void OnHover(int relX, int relY) {}
     virtual void OnClick(int relX, int relY);
-    virtual void OnDrag(int relClickX, int relClickY, int relDestX, int relDestY) {};
+    virtual void OnDrag(int relClickX, int relClickY, int relDestX, int relDestY) {}
     virtual void Resize(GUI_Rect newDimensions) { dimensions = newDimensions; }
+    virtual void UpdateCursor() {}
 
     uint32_t controlID;
 protected:

MyOS_GUI_Shell/GUI_EditControl.cpp

@@ -0,0 +1,67 @@
+#include "GUI_EditControl.h"
+
+GUI_EditControl::GUI_EditControl(GUI_Rect guiRect, GUI_Window *pOwner, uint32_t controlID)
+                                : GUI_Control(pOwner, controlID)
+{
+    pSurface = NULL;
+    dimensions = guiRect;
+    CreateSurface();
+    cursorX = 2;
+}
+
+
+GUI_EditControl::~GUI_EditControl()
+{
+    SDL_FreeSurface(pSurface);
+}
+
+void GUI_EditControl::CreateSurface()
+{
+    if (pSurface)
+        SDL_FreeSurface(pSurface);
+
+    pSurface = SDL_CreateRGBSurface(0,
+                                    dimensions.width,
+                                    dimensions.height,
+                                    32,
+                                    0xFF000000,
+                                    0x00FF0000,
+                                    0x0000FF00,
+                                    0x000000FF);
+
+    FillSurface(pSurface, SDL_WHITE);
+
+    Draw3D_InsetBox(pSurface, 0, 0, dimensions.width - 1, dimensions.height - 1);
+}
+
+void GUI_EditControl::LoseFocus()
+{
+    if(cursorBlinkOn)
+        DrawVerticalLine(pSurface, cursorX, 1, dimensions.height - 2, SDL_WHITE);
+
+    cursorBlinkOn = false;
+}
+
+void GUI_EditControl::OnClick(int relX, int relY)
+{
+    pOwner->SetFocus(controlID);
+}
+
+void GUI_EditControl::PaintToSurface(SDL_Surface * pTargetSurface)
+{
+    SDL_BlitSurface(pSurface, NULL, pTargetSurface, dimensions.GetSDL_Rect());
+}
+
+void GUI_EditControl::UpdateCursor()
+{
+    cursorBlinkOn = !cursorBlinkOn;
+
+    if (cursorBlinkOn)
+    {
+        DrawVerticalLine(pSurface, cursorX, 1, dimensions.height - 2, SDL_BLACK);
+    }
+    else
+    {
+        DrawVerticalLine(pSurface, cursorX, 1, dimensions.height - 2, SDL_WHITE);
+    }
+}

MyOS_GUI_Shell/GUI_EditControl.h

@@ -0,0 +1,22 @@
+#pragma once
+#include "GUI_Control.h"
+
+class GUI_EditControl :
+    public GUI_Control
+{
+public:
+    GUI_EditControl(GUI_Rect guiRect, GUI_Window *pOwner, uint32_t controlID);
+    ~GUI_EditControl();
+
+    void CreateSurface();
+    void LoseFocus();
+    void OnClick(int relX, int relY);
+    void PaintToSurface(SDL_Surface *pTargetSurface);
+    void UpdateCursor();
+
+    SDL_Surface *pSurface;
+
+    bool cursorBlinkOn;
+    int cursorX;
+};
+

MyOS_GUI_Shell/GUI_PopupMenu.cpp

@@ -123,6 +123,24 @@ bool GUI_PopupMenu::MouseOver(int relX, int relY)
     return true;
 }
 
+void GUI_PopupMenu::OnClick(int relX, int relY)
+{
+    if (relX < 0 || relY < 0 || relX > dimensions.width || relY > dimensions.height)
+    {
+        MessageBox("Menu called with mouse out of position\n", "ERROR");
+        return;
+    }
+
+    // Get the selection
+    int heightPerOption = dimensions.height / choices;
+    int selection = relY / heightPerOption;
+
+    // Call the callback with the ID for this selection
+    (*handlerCallback)(choiceIDs[selection]);
+
+    shown = false;
+}
+
 void GUI_PopupMenu::PaintToSurface(SDL_Surface * pTargetSurface)
 {
     if (!shown)

MyOS_GUI_Shell/GUI_PopupMenu.h

@@ -26,6 +26,7 @@ class GUI_PopupMenu :
     void CreateSurface();
     void Draw(int selectedChoice);
     bool MouseOver(int relX, int relY);
+    void OnClick(int relX, int relY);
     void PaintToSurface(SDL_Surface *pTargetSurface);
     void RegisterMenuHandler(MENU_HANDLER handler);
     void ShowMenu(SDL_Point origin);

MyOS_GUI_Shell/GUI_RunWindow.cpp

@@ -0,0 +1,25 @@
+#include "GUI_RunWindow.h"
+#include "MyOS_GUI_Shell.h"
+#include "GUI_Button.h"
+#include "GUI_EditControl.h"
+
+// TODO: place window relative to bottom-left
+GUI_RunWindow::GUI_RunWindow() : GUI_Window(0, 0, RUN_WINDOW_WIDTH, RUN_WINDOW_HEIGHT, "Run" )
+{
+    // Create a button control for an "OK" button
+    pControls[0] = new GUI_Button("OK", SYSTEM_MENU_CLOSE_BUTTON_ID, this);
+
+    // Move button to bottom-right corner
+    pControls[0]->dimensions.left = dimensions.width - pControls[0]->dimensions.width - 2;
+    pControls[0]->dimensions.top = dimensions.height - pControls[0]->dimensions.height - 2;
+
+    pControls[1] = new GUI_EditControl(RunWindowEditBoxDimensions, this, 1);
+
+    AddNewWindow(this);
+}
+
+
+GUI_RunWindow::~GUI_RunWindow()
+{
+
+}

MyOS_GUI_Shell/GUI_RunWindow.h

@@ -0,0 +1,19 @@
+#pragma once
+#include "GUI_Window.h"
+
+
+#define RUN_WINDOW_Y_FROM_BOTTOM    200
+#define RUN_WINDOW_WIDTH            300
+#define RUN_WINDOW_HEIGHT           75
+
+const int editHeight = FNT_FONTHEIGHT + (FNT_TOPBOTTOMMARGIN * 2);
+const GUI_Rect RunWindowEditBoxDimensions = { RUN_WINDOW_HEIGHT - 10 - editHeight, 10, RUN_WINDOW_WIDTH - 50, editHeight };
+
+class GUI_RunWindow :
+    public GUI_Window
+{
+public:
+    GUI_RunWindow();
+    ~GUI_RunWindow();
+};
+

MyOS_GUI_Shell/GUI_Taskbar.cpp

@@ -5,9 +5,23 @@
 #endif
 #include "GUI_Taskbar.h"
 #include "GUI_Button.h"
+#include "GUI_RunWindow.h"
 
 void StartMenuHandler(int choice)
-{}
+{
+    switch (choice)
+    {
+        case 0:
+            new GUI_RunWindow();
+            break;
+        case 1:
+            MessageBox("Option 1 clicked", "Click");
+            break;
+        case 2:
+            MessageBox("Option 2 clicked", "Click");
+            break;
+    }
+}
 
 GUI_Taskbar::GUI_Taskbar(uint32_t desktopWidth, uint32_t desktopHeight) : 
     GUI_Window(desktopHeight - GUI_TASKBAR_HEIGHT, 0, desktopWidth, GUI_TASKBAR_HEIGHT, "Taskbar")

MyOS_GUI_Shell/GUI_Window.cpp

@@ -32,6 +32,29 @@ void GUI_Window::CreateSurface()
     DrawWindow();
 }
 
+void GUI_Window::SetFocus(int controlID)
+{
+    // Ignore if this control alread has the focus
+    if (focusedControlIndex >= 0 && pControls[focusedControlIndex]->controlID == controlID)
+        return;
+
+    // Unfocus the previously focused control
+    if (focusedControlIndex >= 0)
+        pControls[focusedControlIndex]->LoseFocus();
+        
+    // Find the control with the given ID and focus it
+    for (int i = 0; i < MAX_WINDOW_CONTROLS; ++i)
+    {
+        if (pControls[i] && pControls[i]->controlID == controlID)
+        {
+            focusedControlIndex = i;
+            return;
+        }
+    }
+
+    MessageBox("Couldn't find a matching control for SetFocus", "ERROR");
+}
+
 void GUI_Window::PaintToSurface(SDL_Surface *pTargetSurface)
 {
     // TEMP
@@ -44,6 +67,14 @@ void GUI_Window::PaintToSurface(SDL_Surface *pTargetSurface)
     SDL_BlitSurface(pSurface, NULL, pTargetSurface, dimensions.GetSDL_Rect());
 }
 
+void GUI_Window::UpdateCursor()
+{
+    if (focusedControlIndex < 0)
+        return;
+
+    pControls[focusedControlIndex]->UpdateCursor();
+}
+
 void GUI_Window::ControlClicked(uint32_t controlID)
 {
     if (controlID == SYSTEM_MENU_CLOSE_BUTTON_ID)
@@ -62,6 +93,14 @@ void GUI_Window::FillSurface(SDL_Color color)
     SDL_FillRect(pSurface, NULL, col);
 }
 
+void GUI_Window::LoseFocus()
+{
+    if (focusedControlIndex < 0)
+        return;
+
+    pControls[focusedControlIndex]->LoseFocus();
+}
+
 void GUI_Window::OnClick(int relX, int relY)
 {
     if (relX < 0 || relY < 0 || relX > dimensions.width || relY > dimensions.height)

MyOS_GUI_Shell/GUI_Window.h

@@ -22,6 +22,7 @@ class GUI_Window : public GUI_Object
             pControls[i] = NULL;
 
         pClickedControl = NULL;
+        focusedControlIndex = -1;
     }
 
     GUI_Window(int top, int left, int width, int height, const char *name)
@@ -38,6 +39,7 @@ class GUI_Window : public GUI_Object
             pControls[i] = NULL;
 
         pClickedControl = NULL;
+        focusedControlIndex = -1;
     }
 
     virtual void ControlClicked(uint32_t controlID);
@@ -46,6 +48,8 @@ class GUI_Window : public GUI_Object
 
     void FillSurface(SDL_Color color);
 
+    virtual void LoseFocus();
+
     void OnClick(int relX, int relY);
 
     void OnDrag(int startRelX, int startRelY, int relX, int relY);
@@ -61,14 +65,21 @@ class GUI_Window : public GUI_Object
         (void)text; // text sent to GUI_Window base class is ignored
     }
 
+    void SetFocus(int controlID);
+
     SDL_Surface *GetSurface() { return pSurface; }
+    
     void PaintToSurface(SDL_Surface *pTargetSurface);
 
+    void UpdateCursor();
+
+
     SDL_Surface *pSurface;
     GUI_Control *pClickedControl;
     char windowName[MAX_WINDOW_NAME_LENGTH];
 protected:
     void GUI_Window::CreateSurface();
     SDL_Color backgroundColor;
     GUI_Control *pControls[MAX_WINDOW_CONTROLS];
+    int focusedControlIndex;
 };