Merge pull request #270 from lytico/lytico/issues/269_GLibrary_issupported

GLibrary.cs: introduce IsSupported

Source/Libs/AtkSharp/Global.cs

@@ -40,6 +40,9 @@ namespace Atk {
 			GLib.Marshaller.Free (native_event_type);
 			return id;
 		}
+
+        public static bool IsSupported => GLibrary.IsSupported(Library.Atk);
+
 	}
 }
 

Source/Libs/CairoSharp/Global.cs

@@ -0,0 +1,11 @@
+namespace Cairo
+{
+
+	public partial class Global
+	{
+
+		public static bool IsSupported => GLibrary.IsSupported(Library.Cairo);
+
+	}
+
+}

Source/Libs/GLibSharp/Global.cs

@@ -85,6 +85,9 @@ namespace GLib {
 		{
 			return Marshaller.PtrToStringGFree (g_format_size_for_display (size));
 		}
+		
+		public static bool IsSupported => GLibrary.IsSupported(Library.GLib);
+
 	}
 }
 

Source/Libs/GdkSharp/Global.cs

@@ -160,6 +160,9 @@ namespace Gdk {
 				result [i] = (VisualType) tmp [i];
 			return result;
 		}
+		
+		public static bool IsSupported => GLibrary.IsSupported(Library.Gdk);
+		
 	}
 }
 

Source/Libs/GioSharp/Global.cs

@@ -0,0 +1,11 @@
+namespace Gio
+{
+
+	public partial class Global
+	{
+
+		public static bool IsSupported => GLibrary.IsSupported(Library.Gio);
+
+	}
+
+}

Source/Libs/GtkSharp/Global.cs

@@ -20,8 +20,6 @@ namespace Gtk {
 
 	public partial class Global {
 
-		internal const string GtkNativeDll = "libgtk-3-0.dll";
-
 		public static bool ShowUri (string uri)
 		{
 			return ShowUri (null, uri);
@@ -31,6 +29,9 @@ namespace Gtk {
 		{
 			return ShowUri (screen, uri, Gtk.Global.CurrentEventTime);
 		}
+
+		public static bool IsSupported => GLibrary.IsSupported(Library.Gtk);
+
 	}
 }
 

Source/Libs/GtkSourceSharp/Global.cs

@@ -0,0 +1,11 @@
+namespace GtkSource
+{
+
+	public partial class Global
+	{
+
+		public static bool IsSupported => GLibrary.IsSupported(Library.GtkSource);
+
+	}
+
+}

Source/Libs/PangoSharp/Global.cs

@@ -50,6 +50,9 @@ namespace Pango {
 			attrs = new Pango.AttrList (attrs_handle);
 			return result;
 		}
+		
+		public static bool IsSupported => GLibrary.IsSupported(Library.Pango);
+
 	}
 }
 

Source/Libs/Shared/GLibrary.cs

