Merge branch 'xplatcfg' of https://github.com/jazzay/Perspex into jazzay-xplatcfg

samples/BindingTest/App.xaml.cs

@@ -13,30 +13,20 @@ namespace BindingTest
         public App()
         {
             RegisterServices();
-            InitializeSubsystems((int)Environment.OSVersion.Platform);
-            InitializeComponent();
-            InitializeLogging();
-        }
-
-        public static void AttachDevTools(Window window)
-        {
-            DevTools.Attach(window);
         }
 
         private static void Main()
         {
-            var app = new App();
+            InitializeLogging();
-            var window = new MainWindow();
-            window.Show();
-            app.Run(window);
-        }
 
-        private void InitializeComponent()
+            new App()
-        {
+                .UseWin32()
-            PerspexXamlLoader.Load(this);
+                .UseDirect2D()
+                .LoadFromXaml()
+                .RunWithMainWindow<MainWindow>();
         }
 
-        private void InitializeLogging()
+        private static void InitializeLogging()
         {
 #if DEBUG
             SerilogLogger.Initialize(new LoggerConfiguration()

samples/BindingTest/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using BindingTest.ViewModels;
+using Perspex;
 using Perspex.Controls;
 using Perspex.Markup.Xaml;
 
@@ -10,12 +11,12 @@ namespace BindingTest
         {
             this.InitializeComponent();
             this.DataContext = new MainWindowViewModel();
-            App.AttachDevTools(this);
+            this.AttachDevTools();
         }
 
         private void InitializeComponent()
         {
-            PerspexXamlLoader.Load(this);
+            this.LoadFromXaml();
         }
     }
 }

samples/ControlCatalog/App.xaml.cs

@@ -9,58 +9,14 @@ using Serilog;
 
 namespace ControlCatalog
 {
+    // Eventually we should move this into a PCL library so we can access
+    // from mobile platforms
+    //
     class App : Application
     {
         public App()
         {
             RegisterServices();
-            InitializeSubsystems(GetPlatformId());
-            InitializeLogging();
-            InitializeComponent();
-        }
-
-        public static void AttachDevTools(Window window)
-        {
-#if DEBUG
-            DevTools.Attach(window);
-#endif
-        }
-
-        static void Main(string[] args)
-        {
-            var app = new App();
-            var window = new MainWindow();
-            window.Show();
-            app.Run(window);
-        }
-
-        private void InitializeComponent()
-        {
-            PerspexXamlLoader.Load(this);
-        }
-
-        private void InitializeLogging()
-        {
-#if DEBUG
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Warning()
-                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-                .CreateLogger());
-#endif
-        }
-
-        private int GetPlatformId()
-        {
-            var args = Environment.GetCommandLineArgs();
-
-            if (args.Contains("--gtk"))
-            {
-                return (int)PlatformID.Unix;
-            }
-            else
-            {
-                return (int)Environment.OSVersion.Platform;
-            }
         }
     }
 }

samples/ControlCatalog/ControlCatalog.csproj

@@ -103,6 +103,7 @@
     <Compile Include="Pages\SliderPage.xaml.cs">
       <DependentUpon>SliderPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

samples/ControlCatalog/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
-using Perspex.Controls;
+using Perspex;
+using Perspex.Controls;
 using Perspex.Markup.Xaml;
 
 namespace ControlCatalog
@@ -8,12 +9,12 @@ namespace ControlCatalog
         public MainWindow()
         {
             this.InitializeComponent();
-            App.AttachDevTools(this);
+            this.AttachDevTools();
         }
 
         private void InitializeComponent()
         {
-            PerspexXamlLoader.Load(this);
+            this.LoadFromXaml();
         }
     }
 }

samples/ControlCatalog/Program.cs

