Commit graph

3871 commits

Author SHA1 Message Date
thefiddler 0d4fddd9b4 [Win] Skip devices with too many axes
These are likely not joysticks / gamepads, but multitouch-capable HID
devices.
2014-09-11 12:51:50 +02:00
thefiddler 388acee32a [Win] Correct joystick GUID generation
Joystick GUIDs now match SDL2/DirectInput for USB devices. (Bluetooth
devices still need to be tested.)
2014-09-11 12:51:49 +02:00
thefiddler ec37a9a16d [Input] Do not throw exception on too many axes
A joystick device with more axes/buttons/hats than supported will now
register a warning message instead of throwing an exception.

Fixes an issue with the VMware touch driver, which registers 25 distinct
axes.
2014-09-11 12:51:49 +02:00
thefiddler f829b3d732 [Win] Fix compilation in Release 2014-09-11 12:51:49 +02:00
thefiddler 8c762e56e3 [Win] Added collection id to dictionary keys 2014-09-11 12:51:49 +02:00
thefiddler a2d6f1801c [Win] Improved joystick debugging information 2014-09-11 12:51:49 +02:00
thefiddler 1e5b2e57cd [Win] Correct XInput axes/button/hat mapping 2014-09-11 12:51:49 +02:00
thefiddler f81046f27d [Win] Corrected GUID for xinput devices 2014-09-11 12:51:49 +02:00
thefiddler 0bd6854a65 [Win] Detect xinput devices and use xinput driver 2014-09-11 12:51:49 +02:00
thefiddler be575d4475 [Win] Refactored UpdateAxes 2014-09-11 12:51:49 +02:00
thefiddler 354fc04614 [Win] Do not change device index when replugging 2014-09-11 12:51:49 +02:00
thefiddler 9efa75179f [Platform] DeviceCollection hardware id is long 2014-09-11 12:51:49 +02:00
thefiddler 4c411b0b6e [Win] Retrieve joystick input even on background 2014-09-11 12:51:48 +02:00
thefiddler dd0f622670 [Win] Do not re-query caps in ProcessEvents
We just do that once when a device is opened.
2014-09-11 12:51:48 +02:00
thefiddler 15a79e5213 [Input] Improved GamePadButtons.ToString() 2014-09-11 12:51:48 +02:00
thefiddler 5c0923004a [Win] Fixed axis, button and hat value updates 2014-09-11 12:51:48 +02:00
thefiddler e3875527eb [Win] Fixed axis range calculation
Values are now correctly scaled between [min, max]
2014-09-11 12:51:48 +02:00
thefiddler f010e32570 [Win] Added HidP status codes 2014-09-11 12:51:48 +02:00
thefiddler cbb2807959 [Win] Implemented joystick button updates
Due to the way we segregate axes from buttons, the easiest approach is
to retrieve the current button state via HidP_GetUsages().

Axes, buttons and hats are now allocated sequentially based on their
order of appearance in the device capability reports.
2014-09-11 12:51:48 +02:00
thefiddler 3fee0bd8d0 [Win] Raw input parsing moved to input drivers 2014-09-11 12:51:48 +02:00
thefiddler a51a85c517 [Win] Added helper raw input methods 2014-09-11 12:51:48 +02:00
thefiddler 6d54edc389 [Win] Use DeviceCollection. Fix GUID detection 2014-09-11 12:51:48 +02:00
thefiddler db01cac895 [Common] Use long for device keys 2014-09-11 12:51:48 +02:00
thefiddler a8aabbf02c [Win] Made internal struct non-public 2014-09-11 12:51:47 +02:00
thefiddler 8fddf8b669 [Win] Fixed axis/button detection
We can now discover button range collections.
2014-09-11 12:51:47 +02:00
thefiddler f3b3b8860e [Win] Improved HidP bindings
Marked arrays with [In] and [Out] as required. Fixes issues with
axis/button capabilities returning empty results.