@@ -5,79 +5,94 @@ using System.Runtime.InteropServices;
 
 class GLibrary
 {
-    [DllImport("kernel32.dll", SetLastError = true)]
-    private static extern bool SetDllDirectory(string lpPathName);
 
-    private static Dictionary<Library, IntPtr> _libraries;
+	[DllImport("kernel32.dll", SetLastError = true)]
-    private static Dictionary<string, IntPtr> _customlibraries;
+	private static extern bool SetDllDirectory(string lpPathName);
-    private static Dictionary <Library, string[]> _libraryDefinitions;
 
-    static GLibrary()
+	private static Dictionary<Library, IntPtr> _libraries;
-    {
+	private static HashSet<Library> _librariesNotFound;
-        _customlibraries = new Dictionary<string, IntPtr>();
+	private static Dictionary<string, IntPtr> _customlibraries;
-        _libraries = new Dictionary<Library, IntPtr>();
+	private static Dictionary<Library, string[]> _libraryDefinitions;
-        _libraryDefinitions = new Dictionary<Library, string[]>();
+
-        _libraryDefinitions[Library.GLib] = new[] { "libglib-2.0-0.dll", "libglib-2.0.so.0", "libglib-2.0.0.dylib", "glib-2.dll" };
+	static GLibrary()
-        _libraryDefinitions[Library.GObject] = new[] { "libgobject-2.0-0.dll", "libgobject-2.0.so.0", "libgobject-2.0.0.dylib", "gobject-2.dll" };
+	{
-        _libraryDefinitions[Library.Cairo] = new[] { "libcairo-2.dll", "libcairo.so.2", "libcairo.2.dylib", "cairo.dll" };
+		_customlibraries = new Dictionary<string, IntPtr>();
-        _libraryDefinitions[Library.Gio] = new[] { "libgio-2.0-0.dll", "libgio-2.0.so.0", "libgio-2.0.0.dylib", "gio-2.dll" };
+		_librariesNotFound = new HashSet<Library>();
-        _libraryDefinitions[Library.Atk] = new[] { "libatk-1.0-0.dll", "libatk-1.0.so.0", "libatk-1.0.0.dylib", "atk-1.dll" };
+		_libraries = new Dictionary<Library, IntPtr>();
-        _libraryDefinitions[Library.Pango] = new[] { "libpango-1.0-0.dll", "libpango-1.0.so.0", "libpango-1.0.0.dylib", "pango-1.dll" };
+		_libraryDefinitions = new Dictionary<Library, string[]>();
-        _libraryDefinitions[Library.Gdk] = new[] { "libgdk-3-0.dll", "libgdk-3.so.0", "libgdk-3.0.dylib", "gdk-3.dll" };
+		_libraryDefinitions[Library.GLib] = new[] {"libglib-2.0-0.dll", "libglib-2.0.so.0", "libglib-2.0.0.dylib", "glib-2.dll"};
-        _libraryDefinitions[Library.GdkPixbuf] = new[] { "libgdk_pixbuf-2.0-0.dll", "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0.dylib", "gdk_pixbuf-2.dll" };
+		_libraryDefinitions[Library.GObject] = new[] {"libgobject-2.0-0.dll", "libgobject-2.0.so.0", "libgobject-2.0.0.dylib", "gobject-2.dll"};
-        _libraryDefinitions[Library.Gtk] = new[] { "libgtk-3-0.dll", "libgtk-3.so.0", "libgtk-3.0.dylib", "gtk-3.dll" };
+		_libraryDefinitions[Library.Cairo] = new[] {"libcairo-2.dll", "libcairo.so.2", "libcairo.2.dylib", "cairo.dll"};
-        _libraryDefinitions[Library.PangoCairo] = new[] { "libpangocairo-1.0-0.dll", "libpangocairo-1.0.so.0", "libpangocairo-1.0.0.dylib", "pangocairo-1.dll" };
+		_libraryDefinitions[Library.Gio] = new[] {"libgio-2.0-0.dll", "libgio-2.0.so.0", "libgio-2.0.0.dylib", "gio-2.dll"};
-        _libraryDefinitions[Library.GtkSource] = new[] { "libgtksourceview-4-0.dll", "libgtksourceview-4.so.0", "libgtksourceview-4.0.dylib", "gtksourceview-4.dll" };
+		_libraryDefinitions[Library.Atk] = new[] {"libatk-1.0-0.dll", "libatk-1.0.so.0", "libatk-1.0.0.dylib", "atk-1.dll"};
+		_libraryDefinitions[Library.Pango] = new[] {"libpango-1.0-0.dll", "libpango-1.0.so.0", "libpango-1.0.0.dylib", "pango-1.dll"};
+		_libraryDefinitions[Library.Gdk] = new[] {"libgdk-3-0.dll", "libgdk-3.so.0", "libgdk-3.0.dylib", "gdk-3.dll"};
+		_libraryDefinitions[Library.GdkPixbuf] = new[] {"libgdk_pixbuf-2.0-0.dll", "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0.dylib", "gdk_pixbuf-2.dll"};
+		_libraryDefinitions[Library.Gtk] = new[] {"libgtk-3-0.dll", "libgtk-3.so.0", "libgtk-3.0.dylib", "gtk-3.dll"};
+		_libraryDefinitions[Library.PangoCairo] = new[] {"libpangocairo-1.0-0.dll", "libpangocairo-1.0.so.0", "libpangocairo-1.0.0.dylib", "pangocairo-1.dll"};
+		_libraryDefinitions[Library.GtkSource] = new[] {"libgtksourceview-4-0.dll", "libgtksourceview-4.so.0", "libgtksourceview-4.0.dylib", "gtksourceview-4.dll"};
         _libraryDefinitions[Library.Webkit] = new[] { "libwebkit2gtk-4.0.dll", "libwebkit2gtk-4.0.so.37", "libwebkit2gtk-4.0.dylib", "libwebkit2gtk-4.0.0.dll" };
+	}
 
-    }
+	public static IntPtr Load(Library library)
+	{
+		if (_libraries.TryGetValue(library, out var ret))
+			return ret;
 
-    public static IntPtr Load(Library library)
+		if (TryGet(library, out ret)) return ret;
-    {
-        var ret = IntPtr.Zero;
-        if (_libraries.TryGetValue(library, out ret))
-            return ret;
 
-        if (FuncLoader.IsWindows)
+		var err = library + ": " + string.Join(", ", _libraryDefinitions[library]);
-        {
-            ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][0]);
 
-            if (ret == IntPtr.Zero)
+		throw new DllNotFoundException(err);
-            {
-                SetDllDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Gtk", "3.24.24"));
-                ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][0]);
-            }
-        }
-        else if (FuncLoader.IsOSX)
-        {
-            ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][2]);
 