@@ -0,0 +1,127 @@
+using Perspex.Logging.Serilog;
+using Serilog;
+using System;
+using System.Linq;
+using Perspex;
+
+namespace ControlCatalog
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            InitializeLogging();
+
+            new App()
+                .ConfigureRenderSystem(args)
+                .LoadFromXaml()
+                .RunWithMainWindow<MainWindow>();
+        }
+
+        // This will be made into a runtime configuration extension soon!
+        private static void InitializeLogging()
+        {
+#if DEBUG
+            SerilogLogger.Initialize(new LoggerConfiguration()
+                .MinimumLevel.Warning()
+                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
+                .CreateLogger());
+#endif
+        }
+
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Experimental: Would like to move this into a shared location once I figure out the best place for it 
+    // considering all common libraries are PCL and do not have access to Environment.OSVersion.Platform
+    // nor do they have access to the platform specific render/subsystem extensions.
+    // 
+    // Perhaps via DI we register each system with a priority/rank
+    //
+    public static class RenderSystemExtensions
+    {
+        [Flags]
+        enum RenderSystem
+        {
+            None = 0,
+            GTK = 1,
+            Skia = 2,
+            Direct2D = 4
+        };
+
+        /// <summary>
+        /// Default (Optimal) render system for a particular platform
+        /// </summary>
+        /// <returns></returns>
+        private static RenderSystem DefaultRenderSystem()
+        {
+            switch (Environment.OSVersion.Platform)
+            {
+                case PlatformID.MacOSX:
+                    return RenderSystem.GTK;
+
+                case PlatformID.Unix:
+                    return RenderSystem.GTK;
+
+                case PlatformID.Win32Windows:
+                    return RenderSystem.Direct2D;
+            }
+
+            return RenderSystem.None;
+        }
+
+        /// <summary>
+        /// Returns an array of avalidable rendering systems in priority order
+        /// </summary>
+        /// <returns></returns>
+        private static RenderSystem[] AvailableRenderSystems()
+        {
+            switch (Environment.OSVersion.Platform)
+            {
+                case PlatformID.MacOSX:
+                    return new RenderSystem[] { RenderSystem.GTK, RenderSystem.Skia };
+
+                case PlatformID.Unix:
+                    return new RenderSystem[] { RenderSystem.GTK, RenderSystem.Skia };
+
+                case PlatformID.Win32Windows:
+                    return new RenderSystem[] { RenderSystem.Direct2D, RenderSystem.Skia, RenderSystem.GTK };
+            }
+
+            return new RenderSystem[0];
+        }
+
+        /// <summary>
+        /// Selects the optimal render system for desktop platforms. Supports cmd line overrides
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="args"></param>
+        public static TApp ConfigureRenderSystem<TApp>(this TApp app, string[] args) where TApp : Application
+        {
+            // So this all works great under Windows where it can support
+            // ALL configurations. But on OSX/Unix we cannot use Direct2D
+            //
+            if (args.Contains("--gtk") || DefaultRenderSystem() == RenderSystem.GTK)
+            {
+                app.UseGtk();
+                app.UseCairo();
+            }
+            else
+            {
+                app.UseWin32();
+
+                // not available until we do the SkiaSharp merge
+                //if (args.Contains("--skia") || DefaultRenderSystem() == RenderSystem.Skia)
+                //{
+                //	app.UseSkia();
+                //}
+                //else
+                {
+                    app.UseDirect2D();
+                }
+            }
+
+            return app;
+        }
+    }
+}

samples/TestApplication/Program.cs

@@ -31,11 +31,30 @@ namespace TestApplication
             // The version of ReactiveUI currently included is for WPF and so expects a WPF
             // dispatcher. This makes sure it's initialized.
             System.Windows.Threading.Dispatcher foo = System.Windows.Threading.Dispatcher.CurrentDispatcher;
-            new App();
+
-            MainWindow.RootNamespace = "TestApplication";
+            var app = new App();
-            var wnd = MainWindow.Create();
+
-            DevTools.Attach(wnd);
+            if (args.Contains("--gtk"))
-            Application.Current.Run(wnd);
+            {
+                app.UseGtk();
+                app.UseCairo();
+            }
+            else
+            {
+                app.UseWin32();
+
+                // not available until we do the SkiaSharp merge
+                //if (args.Contains("--skia"))
+                //{
+                //	app.UseSkia();
+                //}
+                //else
+                {
+                    app.UseDirect2D();
+                }
+            }
+
+            app.Run();
         }
     }
 }

samples/TestApplicationShared/App.cs

@@ -8,6 +8,9 @@ using Perspex.Controls.Templates;
 using Perspex.Markup.Xaml;
 using Perspex.Styling;
 using Perspex.Themes.Default;