Added bindings for link collection node transversal.
2014-09-11 12:51:47 +02:00
thefiddler 131de67459 Fixed minor compilation issues 2014-09-11 12:51:47 +02:00
Stefanos A 30d09a4300 [Win] Cleaned up public region 2014-09-11 12:51:47 +02:00
Stefanos A 9a25ddc14d [Win] Corrected GetRawInputData invocation 2014-09-11 12:51:47 +02:00
Stefanos A 97b0275aa4 [Win] Removed WinMM joystick driver 2014-09-11 12:51:47 +02:00
Stefanos A cec48ab20a [Win] Completed raw input IJoystickDriver2
For improved safety, we are now using managed memory buffers instead of
stack allocations and pointers.
2014-09-11 12:51:47 +02:00
Stefanos A f6b382c929 [Win] Reduce duplication in device enumeration 2014-09-11 12:51:47 +02:00
Stefanos A e38fc0dff7 [Input] Added JoystickCapabilities.SetIsConnected 2014-09-11 12:51:47 +02:00
Stefanos A 27e80fcc9e [Win] Completed WinRawJoystick implementation 2014-09-11 12:51:46 +02:00
Stefanos A 956691de31 [Win] Fixed RawHID struct definition 2014-09-11 12:51:46 +02:00
Stefanos A 94476b930e [Common] Moved axis translation to common 2014-09-11 12:51:46 +02:00
Stefanos A 85e6b9f9ad [Win] Wrapped additional HID APIs 2014-09-11 12:51:46 +02:00
Stefanos A 2c197f09e1 [Win] Cleanup Raw Input HID usage/pages 2014-09-11 12:51:46 +02:00
Stefanos A cac96bbaf9 [Common] Cleaned up comments 2014-09-11 12:51:46 +02:00
Stefanos A dc357604df [Win] Added HidProtocol binding 2014-09-11 12:51:46 +02:00
Stefanos A 178305e1c1 [Common] Added HID usage page definitions 2014-09-11 12:51:46 +02:00
Stefanos A 18c02db7b0 [Win] Initial implementation of WinRawJoystick 2014-09-11 12:51:46 +02:00
Stefanos A 9cf3deea8c [Win] Improve WinMM.GetCapabilities performance
Polling joyGetCaps is very very slow, so we should not do that every
time GetCapabilities is called. Instead, we should call joyGetCaps once
and cache the results.

We need to find a different way to implement hotplugging.
2014-09-11 12:51:46 +02:00
Stefanos A c3b289ee9b [Win] Implemented XInput vibration support 2014-09-11 12:51:46 +02:00
Stefanos A 06e63946cc [Win] Separate keyboard/mouse & joystick drivers
Keyboard/mouse support comes through WinRawInput; joystick support
through CombinedJoystickDriver. These drivers are now instantiated
separately.
2014-09-11 12:51:45 +02:00
Stefanos A 5cfde8ff0f [Win] Added combined XInput+WinMM joystick driver
Joystick devices will be queried through XInput first, with a fallback
to WinMM in case they are not recognized by the newer API.
2014-09-11 12:51:45 +02:00
Stefanos A 14d07a5952 [Win] Corrected XInput Guid in gamepad database
All XInput devices expose the same button layout, so they only need a
single entry in the gamepad configuration database.
2014-09-11 12:51:45 +02:00
Stefanos A 765ad9e05b [Win] WinRawInput is IKeyboard/MouseDriver2
Since we do not use Raw Input for joystick devices, it does not make
sense to expose the IJoystickDriver2 interface through WinRawInput. This
keeps allows joystick and keyboard/mouse implementations to reside in
distinct, modular classes, instantiated separately through WinFactory.
2014-09-11 12:51:45 +02:00
Stefanos A 8968f7ff38 [Win] XInputJoystick is now IJoystickDriver2
The IGamePadDriver interface is now implemented using
MappedGamePadDriver on all platforms. This minimizes code duplication
and simplifies all input driver implementations, since we only need
backends for IJoystickDriver2.
2014-09-11 12:51:45 +02:00
Stefanos A 0e72cb3dd2 [OpenTK] Removed unused CreateGraphicsMode API
IPlatformFactory.CreateGraphicsMode is no longer used or required.
2014-09-11 12:51:45 +02:00
thefiddler d6d6842730 Merge pull request #178 from thefiddler/mac_crash
[Mac] Avoid crash when combining with MonoMac/Xamarin.Mac
2014-09-11 12:42:20 +02:00
thefiddler 6292ad4160 [Mac] Avoid calling finishLaunching multiple times 2014-09-11 12:21:05 +02:00
thefiddler 1080dec04d [Mac] Do not modify existing mainMenu
If an application already has a custom main menu, avoid overwriting
that in OpenTK.
2014-09-11 12:07:53 +02:00
thefiddler c6989395df [Input] Added GameWindow.Mouse/Keyboard.GetState()
GameWindow.Mouse/Keyboard hide OpenTK.Input.Mouse/Keyboard.
To simplify usage, the former now provide the same methods
as the latter.
2014-09-11 01:03:24 +02:00
Robert Rouhani ee56a3506d Added Matrix3[d].Add and Matrix4[d].CreateFromRotationMatrix 2014-09-09 13:21:11 -04:00
thefiddler ffa3df29eb [X11] Fixed core X11 scrolling and absolute y motions 2014-08-10 02:56:37 +02:00
thefiddler 9ae778a00f [X11] Fixed absolute motion valuators 2014-08-09 22:09:32 +02:00
thefiddler 5a5607eaa5 [X11] Added strong-typed enum for XIValuatorInfo.mode 2014-08-09 22:09:16 +02:00
thefiddler a3e47a2431 [X11] Check before using motion/scroll valuators
These valuators are not available on all systems. We now check
explicitly for support, instead of returning invalid results.

