Selaa lähdekoodia

Bring fixes from mono-curses

Miguel de Icaza 7 vuotta sitten
vanhempi
commit
73a9d3de3b
2 muutettua tiedostoa jossa 5 lisäystä ja 4 poistoa
  1. 4 4
      Terminal.Gui/MonoCurses/binding.cs
  2. 1 0
      Terminal.Gui/MonoCurses/mainloop.cs

+ 4 - 4
Terminal.Gui/MonoCurses/binding.cs

@@ -53,9 +53,9 @@ namespace Unix.Terminal {
 		static void FindNCurses ()
 		{
 			if (File.Exists ("/usr/lib/libncurses.dylib"))
-				curses_handle = dlopen ("libncurses.dylib", 0);
+				curses_handle = dlopen ("libncurses.dylib", 1);
 			else
-				curses_handle = dlopen ("libncurses.so", 0);
+				curses_handle = dlopen ("libncurses.so", 1);
 			
 			if (curses_handle == IntPtr.Zero)
 				throw new Exception ("Could not dlopen ncurses");
@@ -314,10 +314,10 @@ namespace Unix.Terminal {
 		
 #endregion
 		
-		[DllImport ("libc")]
+		[DllImport ("dl")]
 		extern static IntPtr dlopen (string file, int mode);
 
-		[DllImport ("libc")]
+		[DllImport ("dl")]
 		extern static IntPtr dlsym (IntPtr handle, string symbol);
 
 		static IntPtr stdscr;

+ 1 - 0
Terminal.Gui/MonoCurses/mainloop.cs

@@ -243,6 +243,7 @@ namespace Mono.Terminal {
 			foreach (var fd in descriptorWatchers.Keys){
 				pollmap [i].fd = fd;
 				pollmap [i].events = MapCondition (descriptorWatchers [fd].Condition);
+				i++;
 			}
 		}