2008-08-27 Miguel de Icaza <miguel@novell.com>

[mono.git] / mcs / class / corlib / System / ConsoleDriver.cs

diff --git a/mcs/class/corlib/System/ConsoleDriver.cs b/mcs/class/corlib/System/ConsoleDriver.cs
index af50fb8cfa0e4f81fc38ad5ca7862c4e240c35f5..50ea05122767e77eccedae6041c71ffc39f0b6d7 100644 (file)
--- a/mcs/class/corlib/System/ConsoleDriver.cs
+++ b/mcs/class/corlib/System/ConsoleDriver.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if (NET_2_0||BOOTSTRAP_NET_2_0) && !NET_2_1
 using System.IO;
 using System.Runtime.CompilerServices;
 
@@ -39,20 +39,40 @@ namespace System {
 
                static ConsoleDriver ()
                {
+                       // Put the actual new statements into separate methods to avoid initalizing
+                       // three classes when only one is needed.
                        if (!IsConsole) {
-                               driver = new NullConsoleDriver ();
+                               driver = CreateNullConsoleDriver ();
                        } else if (Environment.IsRunningOnWindows) {
-                               driver = new WindowsConsoleDriver ();
+                               driver = CreateWindowsConsoleDriver ();
                        } else {
-                               driver = new TermInfoDriver (Environment.GetEnvironmentVariable ("TERM"));
+                               string term = Environment.GetEnvironmentVariable ("TERM");
+
+                               // Perhaps we should let the Terminfo driver return a
+                               // success/failure flag based on the terminal properties
+                               if (term == "dumb"){
+                                       is_console = false;
+                                       driver = CreateNullConsoleDriver ();
+                               } else
+                                       driver = CreateTermInfoDriver (term);
                        }
                }
 
-               public static bool Echo {
-                       get { return driver.Echo; }
-                       set { driver.Echo = value; }
+               [MethodImplAttribute (MethodImplOptions.NoInlining)]
+               static IConsoleDriver CreateNullConsoleDriver () {
+                       return new NullConsoleDriver ();
                }
 
+               [MethodImplAttribute (MethodImplOptions.NoInlining)]
+               static IConsoleDriver CreateWindowsConsoleDriver () {
+                       return new WindowsConsoleDriver ();
+               }
+
+               [MethodImplAttribute (MethodImplOptions.NoInlining)]
+               static IConsoleDriver CreateTermInfoDriver (string term) {
+                       return new TermInfoDriver (term);
+               }
+               
                public static bool Initialized {
                        get { return driver.Initialized; }
                }
@@ -245,7 +265,7 @@ namespace System {
                internal static extern int InternalKeyAvailable (int ms_timeout);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               internal static extern bool TtySetup (string teardown, out byte verase, out byte vsusp, out byte intr);
+               internal static extern bool TtySetup (string keypadXmit, string teardown, out byte verase, out byte vsusp, out byte intr);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                internal static extern bool SetEcho (bool wantEcho);
@@ -255,9 +275,6 @@ namespace System {
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                internal static extern bool GetTtySize (IntPtr handle, out int width, out int height);
-
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               internal static extern void Suspend ();
        }
 }
 #endif