Merge branch 'dynamic-library-loader'

Example/demo.cs

@@ -291,7 +291,8 @@ static class Demo {
 
 			ml.Text = $"Mouse: ({me.X},{me.Y}) - {me.Flags} {count++}";
 		};
-
+		var test = new Label (3, 18, "Se iniciará el análisis");
+		win.Add (test);
 		win.Add (ml);
 
 		// ShowTextAlignments (win);

Terminal.Gui/Drivers/ConsoleDriver.cs

@@ -141,6 +141,7 @@ namespace Terminal.Gui {
 		/// The base color scheme, for the default toplevel views.
 		/// </summary>
 		public static ColorScheme Base;
+		
 		/// <summary>
 		/// The dialog color scheme, for standard popup dialog boxes
 		/// </summary>

Terminal.Gui/MonoCurses/UnmanagedLibrary.cs

@@ -0,0 +1,264 @@
+
+
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#define GUICS
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+
+
+namespace Mono.Terminal.Internal {
+	/// <summary>
+	/// Represents a dynamically loaded unmanaged library in a (partially) platform independent manner.
+	/// First, the native library is loaded using dlopen (on Unix systems) or using LoadLibrary (on Windows).
+	/// dlsym or GetProcAddress are then used to obtain symbol addresses. <c>Marshal.GetDelegateForFunctionPointer</c>
+	/// transforms the addresses into delegates to native methods.
+	/// See http://stackoverflow.com/questions/13461989/p-invoke-to-dynamically-loaded-library-on-mono.
+	/// </summary>
+	internal class UnmanagedLibrary {
+		const string UnityEngineApplicationClassName = "UnityEngine.Application, UnityEngine";
+		const string XamarinAndroidObjectClassName = "Java.Lang.Object, Mono.Android";
+		const string XamarinIOSObjectClassName = "Foundation.NSObject, Xamarin.iOS";
+		static bool IsWindows, IsLinux, IsMacOS;
+		static bool Is64Bit;
+		static bool IsMono, IsUnity, IsXamarinIOS, IsXamarinAndroid, IsXamarin;
+		static bool IsNetCore;
+
+		public static bool IsMacOSPlatform => IsMacOS;
+		
+		[DllImport ("libc")]
+		static extern int uname (IntPtr buf);
+
+		static string GetUname ()
+		{
+			var buffer = Marshal.AllocHGlobal (8192);
+			try {
+				if (uname (buffer) == 0) {
+					return Marshal.PtrToStringAnsi (buffer);
+				}
+				return string.Empty;
+			} catch {
+				return string.Empty;
+			} finally {
+				if (buffer != IntPtr.Zero) {
+					Marshal.FreeHGlobal (buffer);
+				}
+			}
+		}
+
+		static UnmanagedLibrary ()
+		{
+			var platform = Environment.OSVersion.Platform;
+
+			IsMacOS = (platform == PlatformID.Unix && GetUname () == "Darwin");
+			IsLinux = (platform == PlatformID.Unix && !IsMacOS);
+			IsWindows = (platform == PlatformID.Win32NT || platform == PlatformID.Win32S || platform == PlatformID.Win32Windows);
+			Is64Bit = Marshal.SizeOf (typeof (IntPtr)) == 8;
+			IsMono = Type.GetType ("Mono.Runtime") != null;
+			if (!IsMono) {
+				IsNetCore = Type.GetType ("System.MathF") != null;
+			}
+#if GUICS
+			IsUnity = IsXamarinIOS = IsXamarinAndroid = IsXamarin = false;
+#else
+			IsUnity = Type.GetType (UnityEngineApplicationClassName) != null;
+			IsXamarinIOS = Type.GetType (XamarinIOSObjectClassName) != null;
+			IsXamarinAndroid = Type.GetType (XamarinAndroidObjectClassName) != null;
+			IsXamarin = IsXamarinIOS || IsXamarinAndroid;
+#endif
+
+		}
+
+		// flags for dlopen
+		const int RTLD_LAZY = 1;
+		const int RTLD_GLOBAL = 8;
+
+		readonly string libraryPath;
+		readonly IntPtr handle;
+
+		public IntPtr NativeLibraryHandle => handle;
+
+		//
+		// if isFullPath is set to true, the provided array of libraries are full paths
+		// and are tested for the file existing, otherwise the file is merely the name
+		// of the shared library that we pass to dlopen
+		//
+		public UnmanagedLibrary (string [] libraryPathAlternatives, bool isFullPath)
+		{
+			if (isFullPath){
+				this.libraryPath = FirstValidLibraryPath (libraryPathAlternatives);
+				this.handle = PlatformSpecificLoadLibrary (this.libraryPath);
+			} else {
+				foreach (var lib in libraryPathAlternatives){
+					this.handle = PlatformSpecificLoadLibrary (lib);
+					if (this.handle != IntPtr.Zero)
+						break;
+				}
+			}
+
+			if (this.handle == IntPtr.Zero) {
+				throw new IOException (string.Format ("Error loading native library \"{0}\"", this.libraryPath));
+			}
+		}
+
+		/// <summary>
+		/// Loads symbol in a platform specific way.
+		/// </summary>
+		/// <param name="symbolName"></param>
+		/// <returns></returns>
+		public IntPtr LoadSymbol (string symbolName)
+		{
+			if (IsWindows) {
+				// See http://stackoverflow.com/questions/10473310 for background on this.
+				if (Is64Bit) {
+					return Windows.GetProcAddress (this.handle, symbolName);
+				} else {
+					// Yes, we could potentially predict the size... but it's a lot simpler to just try
+					// all the candidates. Most functions have a suffix of @0, @4 or @8 so we won't be trying
+					// many options - and if it takes a little bit longer to fail if we've really got the wrong
+					// library, that's not a big problem. This is only called once per function in the native library.
+					symbolName = "_" + symbolName + "@";
+					for (int stackSize = 0; stackSize < 128; stackSize += 4) {
+						IntPtr candidate = Windows.GetProcAddress (this.handle, symbolName + stackSize);
+						if (candidate != IntPtr.Zero) {
+							return candidate;
+						}
+					}
+					// Fail.
+					return IntPtr.Zero;
+				}
+			}
+			if (IsLinux) {
+				if (IsMono) {
+					return Mono.dlsym (this.handle, symbolName);
+				}
+				if (IsNetCore) {
+					return CoreCLR.dlsym (this.handle, symbolName);
+				}
+				return Linux.dlsym (this.handle, symbolName);
+			}
+			if (IsMacOS) {
+				return MacOSX.dlsym (this.handle, symbolName);
+			}
+			throw new InvalidOperationException ("Unsupported platform.");
+		}
+
+		public T GetNativeMethodDelegate<T> (string methodName)
+		    where T : class
+		{
+			var ptr = LoadSymbol (methodName);
+			if (ptr == IntPtr.Zero) {
+				throw new MissingMethodException (string.Format ("The native method \"{0}\" does not exist", methodName));
+			}
+            		return Marshal.GetDelegateForFunctionPointer<T>(ptr);  // non-generic version is obsolete
+		}
+
+		/// <summary>
+		/// Loads library in a platform specific way.
+		/// </summary>
+		private static IntPtr PlatformSpecificLoadLibrary (string libraryPath)
+		{
+			if (IsWindows) {
+				return Windows.LoadLibrary (libraryPath);
+			}
+			if (IsLinux) {
+				if (IsMono) {
+					return Mono.dlopen (libraryPath, RTLD_GLOBAL + RTLD_LAZY);
+				}
+				if (IsNetCore) {
+					return CoreCLR.dlopen (libraryPath, RTLD_GLOBAL + RTLD_LAZY);
+				}
+				return Linux.dlopen (libraryPath, RTLD_GLOBAL + RTLD_LAZY);
+			}
+			if (IsMacOS) {
+				return MacOSX.dlopen (libraryPath, RTLD_GLOBAL + RTLD_LAZY);
+			}
+			throw new InvalidOperationException ("Unsupported platform.");
+		}
+
+		private static string FirstValidLibraryPath (string [] libraryPathAlternatives)
+		{
+			foreach (var path in libraryPathAlternatives) {
+				if (File.Exists (path)) {
+					return path;
+				}
+			}
+			throw new FileNotFoundException (
+			    String.Format ("Error loading native library. Not found in any of the possible locations: {0}",
+				string.Join (",", libraryPathAlternatives)));
+		}
+
+		private static class Windows
+		{
+			[DllImport ("kernel32.dll")]
+			internal static extern IntPtr LoadLibrary (string filename);
+
+			[DllImport ("kernel32.dll")]
+			internal static extern IntPtr GetProcAddress (IntPtr hModule, string procName);
+		}
+
+		private static class Linux
+		{
+			[DllImport ("libdl.so")]
+			internal static extern IntPtr dlopen (string filename, int flags);
+
+			[DllImport ("libdl.so")]
+			internal static extern IntPtr dlsym (IntPtr handle, string symbol);
+		}
+
+		private static class MacOSX
+		{
+			[DllImport ("libSystem.dylib")]
+			internal static extern IntPtr dlopen (string filename, int flags);
+
+			[DllImport ("libSystem.dylib")]
+			internal static extern IntPtr dlsym (IntPtr handle, string symbol);
+		}
+
+		/// <summary>
+		/// On Linux systems, using using dlopen and dlsym results in
+		/// DllNotFoundException("libdl.so not found") if libc6-dev
+		/// is not installed. As a workaround, we load symbols for
+		/// dlopen and dlsym from the current process as on Linux
+		/// Mono sure is linked against these symbols.
+		/// </summary>
+		private static class Mono
+		{
+			[DllImport ("__Internal")]
+			internal static extern IntPtr dlopen (string filename, int flags);
+
+			[DllImport ("__Internal")]
+			internal static extern IntPtr dlsym (IntPtr handle, string symbol);
+		}
+
+		/// <summary>
+		/// Similarly as for Mono on Linux, we load symbols for
+		/// dlopen and dlsym from the "libcoreclr.so",
+		/// to avoid the dependency on libc-dev Linux.
+		/// </summary>
+		private static class CoreCLR
+		{
+			[DllImport ("libcoreclr.so")]
+			internal static extern IntPtr dlopen (string filename, int flags);
+
+			[DllImport ("libcoreclr.so")]
+			internal static extern IntPtr dlsym (IntPtr handle, string symbol);
+		}
+	}
+}

Terminal.Gui/MonoCurses/binding.cs

@@ -1,4 +1,10 @@
-
+//
+// TODO:
+// * FindNCurses needs to remove the old probing code
+// * Removal of that proxy code
+// * Need to implement reading pointers with the new API
+// * Can remove the manual Dlopen features
+// * initscr() diagnostics based on DLL can be fixed
 //
 // binding.cs.in: Core binding for curses.
 //
@@ -38,6 +44,7 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
+using Mono.Terminal.Internal;
 
 namespace Unix.Terminal {
 
@@ -56,39 +63,21 @@ namespace Unix.Terminal {
 		// If true, uses the DllImport into "ncurses", otherwise "libncursesw.so.5"
 		static bool use_naked_driver;
 
-		//
-		// Ugly hack to P/Invoke into either libc, or libdl, again, because
-		// we can not have nice things - .NET Core in this day and age still
-		// does not have <dllmap>
-		//
-		static IntPtr DlOpen (string path)
+		static UnmanagedLibrary curses_library;
+		static NativeMethods methods;
+		
+		static void LoadMethods ()
 		{
-			if (!uselibc){
-				try {
-					var handle = dlopen (path, 1);
-					return handle;
-				} catch (DllNotFoundException){
-					uselibc = true;
-					return DlOpen (path);
-				}
-			} else {
-				return libc_dlopen (path, 1);
-			}
+			var libs = UnmanagedLibrary.IsMacOSPlatform ? new string [] { "libncurses.dylib" } : new string [] { "libncursesw.so.6", "libncursesw.so.5" };
+			curses_library = new UnmanagedLibrary (libs, false);
+			methods = new NativeMethods (curses_library);
 		}
-		
+
 		static void FindNCurses ()
 		{
-			if (File.Exists ("/usr/lib/libncurses.dylib")){
-				curses_handle = DlOpen ("libncurses.dylib");
-				use_naked_driver = true;
-			} else 
-				curses_handle = DlOpen ("libncursesw.so.5");
+			LoadMethods ();
+			curses_handle = methods.UnmanagedLibrary.NativeLibraryHandle;
 
-			if (curses_handle == IntPtr.Zero) {
-				Console.WriteLine ("It is not possible to open the dynamic library ncurses, tried looking for libncurses.dylib on Mac, and libncursesw.so.5 on Linux");
-				Environment.Exit (1);
-			}
-			
 			stdscr = read_static_ptr ("stdscr");
 			curscr_ptr = get_ptr ("curscr");
 			lines_ptr = get_ptr ("LINES");
@@ -99,7 +88,7 @@ namespace Unix.Terminal {
 		{
 			FindNCurses ();
 			
-			main_window = new Window (real_initscr ());
+			main_window = new Window (methods.initscr ());
 			try {
 				console_sharp_get_dims (out lines, out cols);
 			} catch (DllNotFoundException){
@@ -159,30 +148,16 @@ namespace Unix.Terminal {
 		public static int addch (int ch)
 		{
 			if (ch < 127 || ch > 0xffff )
-				return _addch (ch);
+				return methods.addch (ch);
 			char c = (char) ch;
 			return addstr (new String (c, 1));
 		}
-		
-		[DllImport ("dl")]
-		extern static IntPtr dlopen (string file, int mode);
-
-		[DllImport ("dl")]
-		extern static IntPtr dlsym (IntPtr handle, string symbol);
-
-		[DllImport ("libc", EntryPoint="dlopen")]
-		extern static IntPtr libc_dlopen (string file, int mode);
-
-		[DllImport ("libc", EntryPoint ="dlsym")]
-		extern static IntPtr libc_dlsym (IntPtr handle, string symbol);
-
-		static bool uselibc;
 
 		static IntPtr stdscr;
 
 		static IntPtr get_ptr (string key)
 		{
-			var ptr = uselibc ? libc_dlsym (curses_handle, key) : dlsym (curses_handle, key);
+			var ptr = curses_library.LoadSymbol (key);
 
 			if (ptr == IntPtr.Zero)
 				throw new Exception ("Could not load the key " + key);
@@ -212,7 +187,7 @@ namespace Unix.Terminal {
 		public static Event mousemask (Event newmask, out Event oldmask)
 		{
 			IntPtr e;
-			var ret = (Event) (use_naked_driver ? RegularCurses.call_mousemask ((IntPtr) newmask, out e) : CursesLinux.call_mousemask ((IntPtr) newmask, out e));
+			var ret = (Event) (methods.mousemask ((IntPtr) newmask, out e));
 			oldmask = (Event) e;
 			return ret;
 		}
@@ -227,429 +202,248 @@ namespace Unix.Terminal {
 				return key & ~KeyAlt;
 			return 0;
 		}
-		public static int StartColor () => start_color ();
-		public static bool HasColors => has_colors ();
-		public static int InitColorPair (short pair, short foreground, short background) => init_pair (pair, foreground, background);
-		public static int UseDefaultColors () => use_default_colors ();
-		public static int ColorPairs => COLOR_PAIRS();
-
+		public static int StartColor () => methods.start_color ();
+		public static bool HasColors => methods.has_colors ();
+		public static int InitColorPair (short pair, short foreground, short background) => methods.init_pair (pair, foreground, background);
+		public static int UseDefaultColors () => methods.use_default_colors ();
+		public static int ColorPairs => methods.COLOR_PAIRS();
 
 		//
 		// The proxy methods to call into each version
 		//
-		static public IntPtr real_initscr () => use_naked_driver ? RegularCurses.real_initscr () : CursesLinux.real_initscr ();
-		static public int endwin () => use_naked_driver ? RegularCurses.endwin () : CursesLinux.endwin ();
-		static public bool isendwin () => use_naked_driver ? RegularCurses.isendwin () : CursesLinux.isendwin ();
-		static public IntPtr internal_newterm (string type, IntPtr file_outfd, IntPtr file_infd) => use_naked_driver ? RegularCurses.internal_newterm (type, file_outfd, file_infd) : CursesLinux.internal_newterm (type, file_outfd, file_infd);
-		static public IntPtr internal_set_term (IntPtr newscreen) => use_naked_driver ? RegularCurses.internal_set_term (newscreen) : CursesLinux.internal_set_term (newscreen);
-		static public void internal_delscreen (IntPtr sp) { if (use_naked_driver) RegularCurses.internal_delscreen (sp); else CursesLinux.internal_delscreen (sp); }
-		static public int cbreak () => use_naked_driver ? RegularCurses.cbreak () : CursesLinux.cbreak ();
-		static public int nocbreak () => use_naked_driver ? RegularCurses.nocbreak () : CursesLinux.nocbreak ();
-		static public int echo () => use_naked_driver ? RegularCurses.echo () : CursesLinux.echo ();
-		static public int noecho () => use_naked_driver ? RegularCurses.noecho () : CursesLinux.noecho ();
-		static public int halfdelay (int t) => use_naked_driver ? RegularCurses.halfdelay (t) : CursesLinux.halfdelay (t);
-		static public int raw () => use_naked_driver ? RegularCurses.raw () : CursesLinux.raw ();
-		static public int noraw () => use_naked_driver ? RegularCurses.noraw () : CursesLinux.noraw ();
-		static public void noqiflush () { if (use_naked_driver) RegularCurses.noqiflush (); else CursesLinux.noqiflush (); }
-		static public void qiflush () { if (use_naked_driver) RegularCurses.qiflush (); else CursesLinux.qiflush (); }
-		static public int typeahead (IntPtr fd) => use_naked_driver ? RegularCurses.typeahead (fd) : CursesLinux.typeahead (fd);
-		static public int timeout (int delay) => use_naked_driver ? RegularCurses.timeout (delay) : CursesLinux.timeout (delay);
-		static public int wtimeout (IntPtr win, int delay) => use_naked_driver ? RegularCurses.wtimeout (win, delay) : CursesLinux.wtimeout (win, delay);
-		static public int notimeout (IntPtr win, bool bf) => use_naked_driver ? RegularCurses.notimeout (win, bf) : CursesLinux.notimeout (win, bf);
-		static public int keypad (IntPtr win, bool bf) => use_naked_driver ? RegularCurses.keypad (win, bf) : CursesLinux.keypad (win, bf);
-		static public int meta (IntPtr win, bool bf) => use_naked_driver ? RegularCurses.meta (win, bf) : CursesLinux.meta (win, bf);
-		static public int intrflush (IntPtr win, bool bf) => use_naked_driver ? RegularCurses.intrflush (win, bf) : CursesLinux.intrflush (win, bf);
-		static public int clearok (IntPtr win, bool bf) => use_naked_driver ? RegularCurses.clearok (win, bf) : CursesLinux.clearok (win, bf);
-		static public int idlok (IntPtr win, bool bf) => use_naked_driver ? RegularCurses.idlok (win, bf) : CursesLinux.idlok (win, bf);
-		static public void idcok (IntPtr win, bool bf) { if (use_naked_driver) RegularCurses.idcok (win, bf); else CursesLinux.idcok (win, bf);}
-		static public void immedok (IntPtr win, bool bf) { if (use_naked_driver) RegularCurses.immedok (win, bf); else CursesLinux.immedok (win, bf);}
-		static public int leaveok (IntPtr win, bool bf) => use_naked_driver ? RegularCurses.leaveok (win, bf) : CursesLinux.leaveok (win, bf);
-		static public int wsetscrreg (IntPtr win, int top, int bot) => use_naked_driver ? RegularCurses.wsetscrreg (win, top, bot) : CursesLinux.wsetscrreg (win, top, bot);
-		static public int scrollok (IntPtr win, bool bf) => use_naked_driver ? RegularCurses.scrollok (win, bf) : CursesLinux.scrollok (win, bf);
-		static public int nl() => use_naked_driver ? RegularCurses.nl() : CursesLinux.nl();
-		static public int nonl() => use_naked_driver ? RegularCurses.nonl() : CursesLinux.nonl();
-		static public int setscrreg (int top, int bot) => use_naked_driver ? RegularCurses.setscrreg (top, bot) : CursesLinux.setscrreg (top, bot);
-		static public int refresh () => use_naked_driver ? RegularCurses.refresh () : CursesLinux.refresh ();
-		static public int doupdate() => use_naked_driver ? RegularCurses.doupdate() : CursesLinux.doupdate();
-		static public int wrefresh (IntPtr win) => use_naked_driver ? RegularCurses.wrefresh (win) : CursesLinux.wrefresh (win);
-		static public int redrawwin (IntPtr win) => use_naked_driver ? RegularCurses.redrawwin (win) : CursesLinux.redrawwin (win);
-		static public int wredrawwin (IntPtr win, int beg_line, int num_lines) => use_naked_driver ? RegularCurses.wredrawwin (win, beg_line, num_lines) : CursesLinux.wredrawwin (win, beg_line, lines);
-		static public int wnoutrefresh (IntPtr win) => use_naked_driver ? RegularCurses.wnoutrefresh (win) : CursesLinux.wnoutrefresh (win);
-		static public int move (int line, int col) => use_naked_driver ? RegularCurses.move (line, col) : CursesLinux.move (line, col);
-		static public int _addch (int ch) => use_naked_driver ? RegularCurses._addch (ch) : CursesLinux._addch (ch);
-		static public int addstr (string s) => use_naked_driver ? RegularCurses.addstr (s) : CursesLinux.addstr (s);
-		static public int wmove (IntPtr win, int line, int col) => use_naked_driver ? RegularCurses.wmove (win, line, col) : CursesLinux.wmove (win, line, col);
-		static public int waddch (IntPtr win, int ch) => use_naked_driver ? RegularCurses.waddch (win, ch) : CursesLinux.waddch (win, ch);
-		static public int attron (int attrs) => use_naked_driver ? RegularCurses.attron (attrs) : CursesLinux.attron (attrs);
-		static public int attroff (int attrs) => use_naked_driver ? RegularCurses.attroff (attrs) : CursesLinux.attroff (attrs);
-		static public int attrset (int attrs) => use_naked_driver ? RegularCurses.attrset (attrs) : CursesLinux.attrset (attrs);
-		static public int getch () => use_naked_driver ? RegularCurses.getch () : CursesLinux.getch ();
-		static public int get_wch (out int sequence) => use_naked_driver ? RegularCurses.get_wch (out sequence) : CursesLinux.get_wch (out sequence);
-		static public int ungetch (int ch) => use_naked_driver ? RegularCurses.ungetch (ch) : CursesLinux.ungetch (ch);
-		static public int mvgetch (int y, int x) => use_naked_driver ? RegularCurses.mvgetch (y, x) : CursesLinux.mvgetch (y, x);
-		static public bool has_colors () => use_naked_driver ? RegularCurses.has_colors () : CursesLinux.has_colors ();
-		static public int start_color () => use_naked_driver ? RegularCurses.start_color () : CursesLinux.start_color ();
-		static public int init_pair (short pair, short f, short b) => use_naked_driver ? RegularCurses.init_pair (pair, f, b) : CursesLinux.init_pair (pair, f, b);
-		static public int use_default_colors () => use_naked_driver ? RegularCurses.use_default_colors () : CursesLinux.use_default_colors ();
-		static public int COLOR_PAIRS() => use_naked_driver ? RegularCurses.COLOR_PAIRS() : CursesLinux.COLOR_PAIRS();
-		static public uint getmouse (out MouseEvent ev) => use_naked_driver ? RegularCurses.getmouse (out ev) : CursesLinux.getmouse (out ev);
-		static public uint ungetmouse (ref MouseEvent ev) => use_naked_driver ? RegularCurses.ungetmouse (ref ev) : CursesLinux.ungetmouse (ref ev);
-		static public int mouseinterval (int interval) => use_naked_driver ? RegularCurses.mouseinterval (interval) : CursesLinux.mouseinterval (interval);
+		static public int endwin () => methods.endwin ();
+		static public bool isendwin () => methods.isendwin ();
+		static public int cbreak () => methods.cbreak ();
+		static public int nocbreak () => methods.nocbreak ();
+		static public int echo () => methods.echo ();
+		static public int noecho () => methods.noecho ();
+		static public int halfdelay (int t) => methods.halfdelay (t);
+		static public int raw () => methods.raw ();
+		static public int noraw () => methods.noraw ();
+		static public void noqiflush () => methods.noqiflush ();
+		static public void qiflush () => methods.qiflush ();
+		static public int typeahead (IntPtr fd) => methods.typeahead (fd);
+		static public int timeout (int delay) => methods.timeout (delay);
+		static public int wtimeout (IntPtr win, int delay) => methods.wtimeout (win, delay);
+		static public int notimeout (IntPtr win, bool bf) => methods.notimeout (win, bf);
+		static public int keypad (IntPtr win, bool bf) => methods.keypad (win, bf);
+		static public int meta (IntPtr win, bool bf) => methods.meta (win, bf);
+		static public int intrflush (IntPtr win, bool bf) => methods.intrflush (win, bf);
+		static public int clearok (IntPtr win, bool bf) => methods.clearok (win, bf);
+		static public int idlok (IntPtr win, bool bf) => methods.idlok (win, bf);
+		static public void idcok (IntPtr win, bool bf) => methods.idcok (win, bf);
+		static public void immedok (IntPtr win, bool bf) => methods.immedok (win, bf);
+		static public int leaveok (IntPtr win, bool bf) => methods.leaveok (win, bf);
+		static public int wsetscrreg (IntPtr win, int top, int bot) => methods.wsetscrreg (win, top, bot);
+		static public int scrollok (IntPtr win, bool bf) => methods.scrollok (win, bf);
+		static public int nl() => methods.nl();
+		static public int nonl() => methods.nonl();
+		static public int setscrreg (int top, int bot) => methods.setscrreg (top, bot);
+		static public int refresh () => methods.refresh ();
+		static public int doupdate() => methods.doupdate();
+		static public int wrefresh (IntPtr win) => methods.wrefresh (win);
+		static public int redrawwin (IntPtr win) => methods.redrawwin (win);
+		//static public int wredrawwin (IntPtr win, int beg_line, int num_lines) => methods.wredrawwin (win, beg_line, num_lines);
+		static public int wnoutrefresh (IntPtr win) => methods.wnoutrefresh (win);
+		static public int move (int line, int col) => methods.move (line, col);
+		//static public int addch (int ch) => methods.addch (ch);
+		static public int addstr (string s) => methods.addstr (s);
+		static public int wmove (IntPtr win, int line, int col) => methods.wmove (win, line, col);
+		static public int waddch (IntPtr win, int ch) => methods.waddch (win, ch);
+		static public int attron (int attrs) => methods.attron (attrs);
+		static public int attroff (int attrs) => methods.attroff (attrs);
+		static public int attrset (int attrs) => methods.attrset (attrs);
+		static public int getch () => methods.getch ();
+		static public int get_wch (out int sequence) => methods.get_wch (out sequence);
+		static public int ungetch (int ch) => methods.ungetch (ch);
+		static public int mvgetch (int y, int x) => methods.mvgetch (y, x);
+		static public bool has_colors () => methods.has_colors ();
+		static public int start_color () => methods.start_color ();
+		static public int init_pair (short pair, short f, short b) => methods.init_pair (pair, f, b);
+		static public int use_default_colors () => methods.use_default_colors ();
+		static public int COLOR_PAIRS() => methods.COLOR_PAIRS();
+		static public uint getmouse (out MouseEvent ev) => methods.getmouse (out ev);
+		static public uint ungetmouse (ref MouseEvent ev) => methods.ungetmouse (ref ev);
+		static public int mouseinterval (int interval) => methods.mouseinterval (interval);
 	}
-	
-	//
-	// P/Invoke definitions for looking up symbols in the "ncurses" library, as resolved
-	// by the dynamic linker, different than CursesLinux that looksup by "libncursesw.so.5"
-	//
-	internal class RegularCurses {
-		[DllImport ("ncurses", EntryPoint="initscr")]
-		extern static internal IntPtr real_initscr ();
-
-		[DllImport ("ncurses")]
-		extern static public int endwin ();
-
-		[DllImport ("ncurses")]
-		extern static public bool isendwin ();
-
-		//
-		// Screen operations are flagged as internal, as we need to
-		// catch all changes so we can update newscr, curscr, stdscr
-		//
-		[DllImport ("ncurses")]
-		extern static public IntPtr internal_newterm (string type, IntPtr file_outfd, IntPtr file_infd);
-
-		[DllImport ("ncurses")]
-		extern static public IntPtr internal_set_term (IntPtr newscreen);
-
-		[DllImport ("ncurses")]
-	        extern static internal void internal_delscreen (IntPtr sp);
-
-		[DllImport ("ncurses")]
-		extern static public int cbreak ();
-		
-		[DllImport ("ncurses")]
-		extern static public int nocbreak ();
-		
-		[DllImport ("ncurses")]
-		extern static public int echo ();
-		
-		[DllImport ("ncurses")]
-		extern static public int noecho ();
-		
-		[DllImport ("ncurses")]
-		extern static public int halfdelay (int t);
-
-		[DllImport ("ncurses")]
-		extern static public int raw ();
-
-		[DllImport ("ncurses")]
-		extern static public int noraw ();
-		
-		[DllImport ("ncurses")]
-		extern static public void noqiflush ();
-		
-		[DllImport ("ncurses")]
-		extern static public void qiflush ();
-
-		[DllImport ("ncurses")]
-		extern static public int typeahead (IntPtr fd);
-
-		[DllImport ("ncurses")]
-		extern static public int timeout (int delay);
-
-		//
-		// Internal, as they are exposed in Window
-		//
-		[DllImport ("ncurses")]
-		extern static internal int wtimeout (IntPtr win, int delay);
-	       
-		[DllImport ("ncurses")]
-		extern static internal int notimeout (IntPtr win, bool bf);
-
-		[DllImport ("ncurses")]
-		extern static internal int keypad (IntPtr win, bool bf);
-		
-		[DllImport ("ncurses")]
-		extern static internal int meta (IntPtr win, bool bf);
-		
-		[DllImport ("ncurses")]
-		extern static internal int intrflush (IntPtr win, bool bf);
-
-		[DllImport ("ncurses")]
-		extern internal static int clearok (IntPtr win, bool bf);
-		[DllImport ("ncurses")]
-		extern internal static int idlok (IntPtr win, bool bf);
-		[DllImport ("ncurses")]
-		extern internal static void idcok (IntPtr win, bool bf);
-		[DllImport ("ncurses")]
-		extern internal static void immedok (IntPtr win, bool bf);
-		[DllImport ("ncurses")]
-		extern internal static int leaveok (IntPtr win, bool bf);
-		[DllImport ("ncurses")]
-		extern internal static int wsetscrreg (IntPtr win, int top, int bot);
-		[DllImport ("ncurses")]
-		extern internal static int scrollok (IntPtr win, bool bf);
-		
-		[DllImport ("ncurses")]
-		extern public static int nl();
-		[DllImport ("ncurses")]
-		extern public static int nonl();
-		[DllImport ("ncurses")]
-		extern public static int setscrreg (int top, int bot);
-		
-
-		[DllImport ("ncurses")]
-		extern public static int refresh ();
-		[DllImport ("ncurses")]
-		extern public static int doupdate();
-
-		[DllImport ("ncurses")]
-		extern internal static int wrefresh (IntPtr win);
-		[DllImport ("ncurses")]
-		extern internal static int redrawwin (IntPtr win);
-		[DllImport ("ncurses")]
-		extern internal static int wredrawwin (IntPtr win, int beg_line, int num_lines);
-		[DllImport ("ncurses")]
-		extern internal static int wnoutrefresh (IntPtr win);
-
-		[DllImport ("ncurses")]
-		extern public static int move (int line, int col);
-
-		[DllImport ("ncurses", EntryPoint="addch")]
-		extern internal static int _addch (int ch);
-		
-		[DllImport ("ncurses")]
-		extern public static int addstr (string s);
-
-		[DllImport ("ncurses")]
-		extern internal static int wmove (IntPtr win, int line, int col);
-
-		[DllImport ("ncurses")]
-		extern internal static int waddch (IntPtr win, int ch);
-
-		[DllImport ("ncurses")]
-		extern public static int attron (int attrs);
-		[DllImport ("ncurses")]
-		extern public static int attroff (int attrs);
-		[DllImport ("ncurses")]
-		extern public static int attrset (int attrs);
-
-		[DllImport ("ncurses")]
-		extern public static int getch ();
-		
-		[DllImport ("ncurses")]
-		extern public static int get_wch (out int sequence);
-
-		[DllImport ("ncurses")]
-		extern public static int ungetch (int ch);
-
-		[DllImport ("ncurses")]
-		extern public static int mvgetch (int y, int x);
-
-		[DllImport ("ncurses")]
-		extern internal static bool has_colors ();
 
-		[DllImport ("ncurses")]
-		extern internal static int start_color ();
-
-		[DllImport ("ncurses")]
-		extern internal static int init_pair (short pair, short f, short b);
-
-		[DllImport ("ncurses")]
-		extern internal static int use_default_colors ();
-
-		[DllImport ("ncurses")]
-		extern internal static int COLOR_PAIRS();
-		
-		[DllImport ("ncurses")]
-		public extern static uint getmouse (out Curses.MouseEvent ev);
-
-		[DllImport ("ncurses")]
-		public extern static uint ungetmouse (ref Curses.MouseEvent ev);
-
-		[DllImport ("ncurses")]
-		public extern static int mouseinterval (int interval);
-		
-		[DllImport ("ncurses", EntryPoint="mousemask")]
-		public extern static IntPtr call_mousemask (IntPtr newmask, out IntPtr oldmask);
-		
+	internal class Delegates {
+		public delegate IntPtr initscr ();
+		public delegate int endwin ();
+		public delegate bool isendwin ();
+		public delegate int cbreak ();
+		public delegate int nocbreak ();
+		public delegate int echo ();
+		public delegate int noecho ();
+		public delegate int halfdelay (int t);
+		public delegate int raw ();
+		public delegate int noraw ();
+		public delegate void noqiflush ();
+		public delegate void qiflush ();
+		public delegate int typeahead (IntPtr fd);
+		public delegate int timeout (int delay);
+		public delegate int wtimeout (IntPtr win, int delay);
+		public delegate int notimeout (IntPtr win, bool bf);
+		public delegate int keypad (IntPtr win, bool bf);
+		public delegate int meta (IntPtr win, bool bf);
+		public delegate int intrflush (IntPtr win, bool bf);
+		public delegate int clearok (IntPtr win, bool bf);
+		public delegate int idlok (IntPtr win, bool bf);
+		public delegate void idcok (IntPtr win, bool bf);
+		public delegate void immedok (IntPtr win, bool bf);
+		public delegate int leaveok (IntPtr win, bool bf);
+		public delegate int wsetscrreg (IntPtr win, int top, int bot);
+		public delegate int scrollok (IntPtr win, bool bf);
+		public delegate int nl ();
+		public delegate int nonl ();
+		public delegate int setscrreg (int top, int bot);
+		public delegate int refresh ();
+		public delegate int doupdate ();
+		public delegate int wrefresh (IntPtr win);
+		public delegate int redrawwin (IntPtr win);
+		//public delegate int wredrawwin (IntPtr win, int beg_line, int num_lines);
+		public delegate int wnoutrefresh (IntPtr win);
+		public delegate int move (int line, int col);
+		public delegate int addch (int ch);
+		public delegate int addstr (string s);
+		public delegate int wmove (IntPtr win, int line, int col);
+		public delegate int waddch (IntPtr win, int ch);
+		public delegate int attron (int attrs);
+		public delegate int attroff (int attrs);
+		public delegate int attrset (int attrs);
+		public delegate int getch ();
+		public delegate int get_wch (out int sequence);
+		public delegate int ungetch (int ch);
+		public delegate int mvgetch (int y, int x);
+		public delegate bool has_colors ();
+		public delegate int start_color ();
+		public delegate int init_pair (short pair, short f, short b);
+		public delegate int use_default_colors ();
+		public delegate int COLOR_PAIRS ();
+		public delegate uint getmouse (out Curses.MouseEvent ev);
+		public delegate uint ungetmouse (ref Curses.MouseEvent ev);
+		public delegate int mouseinterval (int interval);
+		public delegate IntPtr mousemask (IntPtr newmask, out IntPtr oldMask);
 	}
-	
-	//
-	// P/Invoke definitions for looking up symbols in the "libncursesw.so.5" library, as resolved
-	// by the dynamic linker, different than RegularCurses that looksup by "ncurses"
-	//
-	internal class CursesLinux {
-		[DllImport ("libncursesw.so.5", EntryPoint="mousemask")]
-		public extern static IntPtr call_mousemask (IntPtr newmask, out IntPtr oldmask);
-		
-		[DllImport ("libncursesw.so.5", EntryPoint="initscr")]
-		extern static internal IntPtr real_initscr ();
-
-		[DllImport ("libncursesw.so.5")]
-		extern static public int endwin ();
-
-		[DllImport ("libncursesw.so.5")]
-		extern static public bool isendwin ();
-
-		//
-		// Screen operations are flagged as internal, as we need to
-		// catch all changes so we can update newscr, curscr, stdscr
-		//
-		[DllImport ("libncursesw.so.5")]
-		extern static public IntPtr internal_newterm (string type, IntPtr file_outfd, IntPtr file_infd);
-
-		[DllImport ("libncursesw.so.5")]
-		extern static public IntPtr internal_set_term (IntPtr newscreen);
 
-		[DllImport ("libncursesw.so.5")]
-	        extern static internal void internal_delscreen (IntPtr sp);
-
-		[DllImport ("libncursesw.so.5")]
-		extern static public int cbreak ();
-		
-		[DllImport ("libncursesw.so.5")]
-		extern static public int nocbreak ();
-		
-		[DllImport ("libncursesw.so.5")]
-		extern static public int echo ();
-		
-		[DllImport ("libncursesw.so.5")]
-		extern static public int noecho ();
-		
-		[DllImport ("libncursesw.so.5")]
-		extern static public int halfdelay (int t);
-
-		[DllImport ("libncursesw.so.5")]
-		extern static public int raw ();
-
-		[DllImport ("libncursesw.so.5")]
-		extern static public int noraw ();
-		
-		[DllImport ("libncursesw.so.5")]
-		extern static public void noqiflush ();
-		
-		[DllImport ("libncursesw.so.5")]
-		extern static public void qiflush ();
-
-		[DllImport ("libncursesw.so.5")]
-		extern static public int typeahead (IntPtr fd);
-
-		[DllImport ("libncursesw.so.5")]
-		extern static public int timeout (int delay);
-
-		//
-		// Internal, as they are exposed in Window
-		//
-		[DllImport ("libncursesw.so.5")]
-		extern static internal int wtimeout (IntPtr win, int delay);
-	       
-		[DllImport ("libncursesw.so.5")]
-		extern static internal int notimeout (IntPtr win, bool bf);
-
-		[DllImport ("libncursesw.so.5")]
-		extern static internal int keypad (IntPtr win, bool bf);
-		
-		[DllImport ("libncursesw.so.5")]
-		extern static internal int meta (IntPtr win, bool bf);
-		
-		[DllImport ("libncursesw.so.5")]
-		extern static internal int intrflush (IntPtr win, bool bf);
-
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int clearok (IntPtr win, bool bf);
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int idlok (IntPtr win, bool bf);
-		[DllImport ("libncursesw.so.5")]
-		extern internal static void idcok (IntPtr win, bool bf);
-		[DllImport ("libncursesw.so.5")]
-		extern internal static void immedok (IntPtr win, bool bf);
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int leaveok (IntPtr win, bool bf);
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int wsetscrreg (IntPtr win, int top, int bot);
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int scrollok (IntPtr win, bool bf);
-		
-		[DllImport ("libncursesw.so.5")]
-		extern public static int nl();
-		[DllImport ("libncursesw.so.5")]
-		extern public static int nonl();
-		[DllImport ("libncursesw.so.5")]
-		extern public static int setscrreg (int top, int bot);
-		
-
-		[DllImport ("libncursesw.so.5")]
-		extern public static int refresh ();
-		[DllImport ("libncursesw.so.5")]
-		extern public static int doupdate();
-
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int wrefresh (IntPtr win);
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int redrawwin (IntPtr win);
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int wredrawwin (IntPtr win, int beg_line, int num_lines);
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int wnoutrefresh (IntPtr win);
-
-		[DllImport ("libncursesw.so.5")]
-		extern public static int move (int line, int col);
-
-		[DllImport ("libncursesw.so.5", EntryPoint="addch")]
-		extern internal static int _addch (int ch);
-		
-		[DllImport ("libncursesw.so.5")]
-		extern public static int addstr (string s);
-
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int wmove (IntPtr win, int line, int col);
-
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int waddch (IntPtr win, int ch);
-
-		[DllImport ("libncursesw.so.5")]
-		extern public static int attron (int attrs);
-		[DllImport ("libncursesw.so.5")]
-		extern public static int attroff (int attrs);
-		[DllImport ("libncursesw.so.5")]
-		extern public static int attrset (int attrs);
-
-		[DllImport ("libncursesw.so.5")]
-		extern public static int getch ();
-		
-		[DllImport ("libncursesw.so.5")]
-		extern public static int get_wch (out int sequence);
-
-		[DllImport ("libncursesw.so.5")]
-		extern public static int ungetch (int ch);
-
-		[DllImport ("libncursesw.so.5")]
-		extern public static int mvgetch (int y, int x);
-
-		[DllImport ("libncursesw.so.5")]
-		extern internal static bool has_colors ();
-
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int start_color ();
-
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int init_pair (short pair, short f, short b);
-
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int use_default_colors ();
-
-		[DllImport ("libncursesw.so.5")]
-		extern internal static int COLOR_PAIRS();
-		
-		[DllImport ("libncursesw.so.5")]
-		public extern static uint getmouse (out Curses.MouseEvent ev);
-
-		[DllImport ("libncursesw.so.5")]
-		public extern static uint ungetmouse (ref Curses.MouseEvent ev);
-
-		[DllImport ("libncursesw.so.5")]
-		public extern static int mouseinterval (int interval);
+	internal class NativeMethods {
+		public readonly Delegates.initscr initscr;
+		public readonly Delegates.endwin endwin;
+		public readonly Delegates.isendwin isendwin;
+		public readonly Delegates.cbreak cbreak;
+		public readonly Delegates.nocbreak nocbreak;
+		public readonly Delegates.echo echo;
+		public readonly Delegates.noecho noecho;
+		public readonly Delegates.halfdelay halfdelay;
+		public readonly Delegates.raw raw;
+		public readonly Delegates.noraw noraw;
+		public readonly Delegates.noqiflush noqiflush;
+		public readonly Delegates.qiflush qiflush;
+		public readonly Delegates.typeahead typeahead;
+		public readonly Delegates.timeout timeout;
+		public readonly Delegates.wtimeout wtimeout;
+		public readonly Delegates.notimeout notimeout;
+		public readonly Delegates.keypad keypad;
+		public readonly Delegates.meta meta;
+		public readonly Delegates.intrflush intrflush;
+		public readonly Delegates.clearok clearok;
+		public readonly Delegates.idlok idlok;
+		public readonly Delegates.idcok idcok;
+		public readonly Delegates.immedok immedok;
+		public readonly Delegates.leaveok leaveok;
+		public readonly Delegates.wsetscrreg wsetscrreg;
+		public readonly Delegates.scrollok scrollok;
+		public readonly Delegates.nl nl;
+		public readonly Delegates.nonl nonl;
+		public readonly Delegates.setscrreg setscrreg;
+		public readonly Delegates.refresh refresh;
+		public readonly Delegates.doupdate doupdate;
+		public readonly Delegates.wrefresh wrefresh;
+		public readonly Delegates.redrawwin redrawwin;
+		//public readonly Delegates.wredrawwin wredrawwin;
+		public readonly Delegates.wnoutrefresh wnoutrefresh;
+		public readonly Delegates.move move;
+		public readonly Delegates.addch addch;
+		public readonly Delegates.addstr addstr;
+		public readonly Delegates.wmove wmove;
+		public readonly Delegates.waddch waddch;
+		public readonly Delegates.attron attron;
+		public readonly Delegates.attroff attroff;
+		public readonly Delegates.attrset attrset;
+		public readonly Delegates.getch getch;
+		public readonly Delegates.get_wch get_wch;
+		public readonly Delegates.ungetch ungetch;
+		public readonly Delegates.mvgetch mvgetch;
+		public readonly Delegates.has_colors has_colors;
+		public readonly Delegates.start_color start_color;
+		public readonly Delegates.init_pair init_pair;
+		public readonly Delegates.use_default_colors use_default_colors;
+		public readonly Delegates.COLOR_PAIRS COLOR_PAIRS;
+		public readonly Delegates.getmouse getmouse;
+		public readonly Delegates.ungetmouse ungetmouse;
+		public readonly Delegates.mouseinterval mouseinterval;
+		public readonly Delegates.mousemask mousemask;
+
+		public UnmanagedLibrary UnmanagedLibrary;
+		public NativeMethods (UnmanagedLibrary lib)
+		{
+			this.UnmanagedLibrary = lib;
+			initscr = lib.GetNativeMethodDelegate<Delegates.initscr> ("initscr");
+			endwin = lib.GetNativeMethodDelegate<Delegates.endwin> ("endwin");
+			isendwin = lib.GetNativeMethodDelegate<Delegates.isendwin> ("isendwin");
+			cbreak = lib.GetNativeMethodDelegate<Delegates.cbreak> ("cbreak");
+			nocbreak = lib.GetNativeMethodDelegate<Delegates.nocbreak> ("nocbreak");
+			echo = lib.GetNativeMethodDelegate<Delegates.echo> ("echo");
+			noecho = lib.GetNativeMethodDelegate<Delegates.noecho> ("noecho");
+			halfdelay = lib.GetNativeMethodDelegate<Delegates.halfdelay> ("halfdelay");
+			raw = lib.GetNativeMethodDelegate<Delegates.raw> ("raw");
+			noraw = lib.GetNativeMethodDelegate<Delegates.noraw> ("noraw");
+			noqiflush = lib.GetNativeMethodDelegate<Delegates.noqiflush> ("noqiflush");
+			qiflush = lib.GetNativeMethodDelegate<Delegates.qiflush> ("qiflush");
+			typeahead = lib.GetNativeMethodDelegate<Delegates.typeahead> ("typeahead");
+			timeout = lib.GetNativeMethodDelegate<Delegates.timeout> ("timeout");
+			wtimeout = lib.GetNativeMethodDelegate<Delegates.wtimeout> ("wtimeout");
+			notimeout = lib.GetNativeMethodDelegate<Delegates.notimeout> ("notimeout");
+			keypad = lib.GetNativeMethodDelegate<Delegates.keypad> ("keypad");
+			meta = lib.GetNativeMethodDelegate<Delegates.meta> ("meta");
+			intrflush = lib.GetNativeMethodDelegate<Delegates.intrflush> ("intrflush");
+			clearok = lib.GetNativeMethodDelegate<Delegates.clearok> ("clearok");
+			idlok = lib.GetNativeMethodDelegate<Delegates.idlok> ("idlok");
+			idcok = lib.GetNativeMethodDelegate<Delegates.idcok> ("idcok");
+			immedok = lib.GetNativeMethodDelegate<Delegates.immedok> ("immedok");
+			leaveok = lib.GetNativeMethodDelegate<Delegates.leaveok> ("leaveok");
+			wsetscrreg = lib.GetNativeMethodDelegate<Delegates.wsetscrreg> ("wsetscrreg");
+			scrollok = lib.GetNativeMethodDelegate<Delegates.scrollok> ("scrollok");
+			nl = lib.GetNativeMethodDelegate<Delegates.nl> ("nl");
+			nonl = lib.GetNativeMethodDelegate<Delegates.nonl> ("nonl");
+			setscrreg = lib.GetNativeMethodDelegate<Delegates.setscrreg> ("setscrreg");
+			refresh = lib.GetNativeMethodDelegate<Delegates.refresh> ("refresh");
+			doupdate = lib.GetNativeMethodDelegate<Delegates.doupdate> ("doupdate");
+			wrefresh = lib.GetNativeMethodDelegate<Delegates.wrefresh> ("wrefresh");
+			redrawwin = lib.GetNativeMethodDelegate<Delegates.redrawwin> ("redrawwin");
+			//wredrawwin = lib.GetNativeMethodDelegate<Delegates.wredrawwin> ("wredrawwin");
+			wnoutrefresh = lib.GetNativeMethodDelegate<Delegates.wnoutrefresh> ("wnoutrefresh");
+			move = lib.GetNativeMethodDelegate<Delegates.move> ("move");
+			addch = lib.GetNativeMethodDelegate<Delegates.addch> ("addch");
+			addstr = lib.GetNativeMethodDelegate<Delegates.addstr> ("addstr");
+			wmove = lib.GetNativeMethodDelegate<Delegates.wmove> ("wmove");
+			waddch = lib.GetNativeMethodDelegate<Delegates.waddch> ("waddch");
+			attron = lib.GetNativeMethodDelegate<Delegates.attron> ("attron");
+			attroff = lib.GetNativeMethodDelegate<Delegates.attroff> ("attroff");
+			attrset = lib.GetNativeMethodDelegate<Delegates.attrset> ("attrset");
+			getch = lib.GetNativeMethodDelegate<Delegates.getch> ("getch");
+			get_wch = lib.GetNativeMethodDelegate<Delegates.get_wch> ("get_wch");
+			ungetch = lib.GetNativeMethodDelegate<Delegates.ungetch> ("ungetch");
+			mvgetch = lib.GetNativeMethodDelegate<Delegates.mvgetch> ("mvgetch");
+			has_colors = lib.GetNativeMethodDelegate<Delegates.has_colors> ("has_colors");
+			start_color = lib.GetNativeMethodDelegate<Delegates.start_color> ("start_color");
+			init_pair = lib.GetNativeMethodDelegate<Delegates.init_pair> ("init_pair");
+			use_default_colors = lib.GetNativeMethodDelegate<Delegates.use_default_colors> ("use_default_colors");
+			COLOR_PAIRS = lib.GetNativeMethodDelegate<Delegates.COLOR_PAIRS> ("COLOR_PAIRS");
+			getmouse = lib.GetNativeMethodDelegate<Delegates.getmouse> ("getmouse");
+			ungetmouse = lib.GetNativeMethodDelegate<Delegates.ungetmouse> ("ungetmouse");
+			mouseinterval = lib.GetNativeMethodDelegate<Delegates.mouseinterval> ("mouseinterval");
+			mousemask = lib.GetNativeMethodDelegate<Delegates.mousemask> ("mousemask");
+		}
 	}
-	
 }

Terminal.Gui/MonoCurses/handles.cs

@@ -35,107 +35,108 @@ namespace Unix.Terminal {
 			public readonly IntPtr Handle;
 			static Window curscr;
 			static Window stdscr;
-	
+
 			static Window ()
 			{
 				Curses.initscr ();
 				stdscr = new Window (Curses.console_sharp_get_stdscr ());
 				curscr = new Window (Curses.console_sharp_get_curscr ());
 			}
-			
-			internal Window (IntPtr handle) 
+
+			internal Window (IntPtr handle)
 			{
 				Handle = handle;
 			}
-			
+
 			static public Window Standard {
 				get {
 					return stdscr;
 				}
 			}
-	
+
 			static public Window Current {
 				get {
 					return curscr;
 				}
 			}
-	
-			
+
+
 			public int wtimeout (int delay)
 			{
 				return Curses.wtimeout (Handle, delay);
 			}
-	
+
 			public int notimeout (bool bf)
 			{
 				return Curses.notimeout (Handle, bf);
 			}
-	
+
 			public int keypad (bool bf)
 			{
 				return Curses.keypad (Handle, bf);
 			}
-	
+
 			public int meta (bool bf)
 			{
 				return Curses.meta (Handle, bf);
 			}
-	
+
 			public int intrflush (bool bf)
 			{
 				return Curses.intrflush (Handle, bf);
 			}
-	
+
 			public int clearok (bool bf)
 			{
 				return Curses.clearok (Handle, bf);
 			}
-			
+
 			public int idlok (bool bf)
 			{
 				return Curses.idlok (Handle, bf);
 			}
-			
+
 			public void idcok (bool bf)
 			{
 				Curses.idcok (Handle, bf);
 			}
-			
+
 			public void immedok (bool bf)
 			{
 				Curses.immedok (Handle, bf);
 			}
-			
+
 			public int leaveok (bool bf)
 			{
 				return Curses.leaveok (Handle, bf);
 			}
-			
+
 			public int setscrreg (int top, int bot)
 			{
 				return Curses.wsetscrreg (Handle, top, bot);
 			}
-			
+
 			public int scrollok (bool bf)
 			{
 				return Curses.scrollok (Handle, bf);
 			}
-			
+
 			public int wrefresh ()
 			{
 				return Curses.wrefresh (Handle);
 			}
-	
+
 			public int redrawwin ()
 			{
 				return Curses.redrawwin (Handle);
 			}
-			
+
+#if false
 			public int wredrawwin (int beg_line, int num_lines)
 			{
 				return Curses.wredrawwin (Handle, beg_line, num_lines);
 			}
-	
+#endif
 			public int wnoutrefresh ()
 			{
 				return Curses.wnoutrefresh (Handle);

Terminal.Gui/Terminal.Gui.csproj

@@ -64,4 +64,7 @@
       <HintPath>..\..\..\Users\miguel\.nuget\packages\nstack.core\0.11.0\lib\netstandard1.5\NStack.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Drivers\#ConsoleDriver.cs#" />
+  </ItemGroup>
 </Project>