-            if (ret == IntPtr.Zero)
+	}
-            {
-                ret = FuncLoader.LoadLibrary("/usr/local/lib/" + _libraryDefinitions[library][2]);
-            }
-        }
-        else
-            ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][1]);
 
-        if (ret == IntPtr.Zero)
+	public static bool IsSupported(Library library) => TryGet(library, out var __);
-        {
-            for (int i = 0; i < _libraryDefinitions[library].Length; i++)
-            {
-                ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][i]);
 
-                if (ret != IntPtr.Zero)
+	static bool TryGet(Library library, out IntPtr ret)
-                    break;
+	{
-            }
+		ret = IntPtr.Zero;
-        }
 
-        if (ret == IntPtr.Zero)
+		if (_libraries.TryGetValue(library, out ret)) {
-        {
+			return true;
-            var err = library + ": " + string.Join(", ", _libraryDefinitions[library]);
+		}
-            throw new DllNotFoundException(err);
+
-        }
+		if (_librariesNotFound.Contains(library)) {
+			return false;
+		}
+
+		if (FuncLoader.IsWindows) {
+			ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][0]);
+
+			if (ret == IntPtr.Zero) {
+				SetDllDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Gtk", "3.24.24"));
+				ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][0]);
+			}
+		} else if (FuncLoader.IsOSX) {
+			ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][2]);
+
+			if (ret == IntPtr.Zero) {
+				ret = FuncLoader.LoadLibrary("/usr/local/lib/" + _libraryDefinitions[library][2]);
+			}
+		} else
+			ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][1]);
+
+		if (ret == IntPtr.Zero) {
+			for (var i = 0; i < _libraryDefinitions[library].Length; i++) {
+				ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][i]);
+
+				if (ret != IntPtr.Zero)
+					break;
+			}
+		}
+
+		if (ret != IntPtr.Zero) {
+			_libraries[library] = ret;
+		} else {
+			_librariesNotFound.Add(library);
+		}
+
+		return ret != IntPtr.Zero;
+	}
 
-        _libraries[library] = ret;
-        return ret;
-    }
 }

Source/Libs/WebkitGtkSharp/Global.cs

@@ -0,0 +1,11 @@
+namespace WebKit 
+{
+
+	public partial class Global
+	{
+
+		public static bool IsSupported => GLibrary.IsSupported(Library.Webkit);
+
+	}
+
+}

Source/Samples/Sections/Widgets/WebviewSection.cs

@@ -19,6 +19,11 @@ namespace Samples
 
 		public WebviewSection()
 		{
+			if (!WebKit.Global.IsSupported) {
+				AddItem(($"{nameof(WebKit.WebView)}",new Label($"{typeof(WebView).Namespace} is not suported on your OS")));
+				return;
+			}
+
 			AddItem(ShowHtml());
 			AddItem(ShowUri());