Additionally, unknown valuator names are now printed to the
debug log.
2014-08-09 21:47:09 +02:00
thefiddler 073ddf1bef [X11] Added XGetAtomName() function 2014-08-09 21:46:55 +02:00
thefiddler 5444c0c8b8 [SDL] Workaround for a Mono crash in SDL.JoystickGetGUID
It appears that Mono 3.4.0 fails to marshal SDL_JoystickGUID
correctly when used as a return value. Changing the fixed buffer
to a couple of long fields allows the struct to be marshalled
correctly.
2014-08-09 21:17:49 +02:00
thefiddler e243316e8e [Input] Cleaned up line endings and joystick hat mapping 2014-07-29 23:21:37 +02:00
Andrew O'Connor fe1d465b85 [Input][SDL] Fix JoystickHat bugs
On SDL, DPad inputs were not correctly translated from joystick
hat inputs.
Updated MappedGamePadDriver so that it will correctly recognize
combined joystick hat directions e.g. DPadLeft should be true when
DownLeft, Left, or UpLeft are returned from the joystick hat.
2014-07-27 14:54:36 +01:00
thefiddler e5cd6a3b9e [Input] Implemented JoystickHat GamePad mapping 2014-07-25 23:26:03 +02:00
thefiddler 7c55e4e9ec [Input] Corrected invalid GUID in GamePad database 2014-07-24 01:10:22 +02:00
thefiddler 3e9b2005d1 [Input] Sync GamePad database with SDL 2.0.4 2014-07-24 00:19:41 +02:00
thefiddler 6db29562cc [Mac] Release input driver before other resources
The input driver relies on the existence of a CFRunLoop. Releasing it
first ensures that a CFRunLoop is available for its complete life cycle.
2014-07-23 23:23:14 +02:00
thefiddler f799530575 [Mac] Do not use autorelease pool
Avoids a potential crash on shutdown.
2014-07-23 23:22:00 +02:00
thefiddler bb882fe700 [Mac] Correctly release mach port
The event tap is released automatically along with the mach port. Fixes
crash on shutdown.
2014-07-23 23:21:04 +02:00
thefiddler 15f87c15a1 [Graphics] Implemented structural equality
GraphicsContexts are now considered equal if they store the same
context handle. Debugging information is also improved.
2014-07-23 21:24:24 +02:00
thefiddler 29af70274d [Mac] Removed stored delegate list
The stored delegate list would store delegates indefinitely, causing a
memory leak. It is now the responsibility of each class to maintain
references to any callback functions it defines.
2014-07-23 21:23:25 +02:00
thefiddler 8f30f77b30 [OpenTK] Removed the finalizer in OpenTK.Toolkit
This resolves crashes related to the platform factory being reset while
resources are still live.
2014-07-23 21:22:22 +02:00
thefiddler 8b1be5c49a [OpenTK] Dispose() now clear the list of resources 2014-07-23 21:20:28 +02:00
thefiddler 57c2f89038 [Mac] Explicitly close removed devices
Devices are now explicitly closed when they a DeviceRemoved event is
received. Additionally, exceptions are no longer allowed to escape into
unmanaged code, where they might crash the runtime.
2014-07-23 21:19:46 +02:00
thefiddler d12643cf44 [Mac] Mark callback calling convention
Callbacks are now explicitly marked as unmanaged pointers with the
correct (platform-defined) calling convention. Exceptions raised inside
these callbacks are no longer allowed to escape into unmanaged code,
where they will crash the runtime.

