fix keyboard detection on windows, removed minimal

2024-12-22 20:05:29 +00:00 · 2018-10-13 10:22:50 +00:00 · 2018-10-13 10:22:50 +00:00 · c847e1f0e4
parent 835af54e12
commit c847e1f0e4
22 changed files with 19 additions and 50 deletions
--- a/OpenTK.sln
+++ b/OpenTK.sln
@ -45,6 +45,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vk.generator", "src\vk.gene
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vk.rewrite", "src\vk.rewrite\vk.rewrite.csproj", "{3E9B1C4D-BCB4-418A-A94E-DD164A19C6A2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\opentk-examples\src\test\test.csproj", "{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -103,6 +105,10 @@ Global
 		{3E9B1C4D-BCB4-418A-A94E-DD164A19C6A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3E9B1C4D-BCB4-418A-A94E-DD164A19C6A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E9B1C4D-BCB4-418A-A94E-DD164A19C6A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FA5D0A1-BE90-476D-8BA7-3C1A0D9D7D4A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/src/OpenTK/Graphics/Color4.cs
+++ b/src/OpenTK/Graphics/Color4.cs
@ -24,9 +24,7 @@
 //

 using System;
-#if !MINIMAL
 using System.Drawing;
-#endif

 namespace OpenTK.Graphics
 {
--- a/src/OpenTK/Graphics/ES20/Helper.cs
+++ b/src/OpenTK/Graphics/ES20/Helper.cs
@ -24,9 +24,7 @@
 //

 using System;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using System.Runtime.InteropServices;
 using System.Text;

--- a/src/OpenTK/Graphics/ES30/Helper.cs
+++ b/src/OpenTK/Graphics/ES30/Helper.cs
@ -24,9 +24,7 @@
 //

 using System;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using System.Runtime.InteropServices;
 using System.Text;

--- a/src/OpenTK/Graphics/OpenGL/GLHelper.cs
+++ b/src/OpenTK/Graphics/OpenGL/GLHelper.cs
@ -25,9 +25,7 @@


 using System;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using System.Text;
 using System.Runtime.InteropServices;

@ -2772,7 +2770,7 @@ namespace OpenTK.Graphics.OpenGL
                }
            }
        }
-#if MINIMAL
+#if !MINIMAL
        /// <summary>
        /// [requires: v1.0]
        /// Set the viewport. This function assumes a lower left corner of (0, 0).
--- a/src/OpenTK/Graphics/OpenGL4/Helper.cs
+++ b/src/OpenTK/Graphics/OpenGL4/Helper.cs
@ -24,9 +24,7 @@
 //

 using System;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using System.Runtime.InteropServices;
 using System.Text;

--- a/src/OpenTK/INativeWindow.cs
+++ b/src/OpenTK/INativeWindow.cs
@ -25,9 +25,7 @@

 using System;
 using System.ComponentModel;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using OpenTK.Platform;

 namespace OpenTK
--- a/src/OpenTK/Minimal.cs
+++ b/src/OpenTK/Minimal.cs
@ -1,4 +1,4 @@
-#if ANDROID || IPHONE || MINIMAL
+#if (ANDROID || IPHONE || MINIMAL) && !NETSTANDARD
 using System;

 #if !MINIMAL
--- a/src/OpenTK/NativeWindow.cs
+++ b/src/OpenTK/NativeWindow.cs
@ -25,9 +25,7 @@

 using System;
 using System.ComponentModel;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using OpenTK.Graphics;
 using OpenTK.Graphics.Vulkan;
 using OpenTK.Input;
--- a/src/OpenTK/OpenTK.Standard.csproj
+++ b/src/OpenTK/OpenTK.Standard.csproj
@ -3,7 +3,7 @@
    <AssemblyName>OpenTK</AssemblyName>
    <TargetFramework>netstandard2.0</TargetFramework>
    <RootNamespace>OpenTK</RootNamespace>
-	<DefineConstants>DEBUG;TRACE;WIN32;CARBON;X11;OPENGL;OPENGLES;MINIMAL</DefineConstants>    
+	<DefineConstants>TRACE;DEBUG;WIN32;CARBON;X11;OPENGL;OPENGLES;NETSTANDARD</DefineConstants>    
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@ -68,7 +68,7 @@
  </ItemGroup>
  <PropertyGroup>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.5</Version>
+    <Version>1.0.7</Version>
    <Description>The Open Toolkit library (OpenTK) is an advanced, low-level C# wrapper for OpenGL, OpenGL ES, OpenAL and Vulkan.
           It is suitable for games, scientific visualizations and projects that require 3d graphics, audio or compute functionality.

@ -84,8 +84,8 @@ This version can be found at https://github.com/Ryujinx/Opentk</Description>
    <Company>emmaus</Company>
    <Product>OpenTK</Product>
    <PackageProjectUrl>https://github.com/Ryujinx/Opentk</PackageProjectUrl>
-    <AssemblyVersion>1.0.5.0</AssemblyVersion>
-    <FileVersion>1.0.5.0</FileVersion>
+    <AssemblyVersion>1.0.7.0</AssemblyVersion>
+    <FileVersion>1.0.7.0</FileVersion>
  </PropertyGroup>
  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
    <Exec Command="$(OutputPath)..\..\..\..\Generator.Rewrite\bin\Debug\Rewrite.exe --assembly $(OutputPath)OpenTK.dll --signing-key ..\..\OpenTK.snk -debug -netstandard" Condition="$(OS) == 'Windows_NT' and $(Configuration) == 'Debug'" />
@ -108,7 +108,9 @@ This version can be found at https://github.com/Ryujinx/Opentk</Description>
    </MonoDevelop>
  </ProjectExtensions>
  <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Win32.SystemEvents" Version="4.5.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
  </ItemGroup>
  <ItemGroup>
--- a/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs
+++ b/src/OpenTK/Platform/Linux/LinuxNativeWindow.cs
@ -27,9 +27,7 @@

 using System;
 using System.Diagnostics;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using OpenTK.Graphics;
 using OpenTK.Input;
 using OpenTK.Platform.Egl;
--- a/src/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs
+++ b/src/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs
@ -27,10 +27,8 @@

 using System.Runtime.InteropServices;
 using System;
-#if !MINIMAL
 using System.Drawing;
 using System.Drawing.Imaging;
-#endif

 namespace OpenTK.Platform.MacOS
 {
--- a/src/OpenTK/Platform/MacOS/Cocoa/NSFloat.cs
+++ b/src/OpenTK/Platform/MacOS/Cocoa/NSFloat.cs
@ -26,9 +26,7 @@
 //

 using System;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using System.Runtime.InteropServices;

 namespace OpenTK.Platform.MacOS
--- a/src/OpenTK/Platform/MacOS/CocoaNativeWindow.cs
+++ b/src/OpenTK/Platform/MacOS/CocoaNativeWindow.cs
@ -28,9 +28,7 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using System.Runtime.InteropServices;
 using System.Threading;
 using OpenTK.Graphics;
--- a/src/OpenTK/Platform/NativeWindowBase.cs
+++ b/src/OpenTK/Platform/NativeWindowBase.cs
@ -28,9 +28,7 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using OpenTK.Input;

 namespace OpenTK.Platform
--- a/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
+++ b/src/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
@ -26,14 +26,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-#if !MINIMAL
 using System.Drawing;
-#endif
-#if ANDROID || IPHONE || MINIMAL
-using OpenTK.Minimal;
-#else
 using System.Drawing.Imaging;
-#endif
 using System.Runtime.InteropServices;
 using OpenTK.Input;
 using System.Text;
--- a/src/OpenTK/Platform/Windows/API.cs
+++ b/src/OpenTK/Platform/Windows/API.cs
@ -2717,7 +2717,7 @@ namespace OpenTK.Platform.Windows
        public char dbcc_name;
    }

-#if ANDROID || IPHONE || MINIMAL
+#if (ANDROID || IPHONE || MINIMAL) && !NETSTANDARD

    internal class RegistryKey
    {
--- a/src/OpenTK/Platform/Windows/WinDisplayDevice.cs
+++ b/src/OpenTK/Platform/Windows/WinDisplayDevice.cs
@ -26,9 +26,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-#if !MINIMAL
 using Microsoft.Win32;
-#endif

 namespace OpenTK.Platform.Windows
 {
--- a/src/OpenTK/Platform/Windows/WinGLNative.cs
+++ b/src/OpenTK/Platform/Windows/WinGLNative.cs
@ -28,10 +28,8 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
 using OpenTK.Input;
-#if !MINIMAL
 using System.Drawing;
 using System.Drawing.Imaging;
-#endif

 namespace OpenTK.Platform.Windows
 {
--- a/src/OpenTK/Platform/Windows/WinRawKeyboard.cs
+++ b/src/OpenTK/Platform/Windows/WinRawKeyboard.cs
@ -27,7 +27,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-#if !(ANDROID || IPHONE || MINIMAL)
+#if !(ANDROID || IPHONE || MINIMAL) || NETSTANDARD
 using Microsoft.Win32;
 #endif
 using OpenTK.Input;
--- a/src/OpenTK/Platform/X11/Functions.cs
+++ b/src/OpenTK/Platform/X11/Functions.cs
@ -5,14 +5,11 @@
 */

 using System;
-#if !MINIMAL
 using System.Drawing;
-#endif
-#if ANDROID || IPHONE || MINIMAL
+#if (ANDROID || IPHONE || MINIMAL) && !NETSTANDARD
 using OpenTK.Minimal;
-#else
-using System.Drawing.Imaging;
 #endif
+using System.Drawing.Imaging;
 using System.Text;
 using System.Runtime.InteropServices;

--- a/src/OpenTK/Platform/X11/X11GLNative.cs
+++ b/src/OpenTK/Platform/X11/X11GLNative.cs
@ -26,9 +26,7 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
-#if !MINIMAL
 using System.Drawing;
-#endif
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;