Update to 1.0.2.4

Update to 1.0.2.4. This update adds a command buffer accessible via alt+up or alt+down.
Captain-ALM · Feb 18, 2018 · 773d00e · 773d00e
1 parent 209d165
commit 773d00e
Show file tree

Hide file tree

Showing 57 changed files with 91 additions and 9 deletions.
diff --git a/calmcon.v12.suo b/calmcon.v12.suo
diff --git a/calmcon/My Project/AssemblyInfo.vb b/calmcon/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.2.3")> 
-<Assembly: AssemblyFileVersion("1.0.2.3")> 
+<Assembly: AssemblyVersion("1.0.2.4")> 
+<Assembly: AssemblyFileVersion("1.0.2.4")> 
diff --git a/calmcon/bin/Debug/calmcmd.exe b/calmcon/bin/Debug/calmcmd.exe
diff --git a/calmcon/bin/Debug/calmcmd.pdb b/calmcon/bin/Debug/calmcmd.pdb
diff --git a/calmcon/bin/Debug/cnsrapi.dll b/calmcon/bin/Debug/cnsrapi.dll
diff --git a/calmcon/bin/Debug/cnsrapi.pdb b/calmcon/bin/Debug/cnsrapi.pdb
diff --git a/calmcon/bin/Release/calmcmd.exe b/calmcon/bin/Release/calmcmd.exe
diff --git a/calmcon/bin/Release/calmcmd.pdb b/calmcon/bin/Release/calmcmd.pdb
diff --git a/calmcon/bin/Release/cnsrapi.dll b/calmcon/bin/Release/cnsrapi.dll
diff --git a/calmcon/bin/Release/cnsrapi.pdb b/calmcon/bin/Release/cnsrapi.pdb
diff --git a/calmcon/cmdpr.vb b/calmcon/cmdpr.vb
@@ -159,6 +159,11 @@ Public Module cmdpr
         commands.Add("echo", New executable_command("echo", New Cmd(AddressOf echo)))
         commands.Add("echo_mode", New executable_command("echo_mode", New Cmd(AddressOf echo)))
         commandhelplst.Add("echo/echo_mode%true/false[if echo is enabled]% : enables and disables command echoing.")
+        'buffer / cmd_buffer / command_buffer
+        commands.Add("buffer", New executable_command("buffer", New Cmd(AddressOf cmdbuffer)))
+        commands.Add("cmd_buffer", New executable_command("cmd_buffer", New Cmd(AddressOf cmdbuffer)))
+        commands.Add("command_buffer", New executable_command("command_buffer", New Cmd(AddressOf cmdbuffer)))
+        commandhelplst.Add("buffer/cmd_buffer/command_buffer%limit/number/mode/clear%%*(integer/boolean/none)[limit and number : limit of the buffer, mode : the shortcut mode in the textbox, clear : clears the buffer] : manages the command buffer, alt+up/alt+down to cycle through the buffer.")
     End Sub
 End Module
 

diff --git a/calmcon/commands.vb b/calmcon/commands.vb
@@ -5,12 +5,31 @@ Module commands_data
     Public commandhelplst As New List(Of String)
     Public commandhelplstext As New List(Of String)
 
+    Public Function cmdbuffer(args As String()) As OutputText
+        If Not args Is Nothing Then
+            If args.Length >= 1 Then
+                If args(0).ToLower = "clear" Then
+                    command_buffer_index = 1
+                    command_buffer.Clear()
+                ElseIf args.Length >= 2 Then
+                    If args(0).ToLower = "limit" Or args(0).ToLower = "number" Then
+                        Dim int As Integer = convertstringtoint(args(1))
+                        command_buffer_limit = int
+                    ElseIf args(0).ToLower = "mode" Then
+                        Dim bool As Boolean = convertstringtobool(args(1))
+                        command_buffer_shortcuts_enabled = bool
+                    End If
+                End If
+            End If
+        End If
+        Return "Buffer Limit: " & command_buffer_limit & " Buffer Shortcuts Enabled: " & command_buffer_shortcuts_enabled & "."
+    End Function
+
     Public Function echo(args As String()) As OutputText
         If Not args Is Nothing Then
             If args.Length >= 1 Then
                 Dim b As Boolean = convertstringtobool(args(0))
                 echo_command = b
-                Return "Echo Mode Set To: " & echo_command & "."
             End If
         End If
         Return "Echo Mode: " & echo_command & "."

diff --git a/calmcon/form_flags.vb b/calmcon/form_flags.vb
@@ -16,6 +16,11 @@ Public Module form_flags
     Public aboutbx_showing As Boolean = False
     Public cancel_action As Boolean = False
     Public disablechkbx As Boolean = False
+    Public command_buffer As New List(Of String)
+    '1 based
+    Public command_buffer_index As Integer = 1
+    Public command_buffer_limit As Integer = 40
+    Public command_buffer_shortcuts_enabled As Boolean = True
     'form flags
     Public tocleartxt As Boolean = False
     Public movetobottom As Boolean = False

