Merge branch 'master' into name-scopes

.gitignore

@@ -198,3 +198,10 @@ info.plist
 build-intermediate
 obj-Direct2D1/
 obj-Skia/
+
+
+##################
+# Vim
+##################
+.vim
+.ccls-cache

build/SharedVersion.props

@@ -2,7 +2,7 @@
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Product>Avalonia</Product>
-    <Version>0.8.1</Version>
+    <Version>0.8.999</Version>
     <Copyright>Copyright 2019 &#169; The AvaloniaUI Project</Copyright>
     <PackageLicenseUrl>https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/AvaloniaUI/Avalonia/</PackageProjectUrl>

native/Avalonia.Native/src/OSX/KeyTransform.mm

@@ -26,7 +26,7 @@ const int kVK_ANSI_3 = 0x14;
 const int kVK_ANSI_4 = 0x15;
 const int kVK_ANSI_6 = 0x16;
 const int kVK_ANSI_5 = 0x17;
-//const int kVK_ANSI_Equal = 0x18;
+const int kVK_ANSI_Equal = 0x18;
 const int kVK_ANSI_9 = 0x19;
 const int kVK_ANSI_7 = 0x1A;
 const int kVK_ANSI_Minus = 0x1B;
@@ -45,11 +45,11 @@ const int kVK_ANSI_K = 0x28;
 const int kVK_ANSI_Semicolon = 0x29;
 const int kVK_ANSI_Backslash = 0x2A;
 const int kVK_ANSI_Comma = 0x2B;
-//const int kVK_ANSI_Slash = 0x2C;
+const int kVK_ANSI_Slash = 0x2C;
 const int kVK_ANSI_N = 0x2D;
 const int kVK_ANSI_M = 0x2E;
 const int kVK_ANSI_Period = 0x2F;
-//const int kVK_ANSI_Grave = 0x32;
+const int kVK_ANSI_Grave = 0x32;
 const int kVK_ANSI_KeypadDecimal = 0x41;
 const int kVK_ANSI_KeypadMultiply = 0x43;
 const int kVK_ANSI_KeypadPlus = 0x45;
@@ -57,7 +57,7 @@ const int kVK_ANSI_KeypadClear = 0x47;
 const int kVK_ANSI_KeypadDivide = 0x4B;
 const int kVK_ANSI_KeypadEnter = 0x4C;
 const int kVK_ANSI_KeypadMinus = 0x4E;
-//const int kVK_ANSI_KeypadEquals = 0x51;
+const int kVK_ANSI_KeypadEquals = 0x51;
 const int kVK_ANSI_Keypad0 = 0x52;
 const int kVK_ANSI_Keypad1 = 0x53;
 const int kVK_ANSI_Keypad2 = 0x54;
@@ -121,7 +121,7 @@ const int kVK_UpArrow = 0x7E;
 //const int kVK_JIS_Underscore = 0x5E;
 //const int kVK_JIS_KeypadComma = 0x5F;
 //const int kVK_JIS_Eisu = 0x66;
-//const int kVK_JIS_Kana = 0x68;
+const int kVK_JIS_Kana = 0x68;
 
  std::map<int, AvnKey> s_KeyMap =
  {
@@ -148,7 +148,7 @@ const int kVK_UpArrow = 0x7E;
     {kVK_ANSI_4, D4},
     {kVK_ANSI_6, D6},
     {kVK_ANSI_5, D5},
-    //{kVK_ANSI_Equal, ?},
+    {kVK_ANSI_Equal, OemPlus},
     {kVK_ANSI_9, D9},
     {kVK_ANSI_7, D7},
     {kVK_ANSI_Minus, OemMinus},
@@ -167,11 +167,11 @@ const int kVK_UpArrow = 0x7E;
     {kVK_ANSI_Semicolon, OemSemicolon},
     {kVK_ANSI_Backslash, OemBackslash},
     {kVK_ANSI_Comma, OemComma},
-    //{kVK_ANSI_Slash, ?},
+    {kVK_ANSI_Slash, Oem2},
     {kVK_ANSI_N, N},
     {kVK_ANSI_M, M},
     {kVK_ANSI_Period, OemPeriod},
-    //{kVK_ANSI_Grave, ?},
+    {kVK_ANSI_Grave, OemTilde},
     {kVK_ANSI_KeypadDecimal, Decimal},
     {kVK_ANSI_KeypadMultiply, Multiply},
     {kVK_ANSI_KeypadPlus, OemPlus},
@@ -179,7 +179,7 @@ const int kVK_UpArrow = 0x7E;
     {kVK_ANSI_KeypadDivide, Divide},
     {kVK_ANSI_KeypadEnter, AvnKeyEnter},
     {kVK_ANSI_KeypadMinus, OemMinus},
-    //{kVK_ANSI_KeypadEquals, ?},
+    {kVK_ANSI_KeypadEquals, OemPlus},
     {kVK_ANSI_Keypad0, NumPad0},
     {kVK_ANSI_Keypad1, NumPad1},
     {kVK_ANSI_Keypad2, NumPad2},
@@ -237,5 +237,6 @@ const int kVK_UpArrow = 0x7E;
     {kVK_LeftArrow, Left},
     {kVK_RightArrow, Right},
     {kVK_DownArrow, Down},
-    {kVK_UpArrow, Up}
+    {kVK_UpArrow, Up},
+    {kVK_JIS_Kana, AvnKeyKanaMode},
 };