+using Perspex.Diagnostics;
+using Perspex.Platform;
+using Perspex.Shared.PlatformSupport;
 
 namespace TestApplication
 {
@@ -15,22 +18,35 @@ namespace TestApplication
     {
         public App()
         {
+			// TODO: I believe this has to happen before we select sub systems. Can we
+			// move this safely into Application itself? Is there anything in here
+			// that is platform specific??
+			//
             RegisterServices();
-            InitializeSubsystems((int)Environment.OSVersion.Platform);            
+        }
-            Styles.Add(new DefaultTheme());
 
-            var loader = new PerspexXamlLoader();
+		public void Run()
-            var baseLight = (IStyle)loader.Load(
+		{
-                new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default"));
+			Styles.Add(new DefaultTheme());
-            Styles.Add(baseLight);
 
-            Styles.Add(new SampleTabStyle());
+			var loader = new PerspexXamlLoader();
-            DataTemplates = new DataTemplates
+			var baseLight = (IStyle)loader.Load(
-            {
+				new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default"));
-                new FuncTreeDataTemplate<Node>(
+			Styles.Add(baseLight);
-                    x => new TextBlock {Text = x.Name},
+
-                    x => x.Children),
+			Styles.Add(new SampleTabStyle());
-            };
+			DataTemplates = new DataTemplates
-        }
+			{
-    }
+				new FuncTreeDataTemplate<Node>(
+					x => new TextBlock {Text = x.Name},
+					x => x.Children),
+			};
+
+			MainWindow.RootNamespace = "TestApplication";
+			var wnd = MainWindow.Create();
+			DevTools.Attach(wnd);
+
+			Run(wnd);
+		}
+	}
 }

samples/XamlTestApplication/App.cs

@@ -7,26 +7,5 @@ using Serilog;
 
 namespace XamlTestApplication
 {
-    public class App : XamlTestApp
+    // No longer needed!
-    {
-        public App()
-        {
-            InitializeLogging();
-        }
-
-        protected override void RegisterPlatform()
-        {
-            InitializeSubsystems((int)Environment.OSVersion.Platform);
-        }
-
-        private void InitializeLogging()
-        {
-#if DEBUG
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Warning()
-                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-                .CreateLogger());
-#endif
-        }
-    }
 }

samples/XamlTestApplication/Program.cs

@@ -1,39 +1,39 @@
 // Copyright (c) The Perspex Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using System;
+using System.Linq;
 using System.Diagnostics;
 using System.Windows.Threading;
 using Perspex;
-using Perspex.Collections;
+using Serilog;
-using Perspex.Controls;
+using Perspex.Logging.Serilog;
-using Perspex.Controls.Templates;
-using ReactiveUI;
-using XamlTestApplication.Views;
 
 namespace XamlTestApplication
 {
     internal class Program
     {
-        private static void Main()
+        private static void Main(string[] args)
         {
-            var sw = new Stopwatch();
+            // this sucks. Can we fix this? Do we even need it anymore?
-            sw.Start();
-
             var foo = Dispatcher.CurrentDispatcher;
 
-            App application = new App
+            InitializeLogging();
-            {
-
-            };
-
-            var window = new MainWindow();
-            window.Show();
 
-            sw.Stop();
+            new XamlTestApp()
-            Debug.WriteLine($"Startup: {sw.ElapsedMilliseconds}ms");
+                   .UseWin32()
+                   .UseDirect2D()
+                   .LoadFromXaml()
+                   .RunWithMainWindow<Views.MainWindow>();
+        }
 
-            Application.Current.Run(window);
+        private static void InitializeLogging()
+        {
+#if DEBUG
+            SerilogLogger.Initialize(new LoggerConfiguration()
+                .MinimumLevel.Warning()
+                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
+                .CreateLogger());
+#endif
         }
     }
 }

samples/XamlTestApplicationPcl/XamlTestApp.cs

@@ -1,23 +1,14 @@
 using Perspex;
 using Perspex.Markup.Xaml;
+using XamlTestApplication.Views;
 
 namespace XamlTestApplication
 {
-    public abstract class XamlTestApp : Application
+    public class XamlTestApp : Application
     {
-        protected abstract void RegisterPlatform();
-
         public XamlTestApp()
         {
             RegisterServices();
-            RegisterPlatform();
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            var loader = new PerspexXamlLoader();
-            loader.Load(typeof(XamlTestApp), this);
         }
     }
 }

src/Gtk/Perspex.Cairo/CairoPlatform.cs

@@ -7,6 +7,18 @@ using Perspex.Cairo.Media.Imaging;
 using Perspex.Media;
 using Perspex.Platform;
 
