X11 backend

Avalonia.sln

@@ -196,6 +196,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "nukebuild\_build.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Animation.UnitTests", "tests\Avalonia.Animation.UnitTests\Avalonia.Animation.UnitTests.csproj", "{AF227847-E65C-4BE9-BCE9-B551357788E0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.X11", "src\Avalonia.X11\Avalonia.X11.csproj", "{41B02319-965D-4945-8005-C1A3D1224165}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformSanityChecks", "samples\PlatformSanityChecks\PlatformSanityChecks.csproj", "{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
@@ -1767,6 +1771,54 @@ Global
 		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhone.Build.0 = Release|Any CPU
 		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{AF227847-E65C-4BE9-BCE9-B551357788E0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhone.Build.0 = Release|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{41B02319-965D-4945-8005-C1A3D1224165}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhone.Build.0 = Release|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1821,6 +1873,8 @@ Global
 		{D49233F8-F29C-47DD-9975-C4C9E4502720} = {E870DCD7-F46A-498D-83FC-D0FD13E0A11C}
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE} = {E870DCD7-F46A-498D-83FC-D0FD13E0A11C}
 		{AF227847-E65C-4BE9-BCE9-B551357788E0} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{41B02319-965D-4945-8005-C1A3D1224165} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
+		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}

azure-pipelines.yml

@@ -92,13 +92,13 @@ jobs:
     inputs:
       pathToPublish: '$(Build.SourcesDirectory)/Build/Products/Release/'
       artifactName: 'Avalonia.Native.OSX'
-    condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+    condition: succeeded()
 
   - task: PublishBuildArtifacts@1
     inputs:
       pathtoPublish: '$(Build.SourcesDirectory)/artifacts/nuget'
       artifactName: 'NuGetOSX'
-    condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+    condition: succeeded()
 
 - job: Windows
   pool:
@@ -127,10 +127,10 @@ jobs:
     inputs:
       pathtoPublish: '$(Build.SourcesDirectory)/artifacts/nuget'
       artifactName: 'NuGet'
-    condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+    condition: succeeded()
 
   - task: PublishBuildArtifacts@1
     inputs:
       pathToPublish: '$(Build.SourcesDirectory)/artifacts/zip'
       artifactName: 'Samples'
-    condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+    condition: succeeded()

samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj

@@ -9,6 +9,7 @@
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
   </ItemGroup>
 
 

samples/ControlCatalog/Pages/DialogsPage.xaml

@@ -6,6 +6,7 @@
       <Button Name="SaveFile">Save File</Button>
       <Button Name="SelectFolder">Select Folder</Button>
       <Button Name="DecoratedWindow">Decorated window</Button>
+      <Button Name="DecoratedWindowDialog">Decorated window (dialog)</Button>
       <Button Name="Dialog">Dialog</Button>
   </StackPanel>
 </UserControl>

samples/ControlCatalog/Pages/DialogsPage.xaml.cs

@@ -31,9 +31,13 @@ public DialogsPage()
                 }.ShowAsync(GetWindow());
             };
             this.FindControl<Button>("DecoratedWindow").Click += delegate