Additionally, the window is now only closed on the UI thread, and only
if it is actually open.
2014-07-23 21:18:34 +02:00
thefiddler a6c4a7c9b5 [Mac] Only dispose context on UI thread 2014-07-23 21:15:16 +02:00
thefiddler e5e9ae0929 [Mac]] Add NSApplication.IsUIThread property
This can be used to check whether it is safe to access UI components in
the calling thread.
2014-07-23 21:14:47 +02:00
thefiddler 050a93d4af [Mac] Resource registration moved to the facades 2014-07-23 14:36:09 +02:00
thefiddler ac2ae4a4bb [Mac] Ensure Cocoa bindings are initialized first 2014-07-23 14:35:51 +02:00
thefiddler 6abca6ddf7 [OpenTK] Register GraphicsContext and NativeWindow 2014-07-23 14:35:33 +02:00
thefiddler ab75ca05c4 [OpenTK] Added IPlatformFactory.RegisterResource() 2014-07-23 14:34:52 +02:00
thefiddler 5d66aaa034 [Mac] Do not set callback delegates to null
This is done automatically by the GC once they are eligible for
collection.
2014-07-23 10:10:37 +02:00
thefiddler 4093b39fac [Mac] Store a reference to callback delegates
This avoids a potential crashes by the GC reclaiming the delegates
prematurely.
2014-07-23 10:10:08 +02:00
thefiddler e81d8da068 [OpenTK] Reduce duplication in GraphicsContextBase
Inheritors now take advantage of base class functionality to avoid
duplicating finalizers and warning messages.
2014-07-23 10:08:57 +02:00
thefiddler 8f03b09dad [Mac] Register platform resources for disposal 2014-07-23 09:21:28 +02:00
thefiddler 77a44b2c8e [OpenTK] Add allocated resource registry 2014-07-23 09:21:20 +02:00
thefiddler 864cc84019 [Mac] Do not execute run loop prematurely
Fixes a potential crash when destroying and recreating OpenTK.Toolkit.
2014-07-23 09:20:51 +02:00
thefiddler b0ceef3ec9 [OpenTK] Additional constructor and doc cleanup 2014-07-23 09:05:29 +02:00
thefiddler 0a0a5d0af7 [Mac] More defensive programming
CocoaNativeWindow now checks for and reports failures to allocate
resources in its constructor. Additionally, it no longer calls UI
methods in the finalizer thread, as those methods will crash on Cocoa.
2014-07-23 09:05:01 +02:00
thefiddler 7cc3e922ee [OpenTK] Re-add static Factory constructor
There are static methods that rely on `OpenTK.Platform.Factory` having
a static constructor. We need to fix those first, before we can remove
this constructor.
2014-07-23 09:03:18 +02:00
thefiddler 9d6b6891e6 [Mac] CursorVisible should only apply when changed
This fixes an issue where `NativeWindow.Dispose()` would move the mouse
cursor.
2014-07-22 21:02:33 +02:00
thefiddler 0c4081f6ef [Mac] Do not use Autorelease pool 2014-07-22 16:29:52 +02:00
thefiddler 5501689d37 [Mac] Added objc_disposeClassPair binding 2014-07-22 16:29:37 +02:00
thefiddler 0e40f63cf2 [Mac] Close CocoaNativeWindow in Dispose()
Also fix various memory management issues regarding the `MouseCursor`
and `Icon` properties.
2014-07-22 16:29:21 +02:00
thefiddler 7956126c8d [Mac] Retain CFRunLoop while it is in use 2014-07-22 16:20:46 +02:00
thefiddler 42e4e0b27e [Mac] Added CFRetain binding 2014-07-22 16:19:43 +02:00
thefiddler 35bdf16f85 [OpenTK] Correctly reinitialize platform factory 2014-07-22 14:29:20 +02:00
thefiddler a047c08d3d [Mac] Correctly shutdown HID input driver 2014-07-22 14:28:48 +02:00
thefiddler 2a84104262 Merge pull request #157 from thefiddler/warnfix
Fix all build warnings on VS2013 and Mono 3.4.0
2014-07-21 18:05:20 +02:00
thefiddler 7c98a9c58d Merge pull request #156 from thefiddler/buildfix
Use "Preserve Newest" option on OpenTK.dll.config
2014-07-21 17:56:10 +02:00
thefiddler 00b531fdef Fixed compilation warnings on Mono 3.4.0 2014-07-21 17:46:39 +02:00
thefiddler f0484879ef [ES][GL] Regenerated bindings 2014-07-21 16:53:36 +02:00
thefiddler ffd7682eeb [ES][GL] Added missing documentation comments 2014-07-21 16:53:24 +02:00
thefiddler e0a3b73130 Cleaned up the remaining obsolete warnings 2014-07-21 16:49:24 +02:00
thefiddler 461fbce45f Cleaned up a number of obsolete warnings 2014-07-21 16:39:58 +02:00
thefiddler ead151ea4f Fixed a large number of warnings 2014-07-21 16:03:37 +02:00
thefiddler ec34d17b21 Fixed a large number of build warnings 2014-07-21 15:03:24 +02:00
thefiddler 6ab1a9db87 Use "Preserve Newest" option on OpenTK.dll.config
OpenTK.dll.config was previously set to be always copied to the
output directory. This caused constant rebuilds in Visual Studio.