+namespace Perspex
+{
+    public static class GtkApplicationExtensions
+    {
+        public static TApp UseCairo<TApp>(this TApp app) where TApp : Application
+        {
+            Perspex.Cairo.CairoPlatform.Initialize();
+            return app;
+        }
+    }
+}
+
 namespace Perspex.Cairo
 {
     using System.IO;

src/Gtk/Perspex.Gtk/GtkPlatform.cs

@@ -10,6 +10,18 @@ using Perspex.Input;
 using Perspex.Platform;
 using Perspex.Shared.PlatformSupport;
 
+namespace Perspex
+{
+    public static class GtkApplicationExtensions
+    {
+        public static TApp UseGtk<TApp>(this TApp app) where TApp : Application
+        {
+            Perspex.Gtk.GtkPlatform.Initialize();
+            return app;
+        }
+    }
+}
+
 namespace Perspex.Gtk
 {
     using Gtk = global::Gtk;

src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs

@@ -187,3 +187,15 @@ namespace Perspex.Markup.Xaml
         }
     }
 }
+
+namespace Perspex
+{
+    public static class XamlObjectExtensions
+    {
+        public static TObject LoadFromXaml<TObject>(this TObject obj)
+        {
+            Markup.Xaml.PerspexXamlLoader.Load(obj);
+            return obj;
+        }
+    }
+}

src/Perspex.Controls/Window.cs

@@ -325,3 +325,16 @@ namespace Perspex.Controls
         }
     }
 }
+
+namespace Perspex
+{
+    public static class WindowApplicationExtensions
+    {
+        public static void RunWithMainWindow<TWindow>(this Application app) where TWindow : Perspex.Controls.Window, new()
+        {
+            var window = new TWindow();
+            window.Show();
+            app.Run(window);
+        }
+    }
+}

src/Perspex.Diagnostics/DevTools.xaml.cs

@@ -13,9 +13,20 @@ using Perspex.Markup.Xaml;
 using Perspex.VisualTree;
 using ReactiveUI;
 
+namespace Perspex
+{
+	public static class WindowExtensions
+	{
+		public static void AttachDevTools(this Window window)
+		{
+			Perspex.Diagnostics.DevTools.Attach(window);
+		}
+	}
+}
+
 namespace Perspex.Diagnostics
 {
-    public class DevTools : UserControl
+	public class DevTools : UserControl
     {
         private static Dictionary<Window, Window> s_open = new Dictionary<Window, Window>();
         private IDisposable _keySubscription;

src/Skia/Perspex.Skia/SkiaPlatform.cs

@@ -3,13 +3,25 @@ using System.Collections.Generic;
 using System.Text;
 using Perspex.Platform;
 
+namespace Perspex
+{
+    public static class SkiaApplicationExtensions
+    {
+        public static TApp UseSkia<TApp>(this TApp app) where TApp : Application
+        {
+            Perspex.Skia.SkiaPlatform.Initialize();
+            return app;
+        }
+    }
+}
+
 namespace Perspex.Skia
 {
     public static class SkiaPlatform
     {
         private static bool s_forceSoftwareRendering;
 
-        public static void Initialize() 
+        public static void Initialize()
             => PerspexLocator.CurrentMutable.Bind<IPlatformRenderInterface>().ToConstant(new PlatformRenderInterface());
 
         public static bool ForceSoftwareRendering

src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs

@@ -7,6 +7,18 @@ using Perspex.Direct2D1.Media;
 using Perspex.Media;
 using Perspex.Platform;
 
+namespace Perspex
+{
+    public static class Direct2DApplicationExtensions
+    {
+        public static TApp UseDirect2D<TApp>(this TApp app) where TApp : Application
+        {
+            Perspex.Direct2D1.Direct2D1Platform.Initialize();
+            return app;
+        }
+    }
+}
+
 namespace Perspex.Direct2D1
 {
     public class Direct2D1Platform : IPlatformRenderInterface

src/Windows/Perspex.Win32/Win32Platform.cs

@@ -16,6 +16,18 @@ using Perspex.Shared.PlatformSupport;
 using Perspex.Win32.Input;
 using Perspex.Win32.Interop;
 
+namespace Perspex
+{
+    public static class Win32ApplicationExtensions
+    {
+        public static TApp UseWin32<TApp>(this TApp app) where TApp : Application
+        {
+            Perspex.Win32.Win32Platform.Initialize();
+            return app;
+        }
+    }
+}
+
 namespace Perspex.Win32
 {
     public class Win32Platform : IPlatformThreadingInterface, IPlatformSettings, IWindowingPlatform