More enhanced code management and DesktopEnvironment experiments

ShiftOS-TheRevival/API/ConsoleAPI.vb

@@ -1,4 +1,14 @@
 Module ConsoleAPI
+
+    Public Sub Console_Windowed()
+        Console.WindowState = FormWindowState.Normal
+    End Sub
+
+    Public Sub Console_Full()
+        Console.FormBorderStyle = FormBorderStyle.None
+        Console.WindowState = FormWindowState.Maximized
+    End Sub
+
     Public Sub NewLine(str As String)
         Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & str
     End Sub

ShiftOS-TheRevival/API/TerminalAPI.vb

@@ -170,13 +170,10 @@
                 Console.BadCommand = False
                 Undeveloped()
             Case "shutdown", "shut down"
-                NewLine("Saving game...")
-                If Strings.OnceInfo(6) = "story" Then
-                    SaveGame()
-                End If
-                Cursor.Show()
-                ShiftOSMenu.Show()
-                Console.Close()
+                TerminateShiftOS()
+            Case "startx"
+                StartX()
+                Console_Windowed()
             Case "textpad"
                 If Strings.AvailableFeature(17) = "1" Then
                     TextPad_WarnFile()

ShiftOS-TheRevival/Functions/InGame/Terminate.vb

@@ -0,0 +1,15 @@
+Module Terminate
+    Public Sub TerminateShiftOS()
+        NewLine("Stopping the Window Manager...")
+        StopX()
+        Console_Full()
+        If Strings.OnceInfo(6) = "story" Then
+            NewLine("Saving game...")
+            SaveGame()
+        End If
+        Cursor.Show()
+        NewLine("Shutting down...")
+        ShiftOSMenu.Show()
+        Console.Close()
+    End Sub
+End Module

ShiftOS-TheRevival/MainForms/Console.vb

@@ -16,8 +16,7 @@ Public Class Console
     Public ShOSKey As String
 
     Private Sub Console_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        FormBorderStyle = FormBorderStyle.None
-        WindowState = FormWindowState.Maximized
+        Console_Full()
         Cursor.Hide()
         InitializeTerminal()
     End Sub

ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb

@@ -0,0 +1,43 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class Desktop
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.SuspendLayout()
+        '
+        'Desktop
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.Red
+        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.ForeColor = System.Drawing.Color.White
+        Me.Name = "Desktop"
+        Me.ShowIcon = False
+        Me.ShowInTaskbar = False
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Desktop"
+        Me.TopMost = True
+        Me.ResumeLayout(False)
+
+    End Sub
+End Class

ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.vb

@@ -0,0 +1,3 @@
+Public Class Desktop
+
+End Class

ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb

@@ -0,0 +1,12 @@
+Module DesktopManager
+    Public Sub StartX()
+        Desktop.Show()
+        Desktop.TopMost = False
+        Desktop.FormBorderStyle = FormBorderStyle.None
+        Desktop.WindowState = FormWindowState.Maximized
+    End Sub
+
+    Public Sub StopX()
+        Desktop.Close()
+    End Sub
+End Module

ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj

@@ -93,6 +93,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Functions\InGame\Terminate.vb" />
     <Compile Include="MainForms\BugSlap.Designer.vb">
       <DependentUpon>BugSlap.vb</DependentUpon>
     </Compile>
@@ -112,6 +113,13 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Functions\InGame\DirectoryManagements.vb" />
+    <Compile Include="MainForms\DesktopEnvironment\master\Desktop.Designer.vb">
+      <DependentUpon>Desktop.vb</DependentUpon>
+    </Compile>
+    <Compile Include="MainForms\DesktopEnvironment\master\Desktop.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForms\DesktopEnvironment\master\DesktopManager.vb" />
     <Compile Include="MainForms\Epilepsy.Designer.vb">
       <DependentUpon>Epilepsy.vb</DependentUpon>
     </Compile>
@@ -149,24 +157,24 @@
     </Compile>
     <Compile Include="API\ConsoleAPI.vb" />
     <Compile Include="API\TerminalAPI.vb" />
-    <Compile Include="Terminal Applications\External\App_TextPad.vb" />
-    <Compile Include="Terminal Applications\External\TerminalExternalApps.vb" />
+    <Compile Include="TerminalApplications\External\App_TextPad.vb" />
+    <Compile Include="TerminalApplications\External\TerminalExternalApps.vb" />
     <Compile Include="Functions\InGame\TerminalColorSystem.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_05tray.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Codepoint.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Cowsay.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Help.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Hostname.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Infobar.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Pwd.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Rev.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Shiftfetch.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Shiftorium.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Su.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Username.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Ver.vb" />
-    <Compile Include="Terminal Applications\Internal\Com_Date.vb" />
-    <Compile Include="Terminal Applications\Internal\TerminalInternalApps.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_05tray.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Codepoint.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Cowsay.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Help.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Hostname.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Infobar.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Pwd.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Rev.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Shiftfetch.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Shiftorium.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Su.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Username.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Ver.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Date.vb" />
+    <Compile Include="TerminalApplications\Internal\TerminalInternalApps.vb" />
     <Compile Include="Functions\OutGame\TheUpdater.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
@@ -184,7 +192,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="Terminal Applications\Internal\Com_Time.vb" />
+    <Compile Include="TerminalApplications\Internal\Com_Time.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MainForms\BugSlap.resx">
@@ -196,6 +204,9 @@
     <EmbeddedResource Include="MainForms\DebugWindow.resx">
       <DependentUpon>DebugWindow.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MainForms\DesktopEnvironment\master\Desktop.resx">
+      <DependentUpon>Desktop.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MainForms\Epilepsy.resx">
       <DependentUpon>Epilepsy.vb</DependentUpon>
     </EmbeddedResource>
@@ -233,6 +244,8 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="DevOnlyRes\" />
+    <Folder Include="MainForms\Applications\" />
+    <Folder Include="MainForms\WindowManager\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\ShiftOSBuildLab.txt" />