-                {
-                    new DecoratedWindow().ShowDialog(GetWindow());
-                };
+            {
+                new DecoratedWindow().Show();
+            };
+            this.FindControl<Button>("DecoratedWindowDialog").Click += delegate
+            {
+                new DecoratedWindow().ShowDialog(GetWindow());
+            };
             this.FindControl<Button>("Dialog").Click += delegate
                 {
                     new MainWindow().ShowDialog(GetWindow());

samples/PlatformSanityChecks/App.xaml

@@ -0,0 +1,6 @@
+<Application xmlns="https://github.com/avaloniaui">
+    <Application.Styles>
+        <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
+        <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+    </Application.Styles>
+</Application>

samples/PlatformSanityChecks/App.xaml.cs

@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Markup.Xaml;
+
+namespace PlatformSanityChecks
+{
+    public class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}

samples/PlatformSanityChecks/PlatformSanityChecks.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
+  </ItemGroup>
+
+</Project>

samples/PlatformSanityChecks/Program.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Diagnostics;
+using System.Reactive.Disposables;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Avalonia;
+using Avalonia.Platform;
+using Avalonia.Threading;
+using Avalonia.X11;
+
+namespace PlatformSanityChecks
+{
+    public class Program
+    {
+        static Thread UiThread;
+
+        static void Main(string[] args)
+        {
+            UiThread = Thread.CurrentThread;
+            AppBuilder.Configure<App>().RuntimePlatformServicesInitializer();
+            var app = new App();
+
+            AvaloniaX11PlatformExtensions.InitializeX11Platform();
+
+            CheckPlatformThreading();
+        }
+
+        static bool CheckAccess() => UiThread == Thread.CurrentThread;
+
+        static void VerifyAccess()
+        {
+            if (!CheckAccess())
+                Die("Call from invalid thread");
+        }
+
+        static Exception Die(string error)
+        {
+            Console.Error.WriteLine(error);
+            Console.Error.WriteLine(Environment.StackTrace);
+            Process.GetCurrentProcess().Kill();
+            throw new Exception(error);
+        }
+
+        static IDisposable Enter([CallerMemberName] string caller = null)
+        {
+            Console.WriteLine("Entering " + caller);
+            return Disposable.Create(() => { Console.WriteLine("Leaving " + caller); });
+        }
+
+        static void EnterLoop(Action<CancellationTokenSource> cb, [CallerMemberName] string caller = null)
+        {
+            using (Enter(caller))
+            {
+                var cts = new CancellationTokenSource();
+                cb(cts);
+                Dispatcher.UIThread.MainLoop(cts.Token);
+                if (!cts.IsCancellationRequested)
+                    Die("Unexpected loop exit");
+            }
+        }
+
+        static void CheckTimerOrdering() => EnterLoop(cts =>
+        {
+            bool firstFired = false, secondFired = false;
+            DispatcherTimer.Run(() =>
+            {
+                Console.WriteLine("Second tick");
+                VerifyAccess();
+                if (!firstFired)
+                    throw Die("Invalid timer ordering");
+                if (secondFired)
+                    throw Die("Invocation of finished timer");
+                secondFired = true;
+                cts.Cancel();
+                return false;
+            }, TimeSpan.FromSeconds(2));
+            DispatcherTimer.Run(() =>
+            {
+                Console.WriteLine("First tick");
+                VerifyAccess();
+                if (secondFired)
+                    throw Die("Invalid timer ordering");
+                if (firstFired)
+                    throw Die("Invocation of finished timer");
+                firstFired = true;
+                return false;
+            }, TimeSpan.FromSeconds(1));
+        });
+
+        static void CheckTimerTicking() => EnterLoop(cts =>
+        {
+            int ticks = 0;
+            var st = Stopwatch.StartNew();
+            DispatcherTimer.Run(() =>
+            {
+                ticks++;
+                Console.WriteLine($"Tick {ticks} at {st.Elapsed}");
+                if (ticks == 5)
+                {
+                    if (st.Elapsed.TotalSeconds < 4.5)
+                        Die("Timer is too fast");
+                    if (st.Elapsed.TotalSeconds > 6)
+                        Die("Timer is too slow");
+                    cts.Cancel();
+                    return false;
+                }
+
+                return true;
+            }, TimeSpan.FromSeconds(1));
+        });
+
+        static void CheckSignaling() => EnterLoop(cts =>
+        {
+            ThreadPool.QueueUserWorkItem(_ =>
+            {
+                Thread.Sleep(100);
+                Dispatcher.UIThread.Post(() =>
+                {
+                    VerifyAccess();
+                    cts.Cancel();
+                });
+            });
+        });
+
+        static void CheckPlatformThreading()
+        {
+            CheckSignaling();
+            CheckTimerOrdering();
+            CheckTimerTicking();
+        }
+    }
+}

src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs

@@ -29,7 +29,7 @@ public static TAppBuilder UsePlatformDetect<TAppBuilder>(this TAppBuilder builde
             }
             else
             {
-                LoadGtk3(builder);
+                LoadX11(builder);
                 LoadSkia(builder);
             }
             return builder;
@@ -42,9 +42,9 @@ static void LoadWin32<TAppBuilder>(TAppBuilder builder)
             where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
              => builder.UseWin32();
 
-        static void LoadGtk3<TAppBuilder>(TAppBuilder builder)
+        static void LoadX11<TAppBuilder>(TAppBuilder builder)
             where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
-             => builder.UseGtk3();
+             => builder.UseX11();
 
         static void LoadDirect2D1<TAppBuilder>(TAppBuilder builder)
             where TAppBuilder : AppBuilderBase<TAppBuilder>, new()

src/Avalonia.Desktop/Avalonia.Desktop.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-      <TargetFrameworks>netstandard2.0</TargetFrameworks>
+      <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
       <ProjectReference Include="../../src/Windows/Avalonia.Win32/Avalonia.Win32.csproj" />
       <ProjectReference Include="../../src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj" />
       <ProjectReference Include="../../src/Skia/Avalonia.Skia/Avalonia.Skia.csproj" />
-      <ProjectReference Include="../../src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj" />
       <ProjectReference Include="../../src/Avalonia.Native/Avalonia.Native.csproj" />
       <ProjectReference Include="../../packages/Avalonia/Avalonia.csproj" />
+      <ProjectReference Include="../Avalonia.X11/Avalonia.X11.csproj" />
   </ItemGroup>
 </Project>

src/Avalonia.Input/MouseDevice.cs

@@ -18,7 +18,7 @@ public class MouseDevice : IMouseDevice
     {
         private int _clickCount;
         private Rect _lastClickRect;
-        private uint _lastClickTime;
+        private ulong _lastClickTime;
         private IInputElement _captured;
         private IDisposable _capturedSubscription;
 
@@ -152,7 +152,7 @@ private void LeaveWindow(IMouseDevice device, IInputRoot root)
             ClearPointerOver(this, root);
         }
 
-        private bool MouseDown(IMouseDevice device, uint timestamp, IInputElement root, Point p, MouseButton button, InputModifiers inputModifiers)
+        private bool MouseDown(IMouseDevice device, ulong timestamp, IInputElement root, Point p, MouseButton button, InputModifiers inputModifiers)
         {
             Contract.Requires<ArgumentNullException>(device != null);
             Contract.Requires<ArgumentNullException>(root != null);

src/Avalonia.Input/Raw/RawDragEvent.cs

@@ -3,7 +3,7 @@
     public class RawDragEvent : RawInputEventArgs
     {
         public IInputElement InputRoot { get; }
-        public Point Location { get; }
+        public Point Location { get; set; }
         public IDataObject Data { get; }
         public DragDropEffects Effects { get; set; }
         public RawDragEventType Type { get; }

src/Avalonia.Input/Raw/RawInputEventArgs.cs

@@ -21,7 +21,7 @@ public class RawInputEventArgs : EventArgs
         /// </summary>
         /// <param name="device">The associated device.</param>
         /// <param name="timestamp">The event timestamp.</param>
-        public RawInputEventArgs(IInputDevice device, uint timestamp)
+        public RawInputEventArgs(IInputDevice device, ulong timestamp)
         {
             Contract.Requires<ArgumentNullException>(device != null);
 
@@ -47,6 +47,6 @@ public RawInputEventArgs(IInputDevice device, uint timestamp)
         /// <summary>
         /// Gets the timestamp associated with the event.
         /// </summary>
-        public uint Timestamp { get; private set; }
+        public ulong Timestamp { get; private set; }
     }
 }

src/Avalonia.Input/Raw/RawKeyEventArgs.cs

@@ -13,7 +13,7 @@ public class RawKeyEventArgs : RawInputEventArgs
     {
         public RawKeyEventArgs(
             IKeyboardDevice device,
-            uint timestamp,
+            ulong timestamp,
             RawKeyEventType type,
             Key key, InputModifiers modifiers)
             : base(device, timestamp)