src/Avalonia.OpenGL/GlInterface.cs

@@ -9,12 +9,14 @@ namespace Avalonia.OpenGL
     public class GlInterface : GlInterfaceBase
     {
         public string Version { get; }
+        public string Vendor { get; }
+        public string Renderer { get; }
 
         public GlInterface(Func<string, bool, IntPtr> getProcAddress) : base(getProcAddress)
         {
-            var versionPtr = GetString(GlConsts.GL_VERSION);
-            if (versionPtr != IntPtr.Zero)
-                Version = Marshal.PtrToStringAnsi(versionPtr);
+            Version = GetString(GlConsts.GL_VERSION);
+            Renderer = GetString(GlConsts.GL_RENDERER);
+            Vendor = GetString(GlConsts.GL_VENDOR);
         }
 
         public GlInterface(Func<Utf8Buffer, IntPtr> n) : this(ConvertNative(n))
@@ -54,7 +56,15 @@ namespace Avalonia.OpenGL
 
         public delegate IntPtr GlGetString(int v);
         [GlEntryPoint("glGetString")]
-        public GlGetString GetString { get; }
+        public GlGetString GetStringNative { get; }
+
+        public string GetString(int v)
+        {
+            var ptr = GetStringNative(v);
+            if (ptr != IntPtr.Zero)
+                return Marshal.PtrToStringAnsi(ptr);
+            return null;
+        }
 
         public delegate void GlGetIntegerv(int name, out int rv);
         [GlEntryPoint("glGetIntegerv")]

src/Avalonia.X11/Glx/GlxDisplay.cs

@@ -90,6 +90,19 @@ namespace Avalonia.X11.Glx
             GlInterface = new GlInterface(GlxInterface.GlxGetProcAddress);
             if (GlInterface.Version == null)
                 throw new OpenGlException("GL version string is null, aborting");
+            if (GlInterface.Renderer == null)
+                throw new OpenGlException("GL renderer string is null, aborting");
+
+            if (Environment.GetEnvironmentVariable("AVALONIA_GLX_IGNORE_RENDERER_BLACKLIST") != "1")
+            {
+                var blacklist = AvaloniaLocator.Current.GetService<X11PlatformOptions>()
+                    ?.GlxRendererBlacklist;
+                if (blacklist != null)
+                    foreach(var item in blacklist)
+                        if (GlInterface.Renderer.Contains(item))
+                            throw new OpenGlException($"Renderer '{GlInterface.Renderer}' is blacklisted by '{item}'");
+            }
+            
         }
 
         public void ClearContext() => Glx.MakeContextCurrent(_x11.Display,

src/Avalonia.X11/X11Platform.cs

@@ -96,6 +96,14 @@ namespace Avalonia
     {
         public bool UseEGL { get; set; }
         public bool UseGpu { get; set; } = true;
+
+        public List<string> GlxRendererBlacklist { get; set; } = new List<string>
+        {
+            // llvmpipe is a software GL rasterizer. If it's returned by glGetString,
+            // that usually means that something in the system is horribly misconfigured
+            // and sometimes attempts to use GLX might cause a segfault
+            "llvmpipe"
+        };
         public string WmClass { get; set; } = Assembly.GetEntryAssembly()?.GetName()?.Name ?? "AvaloniaApplication";
         public bool? EnableMultiTouch { get; set; }
     }

src/Skia/Avalonia.Skia/DrawingContextImpl.cs

@@ -101,6 +101,7 @@ namespace Avalonia.Skia
         public SKCanvas Canvas { get; }
 
         SKCanvas ISkiaDrawingContextImpl.SkCanvas => Canvas;
+        GRContext ISkiaDrawingContextImpl.GrContext => _grContext;
 
         /// <inheritdoc />
         public void Clear(Color color)

src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs

@@ -6,5 +6,6 @@ namespace Avalonia.Skia
     public interface ISkiaDrawingContextImpl : IDrawingContextImpl
     {
         SKCanvas SkCanvas { get; }
+        GRContext GrContext { get; }
     }
 }