Setting this to "Preserve Newest" improves build times
significantly.
2014-07-21 14:32:08 +02:00
thefiddler f756b97ffb [ES][GL] Regenerated bindings 2014-07-21 09:19:39 +02:00
Stefanos A 0f1776bdd0 [X11] Use the correct visual info for the context
This also fixes a potential NRE.
2014-07-20 11:31:02 +02:00
Stefanos A. d75a2ce439 [X11] Fix for issue #143
OpenTK will now use the same GLXFBConfig to create the INativeWindow
and IGraphicsContext on Linux/X11. This resolves an issue where OpenGL
3.x contexts could not be created on some graphics drivers (e.g.
nvidia binary.)
2014-07-19 20:39:17 +02:00
thefiddler a13a2f8e66 [X11] Workaround for issue #146
Windows are now unmapped before being destroyed.
2014-07-18 17:16:27 +02:00
thefiddler 786273dd19 [X11] Fixed OnMouseMove being called without mouse movement 2014-07-18 17:02:47 +02:00
thefiddler 00b5174f63 [Linux] Delay input device detection until a key is pressed 2014-07-18 11:23:28 +02:00
thefiddler 07d496d181 [Linux] Fixed OnMouseMove being called without movement 2014-07-18 10:13:45 +02:00
thefiddler a38e267156 [Linux] Additional debugging info on shutdown 2014-07-18 10:05:13 +02:00
thefiddler 51c05ea1a5 [KMS] Correctly restore crtc on exit. 2014-07-18 10:04:57 +02:00
thefiddler 91055336c0 [Linux] Fixed minor typo 2014-07-18 09:45:04 +02:00
thefiddler b23d06eb46 [Linux] Fixed CursorVisible=false behavior 2014-07-18 09:22:12 +02:00
thefiddler a30ec9003b [Linux] Fixed X11 vs KMS detection 2014-07-18 09:19:37 +02:00
thefiddler 4aa2dcf5a3 [Linux] Fixed compilation issue 2014-07-18 09:05:46 +02:00
thefiddler 21bcc5eae1 [Linux] Print libinput seat for each detected device 2014-07-18 09:02:01 +02:00
thefiddler 20747664f4 [KMS] VSync off causes a crash; force VSync on until fixed
VSync off leads to buffer starvation and a crash in
Egl.SwapBuffers. We need to understand why and fix that
before we can disable vsync.
2014-07-17 11:59:38 +02:00
thefiddler 4f037c882a [KMS] Print device names when adding input devices 2014-07-17 11:59:04 +02:00
thefiddler 36bb366638 [Linux] Improved mouse cursor behavior 2014-07-17 11:20:01 +02:00
thefiddler fd6ff962a1 [Linux] Implemented CursorVisible 2014-07-17 09:45:13 +02:00
thefiddler 153522c0a4 [Linux] Implemented MouseCursor 2014-07-17 09:25:16 +02:00
thefiddler 015acba313 [KMS] Implemented INativeWindow.PointToClient/Screen 2014-07-16 14:51:14 +02:00
thefiddler 4c6bb7a38e [Linux] Corrected values for mouse move and scroll events 2014-07-16 14:28:28 +02:00
thefiddler 3881992bf7 [Linux] Implemented INativeWindow keyboard/mouse events
The mouse cursor is now confined to the display bounds.
2014-07-16 14:28:28 +02:00
thefiddler e61b39a1a1 [Linux] Fixed GameWindow.ClientSize values. 2014-07-16 14:28:28 +02:00
thefiddler bef4901659 [Linux] Implemented libinput IMouseDriver2 2014-07-16 14:28:27 +02:00
thefiddler 340d34b07b [Input] MouseState position is now stored in floating point
Several platforms provide subpixel accuracy for mouse position.
OpenTK can now take advantage of that.
2014-07-16 14:28:27 +02:00
thefiddler 4406d2db0d [Linux] Fixed keyboard polling 2014-07-16 14:28:27 +02:00
thefiddler 468a8518cb [Linux] Fixed poll() in libinput event loop 2014-07-16 14:28:27 +02:00
thefiddler 67727d2e9b [Linux] Completed libinput keyboard driver implementation 2014-07-16 14:28:27 +02:00
thefiddler c5abbe8030 [Linux] Implemented libinput keyboard input 2014-07-16 14:28:27 +02:00
thefiddler 4a53a5511a [Linux] Disabled TTY keyboard driver in favor of libinput
The TTY keyboard driver requires a robust cleanup method to avoid
hogging the keyboard/console after the process exists. Without
this, it does not make sense to use enable this driver.
2014-07-16 14:28:27 +02:00
thefiddler e7bd311fbd [Linux] Improve checks for TTY 2014-07-16 14:28:27 +02:00
thefiddler 9e73358dd7 [Linux] Implemented TTY and libinput keyboard drivers 2014-07-16 14:28:27 +02:00
thefiddler 97a539258b [Linux] Added stub TTY and libinput IKeyboardDriver2 2014-07-16 14:28:27 +02:00
thefiddler 9bc774f78c [KMS] Query GPUs lazily 2014-07-16 14:28:27 +02:00
thefiddler 69dbdb7d67 [KMS] Fixed Gbm.DestroyDevice entry point 2014-07-16 14:28:27 +02:00
thefiddler 452bafdbb1 [KMS] Fixed NRE in Toolkit.Init(); improved resource cleanup 2014-07-16 14:28:27 +02:00
thefiddler 753032b844 [KMS] Added DRM/GBM framebuffer implementation 2014-07-16 14:28:27 +02:00
thefiddler 19b34446bb [ES][GL] Print name when loading bindings (debug only) 2014-07-16 14:28:27 +02:00
thefiddler d8adf92feb [EGL] Added support for desktop GL rendering
On Linux, EGL can be used to initialize a desktop GL context.
This is especially true on KMS, Wayland and Mir.
2014-07-16 14:28:27 +02:00
thefiddler 5da5ac0fa7 [EGL] Egl.GetError() now returns ErrorCode 2014-07-16 14:28:27 +02:00
thefiddler f9d20b5e3e [KMS] Improved GBM surface format selection 2014-07-16 14:28:27 +02:00
thefiddler 6454822116 [KMS] Create window surface 2014-07-16 14:28:27 +02:00