Permalink
Browse files

Merge pull request #114 from thefiddler/nativewindow

INativeWindow cleanup and consolidation
  • Loading branch information...
2 parents 0c61baf + 0e48ad3 commit cd7342b68875d07fb30efdc634035b86ef9b3ea1 @thefiddler thefiddler committed May 12, 2014
Showing with 2,376 additions and 1,905 deletions.
  1. +2 −1 Source/Examples/OpenTK.Examples.csproj
  2. +268 −21 Source/Examples/OpenTK/Test/GameWindowStates.cs
  3. +37 −0 Source/Examples/OpenTK/Test/PointToClient.cs
  4. +3 −3 Source/OpenTK/Graphics/GraphicsBindingsBase.cs
  5. +20 −4 Source/OpenTK/INativeWindow.cs
  6. +21 −41 Source/OpenTK/Input/KeyboardDevice.cs
  7. +39 −10 Source/OpenTK/Input/KeyboardKeyEventArgs.cs
  8. +17 −36 Source/OpenTK/Input/KeyboardState.cs
  9. +33 −340 Source/OpenTK/Input/MouseDevice.cs
  10. +369 −0 Source/OpenTK/Input/MouseEventArgs.cs
  11. +119 −0 Source/OpenTK/Input/MouseScrollWheel.cs
  12. +55 −76 Source/OpenTK/Input/MouseState.cs
  13. +82 −6 Source/OpenTK/NativeWindow.cs
  14. +3 −3 Source/OpenTK/OpenTK.csproj
  15. +26 −11 Source/OpenTK/Platform/LegacyInputDriver.cs
  16. +1 −1 Source/OpenTK/Platform/MacOS/Carbon/MacOSKeys.cs
  17. +5 −0 Source/OpenTK/Platform/MacOS/Cocoa/Class.cs
  18. +6 −0 Source/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs
  19. +18 −1 Source/OpenTK/Platform/MacOS/Cocoa/NSApplication.cs
  20. +156 −232 Source/OpenTK/Platform/MacOS/CocoaNativeWindow.cs
  21. +18 −2 Source/OpenTK/Platform/MacOS/HIDInput.cs
  22. +477 −0 Source/OpenTK/Platform/NativeWindowBase.cs
  23. +2 −9 Source/OpenTK/Platform/SDL2/Sdl2.cs
  24. +1 −1 Source/OpenTK/Platform/SDL2/Sdl2Factory.cs
  25. +1 −46 Source/OpenTK/Platform/SDL2/Sdl2InputDriver.cs
  26. +9 −0 Source/OpenTK/Platform/SDL2/Sdl2KeyMap.cs
  27. +14 −32 Source/OpenTK/Platform/SDL2/Sdl2Keyboard.cs
  28. +3 −28 Source/OpenTK/Platform/SDL2/Sdl2Mouse.cs
  29. +72 −207 Source/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
  30. +6 −2 Source/OpenTK/Platform/Windows/API.cs
  31. +74 −240 Source/OpenTK/Platform/Windows/WinGLNative.cs
  32. +1 −1 Source/OpenTK/Platform/Windows/WinRawKeyboard.cs
  33. +4 −1 Source/OpenTK/Platform/Windows/WinRawMouse.cs
  34. +59 −1 Source/OpenTK/Platform/X11/Bindings/Glx.cs
  35. +29 −1 Source/OpenTK/Platform/X11/Structs.cs
  36. +52 −25 Source/OpenTK/Platform/X11/X11GLContext.cs
  37. +228 −285 Source/OpenTK/Platform/X11/X11GLNative.cs
  38. +0 −235 Source/OpenTK/Platform/X11/X11Input.cs
  39. +42 −0 Source/OpenTK/Platform/X11/X11KeyMap.cs
  40. +4 −3 Source/OpenTK/Platform/X11/XI2Mouse.cs
@@ -549,7 +549,7 @@
<None Include="Data\Audio\the_ring_that_fell.wav">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
- <None Include="Data\Textures\cursor.png">
+ <None Include="Data\Textures\cursor.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<EmbeddedResource Include="OpenGL\1.x\OpenGLDiagnostics.rtf" />
@@ -572,6 +572,7 @@
<Link>Dependencies\x64\libSDL2.dylib</Link>
</None>
<Compile Include="OpenTK\Test\ExternalContext.cs" />
+ <Compile Include="OpenTK\Test\PointToClient.cs" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
Oops, something went wrong.

0 comments on commit cd7342b

Please sign in to comment.