diff --git a/calmcon/main.vb b/calmcon/main.vb
@@ -363,6 +363,42 @@ Public Class main
             contrcmdvis(False)
             cmd_inter(txtbxcmd.Text)
             contrcmdvis(True)
+        ElseIf e.KeyCode = Keys.Up And e.Alt And command_buffer_shortcuts_enabled Then
+            e.SuppressKeyPress = True
+            e.Handled = True
+            command_buffer_index -= 1
+            If command_buffer_index > command_buffer_limit Then
+                command_buffer_index = command_buffer_limit
+            End If
+            If command_buffer_index > command_buffer.Count Then
+                command_buffer_index = command_buffer.Count
+            End If
+            If command_buffer_index <= 0 Then
+                command_buffer_index = 1
+            End If
+            If command_buffer_limit > 0 Then
+                If Not command_buffer.Count = 0 Then
+                    txtbxcmd.Text = command_buffer(command_buffer_index - 1)
+                End If
+            End If
+        ElseIf e.KeyCode = Keys.Down And e.Alt And command_buffer_shortcuts_enabled Then
+            e.SuppressKeyPress = True
+            e.Handled = True
+            command_buffer_index += 1
+            If command_buffer_index > command_buffer_limit Then
+                command_buffer_index = command_buffer_limit
+            End If
+            If command_buffer_index > command_buffer.Count Then
+                command_buffer_index = command_buffer.Count
+            End If
+            If command_buffer_index <= 0 Then
+                command_buffer_index = 1
+            End If
+            If command_buffer_limit > 0 Then
+                If Not command_buffer.Count = 0 Then
+                    txtbxcmd.Text = command_buffer(command_buffer_index - 1)
+                End If
+            End If
         End If
     End Sub
 
@@ -649,8 +685,28 @@ threadstart5:
 
     Private Sub cmd_inter(icmd As String)
         Dim ccmd As String = icmd.Replace(ControlChars.Lf, ControlChars.CrLf)
+
+        If command_buffer.Count <> 0 Then
+            command_buffer.Insert(command_buffer_index, icmd)
+            command_buffer_index += 1
+        Else
+            command_buffer.Add(icmd)
+            command_buffer_index = 1
+        End If
+        If command_buffer.Count > command_buffer_limit And command_buffer_limit > 0 Then
+            command_buffer.RemoveAt(0)
+        End If
+        If command_buffer_index > command_buffer_limit Then
+            command_buffer_index = command_buffer_limit
+        End If
+        If command_buffer_index > command_buffer.Count Then
+            command_buffer_index = command_buffer.Count
+        End If
+        If command_buffer_index <= 0 Then
+            command_buffer_index = 1
+        End If
+
         If ccmd <> "" Then
-            If allowenter Then
                 Dim ccom As String = ""
                 Dim cuchar As String = ""
                 Dim lchar As String = ""
@@ -683,10 +739,7 @@ threadstart5:
                     Dim comcmd As String = l_stack.Pop()
                     command_stack.Push(comcmd)
                 Next
-            Else
-                command_stack.Push(ccmd.Replace(ControlChars.Lf, ControlChars.CrLf).Replace(ControlChars.CrLf, ""))
             End If
-        End If
         txtbxcmd.Text = ""
     End Sub
 

