Merge pull request logicethos#11 from Int32Overflow/master

Better Terminal input support

Author: Logic Ethos Ltd

Renci.SshNet.dll

@@ -297,27 +297,30 @@ String ReplaceVarsInString (String input)
 			return sb.ToString ();
 		}
 
-		String GetVar (String input)
-		{
-			switch (input)
-			{
-			case "exe-path":
-				return build_exe_path;
-			case "mdb-path":
-				return build_exe_path + ".mdb";
-			case "build-path":
-				return Path.GetDirectoryName(build_exe_path);
-			case "work-dir":
-				return WorkingDir;
-			case "RemoteTunnelPort":
-				return RemoteTunnelPort.ToString ();
-			case "exe-file":
-				return Path.GetFileName (build_exe_path);
-			default:
-				return "?";
-					
-			}
-		}
+		String GetVar(String input)
+        {
+            switch (input)
+            {
+                case "exe-path":
+                    return build_exe_path;
+                case "mdb-path":
+                    return build_exe_path + ".mdb";
+                case "pdb-path":
+                    //Replace Test.exe => Test.pdb
+                    return build_exe_path.Substring(0, build_exe_path.Length - ".exe".Length) + ".pdb";
+                case "build-path":
+                    return Path.GetDirectoryName(build_exe_path);
+                case "work-dir":
+                    return WorkingDir;
+                case "RemoteTunnelPort":
+                    return RemoteTunnelPort.ToString();
+                case "exe-file":
+                    return Path.GetFileName(build_exe_path);
+                default:
+                    return "?";
+
+            }
+        }
 
 
 		public SoftDebuggerStartInfo DebuggerInfo (int consolePort = -1)

SSHDebugger/Host/clsHost.cs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MonoDevelop.Addins.0.4.4\build\MonoDevelop.Addins.props" Condition="Exists('..\packages\MonoDevelop.Addins.0.4.4\build\MonoDevelop.Addins.props')" />
+  <Import Project="..\packages\MonoDevelop.Addins.0.4.5\build\MonoDevelop.Addins.props" Condition="Exists('..\packages\MonoDevelop.Addins.0.4.5\build\MonoDevelop.Addins.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -63,12 +63,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Reference Include="Renci.SshNet">
-      <HintPath>..\Renci.SshNet.dll</HintPath>
-    </Reference>
     <Reference Include="vte-sharp" Condition="$(DefineConstants.Contains('VTE'))">
       <HintPath>..\vte-sharp.dll</HintPath>
     </Reference>
+    <Reference Include="Renci.SshNet">
+      <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <AddinFile Include="ssh-host.xft.xml" />
@@ -90,5 +90,5 @@
     <AddinReference Include="MonoDevelop.Debugger" />
     <AddinReference Include="MonoDevelop.Debugger.Soft" />
   </ItemGroup>
-  <Import Project="..\packages\MonoDevelop.Addins.0.4.4\build\MonoDevelop.Addins.targets" Condition="Exists('..\packages\MonoDevelop.Addins.0.4.4\build\MonoDevelop.Addins.targets')" />
+  <Import Project="..\packages\MonoDevelop.Addins.0.4.5\build\MonoDevelop.Addins.targets" Condition="Exists('..\packages\MonoDevelop.Addins.0.4.5\build\MonoDevelop.Addins.targets')" />
 </Project>

SSHDebugger/SSHDebugger.csproj

@@ -473,20 +473,40 @@ public String RequestUserInput(String prompt, char? echoChar=null)
 			UserInputMode = true;
 			Write (prompt);
 			String input = "";
-			while (userkeypress.WaitOne ())
+			while (UserInputMode && userkeypress.WaitOne ())
 			{				
-				if (LastKeyPress == Gdk.Key.BackSpace) {
-					if (input.Length > 0) {
-						input = input.Substring (0, input.Length - 1);
-						if (echoChar.HasValue) Write ("\b \b");
+				switch(LastKeyPress)
+				{
+				    case Gdk.Key.BackSpace:
+					{
+					    if (input.Length > 0)
+					    {
+						input = input.Substring(0, input.Length - 1);
+						if (echoChar.HasValue) Write("\b \b");
+					    }
+					}
+					break;
+				    case Gdk.Key.Return:
+				    case Gdk.Key.KP_Enter:
+					{
+					    Write(Environment.NewLine);
+					    UserInputMode = false; //Stop Input
+					    break;
+					}
+				    case Gdk.Key.Shift_L:
+				    case Gdk.Key.Shift_R:
+				    case Gdk.Key.ISO_Level3_Shift: //Alt Gr
+					{
+					    //Do nothing
+					}
+					break;
+				    default:
+					{
+					    var keyValue = (char)Gdk.Keyval.ToUnicode((uint)LastKeyPress);
+					    Write(echoChar.HasValue ? echoChar.Value.ToString() : keyValue.ToString());
+					    input += keyValue;
 					}
-				} else if (LastKeyPress == Gdk.Key.Return) {
-					Write ("\r\n");
 					break;
-				} else {
-					var keyValue = (char)LastKeyPress;
-					Write (echoChar.HasValue ? echoChar.Value.ToString() : keyValue.ToString());
-					input += keyValue;
 				}
 			}
 			UserInputMode = false;

SSHDebugger/Terminal/clsSSHTerminal.cs

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MonoDevelop.Addins" version="0.4.4" targetFramework="net461" />
+  <package id="MonoDevelop.Addins" version="0.4.5" targetFramework="net461" />
+  <package id="SSH.NET" version="2016.1.0" targetFramework="net461" />
 </packages>

SSHDebugger/packages.config

@@ -27,6 +27,7 @@
 #	[exe-file]	 =  output .exe filename
 #   [exe-path]   =  path to output .exe
 # 	[mdb-path]   =  path to output .exe.mdb
+#   [pdb-path]   =  path to output .pdb
 #	[build-path] =  path to output
 #	[work-dir]	 =  remote working dir