not-quite-finish-but-functional DuWM

4 files changed, 65 insertions, 7 deletions

diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb
index e44cce2..cc9992e 100644
--- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb
+++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/Desktop.Designer.vb
@@ -37,6 +37,7 @@ Partial Class Desktop
         Me.Button1.TabIndex = 0
         Me.Button1.Text = "term"
         Me.Button1.UseVisualStyleBackColor = False
+        Me.Button1.Visible = False
         '
         'Desktop
         '
diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb
index 89d8b65..8b501ce 100644
--- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb
+++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb
@@ -1,23 +1,47 @@
-Module DesktopManager
+Imports System.Threading
+
+Module DesktopManager
+    Public IsStartG As Boolean
+
     Public Sub StartG()
+        IsStartG = True
         Desktop.Show()
         Desktop.FormBorderStyle = FormBorderStyle.None
         Desktop.WindowState = FormWindowState.Maximized
         Desktop.TopMost = False
         IsConsoleParent = False
-        Console.Close()
+        Console.Dispose()
         WindowManagerChoose()
         Cursor.Show()
     End Sub
 
     Public Sub StopG()
-        DuWM_CurrentProcess = 0
-        Strings.ProcessID(0) = 0
-        Strings.ProcessID(1) = 0
-        Cursor.Hide()
+        IsStartG = False
+        'MsgBox("IsConsoleParent should be true!")
         IsConsoleParent = True
+        ''MsgBox("PID 0 0")
+        'Strings.ProcessID(0) = 0
+        ''MsgBox("PID 1 0")
+        'Strings.ProcessID(1) = 0
+        TerminateWindowApps()
+        'MsgBox("Hide!")
+        Cursor.Hide()
+        MsgBox("this is not a bug, this is a feature") 'Use this messagebox to hold Console to stay open, because removing this line closes Console all together for some reason
         Console.Show()
-        Desktop.Close()
+        'MsgBox("ADIOS!")
+        Desktop.Hide()
+    End Sub
+
+    Public Sub TerminateWindowApps()
+        Dim MaxPID As Integer = 0
+        Do
+            If MaxPID = 2 Then
+                Exit Do
+            Else
+                Strings.ProcessID(MaxPID) = 0
+                MaxPID = MaxPID + 1
+            End If
+        Loop
     End Sub
 
     Public Sub WindowManagerChoose()
diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/ThisIsNotABugThisIsAFeature.Designer.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/ThisIsNotABugThisIsAFeature.Designer.vb
new file mode 100644
index 0000000..8e108b8
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/ThisIsNotABugThisIsAFeature.Designer.vb
@@ -0,0 +1,30 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class ThisIsNotABugThisIsAFeature
+    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()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Text = "ThisIsNotABugThisIsAFeature"
+    End Sub
+End Class
diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/ThisIsNotABugThisIsAFeature.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/ThisIsNotABugThisIsAFeature.vb
new file mode 100644
index 0000000..7cae8ba
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/ThisIsNotABugThisIsAFeature.vb
@@ -0,0 +1,3 @@
+Public Class ThisIsNotABugThisIsAFeature
+
+End Class
\ No newline at end of file