diff --git a/calmcon/obj/Debug/calmcmd.exe b/calmcon/obj/Debug/calmcmd.exe
diff --git a/calmcon/obj/Debug/calmcmd.pdb b/calmcon/obj/Debug/calmcmd.pdb
diff --git a/calmcon/obj/Debug/calmcon.vbprojResolveAssemblyReference.cache b/calmcon/obj/Debug/calmcon.vbprojResolveAssemblyReference.cache
diff --git a/calmcon/obj/Release/calmcmd.exe b/calmcon/obj/Release/calmcmd.exe
diff --git a/calmcon/obj/Release/calmcmd.pdb b/calmcon/obj/Release/calmcmd.pdb
diff --git a/calmcon/obj/Release/calmcon.vbprojResolveAssemblyReference.cache b/calmcon/obj/Release/calmcon.vbprojResolveAssemblyReference.cache
diff --git a/calmextensionlib/bin/Debug/calmextensionlib.dll b/calmextensionlib/bin/Debug/calmextensionlib.dll
diff --git a/calmextensionlib/bin/Debug/calmextensionlib.pdb b/calmextensionlib/bin/Debug/calmextensionlib.pdb
diff --git a/calmextensionlib/bin/Debug/cnsrapi.dll b/calmextensionlib/bin/Debug/cnsrapi.dll
diff --git a/calmextensionlib/bin/Debug/cnsrapi.pdb b/calmextensionlib/bin/Debug/cnsrapi.pdb
diff --git a/calmextensionlib/bin/Release/calmextensionlib.dll b/calmextensionlib/bin/Release/calmextensionlib.dll
diff --git a/calmextensionlib/bin/Release/calmextensionlib.pdb b/calmextensionlib/bin/Release/calmextensionlib.pdb
diff --git a/calmextensionlib/bin/Release/cnsrapi.dll b/calmextensionlib/bin/Release/cnsrapi.dll
diff --git a/calmextensionlib/bin/Release/cnsrapi.pdb b/calmextensionlib/bin/Release/cnsrapi.pdb
diff --git a/calmextensionlib/obj/Debug/calmextensionlib.dll b/calmextensionlib/obj/Debug/calmextensionlib.dll
diff --git a/calmextensionlib/obj/Debug/calmextensionlib.pdb b/calmextensionlib/obj/Debug/calmextensionlib.pdb
diff --git a/calmextensionlib/obj/Debug/calmextensionlib.vbprojResolveAssemblyReference.cache b/calmextensionlib/obj/Debug/calmextensionlib.vbprojResolveAssemblyReference.cache
diff --git a/calmextensionlib/obj/Release/calmextensionlib.dll b/calmextensionlib/obj/Release/calmextensionlib.dll
diff --git a/calmextensionlib/obj/Release/calmextensionlib.pdb b/calmextensionlib/obj/Release/calmextensionlib.pdb
diff --git a/calmextensionlib/obj/Release/calmextensionlib.vbprojResolveAssemblyReference.cache b/calmextensionlib/obj/Release/calmextensionlib.vbprojResolveAssemblyReference.cache
diff --git a/cnshare/My Project/AssemblyInfo.vb b/cnshare/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.2.3")> 
-<Assembly: AssemblyFileVersion("1.0.2.3")> 
+<Assembly: AssemblyVersion("1.0.2.4")> 
+<Assembly: AssemblyFileVersion("1.0.2.4")> 
diff --git a/cnshare/bin/Debug/cnsrapi.dll b/cnshare/bin/Debug/cnsrapi.dll
diff --git a/cnshare/bin/Debug/cnsrapi.pdb b/cnshare/bin/Debug/cnsrapi.pdb
diff --git a/cnshare/bin/Release/cnsrapi.dll b/cnshare/bin/Release/cnsrapi.dll
diff --git a/cnshare/bin/Release/cnsrapi.pdb b/cnshare/bin/Release/cnsrapi.pdb
diff --git a/cnshare/obj/Debug/cnsrapi.dll b/cnshare/obj/Debug/cnsrapi.dll
diff --git a/cnshare/obj/Debug/cnsrapi.pdb b/cnshare/obj/Debug/cnsrapi.pdb
diff --git a/cnshare/obj/Release/cnsrapi.dll b/cnshare/obj/Release/cnsrapi.dll
diff --git a/cnshare/obj/Release/cnsrapi.pdb b/cnshare/obj/Release/cnsrapi.pdb
diff --git a/specialmsg/bin/Debug/cnsrapi.dll b/specialmsg/bin/Debug/cnsrapi.dll
diff --git a/specialmsg/bin/Debug/cnsrapi.pdb b/specialmsg/bin/Debug/cnsrapi.pdb
diff --git a/specialmsg/bin/Debug/specialmsg.dll b/specialmsg/bin/Debug/specialmsg.dll
diff --git a/specialmsg/bin/Debug/specialmsg.pdb b/specialmsg/bin/Debug/specialmsg.pdb
diff --git a/specialmsg/bin/Release/cnsrapi.dll b/specialmsg/bin/Release/cnsrapi.dll
diff --git a/specialmsg/bin/Release/cnsrapi.pdb b/specialmsg/bin/Release/cnsrapi.pdb
diff --git a/specialmsg/bin/Release/specialmsg.dll b/specialmsg/bin/Release/specialmsg.dll
diff --git a/specialmsg/bin/Release/specialmsg.pdb b/specialmsg/bin/Release/specialmsg.pdb
diff --git a/specialmsg/obj/Debug/specialmsg.dll b/specialmsg/obj/Debug/specialmsg.dll
diff --git a/specialmsg/obj/Debug/specialmsg.pdb b/specialmsg/obj/Debug/specialmsg.pdb
diff --git a/specialmsg/obj/Debug/specialmsg.vbprojResolveAssemblyReference.cache b/specialmsg/obj/Debug/specialmsg.vbprojResolveAssemblyReference.cache
diff --git a/specialmsg/obj/Release/specialmsg.dll b/specialmsg/obj/Release/specialmsg.dll
diff --git a/specialmsg/obj/Release/specialmsg.pdb b/specialmsg/obj/Release/specialmsg.pdb
diff --git a/specialmsg/obj/Release/specialmsg.vbprojResolveAssemblyReference.cache b/specialmsg/obj/Release/specialmsg.vbprojResolveAssemblyReference.cache