ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-25 07:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
6143 commits 4 branches 1 tag 65 MiB
Commit graph

5610 commits

Author SHA1 Message Date
thefiddler 7d1bec58cc [X11] Implemented XI2 keyboard input 2014-05-15 10:21:06 +02:00
thefiddler 2eb88d9788 [X11] Added XIDeviceType enumeration 2014-05-15 10:20:23 +02:00
thefiddler 692c4c64ff [X11] Rebased on develop branch 2014-05-15 01:16:28 +02:00
thefiddler 7cce215a4b [X11] Use XKB for layout-independent input 
The code will fall back to core X11 if XKB is not available.
 2014-05-15 01:13:12 +02:00
thefiddler e8176ef7cf [X11] Added XKB bindings 2014-05-15 01:12:06 +02:00
thefiddler 687fc90c95 Merge pull request #120 from thefiddler/xcursorfix 
[X11] Improve mouse input
 2014-05-15 00:43:38 +02:00
Goz3rr 4414886832 Added GameWindowFlags.FixedWindow to allow for fixed border SDL Windows 2014-05-15 00:38:06 +02:00
thefiddler 1419c1e3a0 [Mac] Explicitly retain/release CocoaWindowInfo instances 2014-05-14 18:01:08 +02:00
thefiddler 1690cf859e [X11] Removed unused SetCursor() function 2014-05-14 00:42:05 +02:00
thefiddler a062d4c0a7 [X11] Removed stale comment 2014-05-14 00:00:13 +02:00
thefiddler 30d7780f1e [X11] Removed unused warp detection code 2014-05-13 23:51:55 +02:00
thefiddler dd16142a3a [X11] Fixed GetCursorState() after SetPosition() 
The new position is now immediately reflected in GetCursorPos().
 2014-05-13 23:50:39 +02:00
thefiddler 452d61bc60 [X11] Warn when XI2Mouse is not supported. 
Without the XI2 extension, mouse support will suffer significantly.
More specifically, low-level mouse events will not be available.
 2014-05-13 23:34:27 +02:00
thefiddler 3febb4dda0 [Input] Renamed MouseScrollWheel to MouseScroll 
This better describes the functionality of this structure.
 2014-05-13 23:25:56 +02:00
thefiddler c6dafbccba [X11] Implemented high-resolution scroll events 2014-05-13 23:23:51 +02:00
thefiddler 9255fdcdb4 [Platform] Fixed OnMouseDown/Up events for secondary buttons 2014-05-13 22:53:47 +02:00
thefiddler a30af547f9 [X11] Improved CursorVisible = false behavior 
We now use an XGrabPointer to confine the cursor to the window,
instead of the XWarpPointer hack. Fixes issue #28 and #36.
 2014-05-13 22:31:45 +02:00
thefiddler 7e3b99c636 [X11] Fixed cursor position when CursorVisible becomes true 2014-05-13 13:23:20 +02:00
thefiddler fc718026fd [X11] Fixed Cursor when CursorVisible = false 
Setting Cursor will no longer override CursorVisible.
 2014-05-13 09:27:21 +02:00
thefiddler 290cc91275 Merge branch 'nulldisplay' into develop 2014-05-12 17:01:01 +02:00
thefiddler c2bd8624b5 Merge branch 'nvidiafix' into develop 2014-05-12 17:00:42 +02:00
thefiddler 50b611ec5f Merge branch 'arrayfix' into develop 2014-05-12 17:00:16 +02:00
thefiddler bb01f35de9 [Rewrite] Removed unused conditional. 2014-05-12 16:35:48 +02:00
thefiddler c0b0990687 [OpenTK] Do not crash when no monitor connected 
NativeWindow now checks for a non-null device before attempting to
access its properties. Affects
https://github.com/mono/MonoGame/issues/2416
 2014-05-12 16:27:39 +02:00
thefiddler 4e8786f123 [X11] Correct Glx.*.SwapInterval definitions 
Improved error checking means we are no longer crashing when
SwapInterval is not available.
 2014-05-12 14:50:03 +02:00
thefiddler 88905cb6aa [X11] Fixed GLX extension loading 
GLX is now using the new extension loading mechanism,
and the entry point names now much the available slots.
 2014-05-12 13:59:48 +02:00
thefiddler 3a94d8147f [Rewrite] Fixed 2d/3d arrays on .Net 
Mono can use ldlen and ldelema on both 1d arrays (vectors) and 2d/3d
arrays. However, .Net can only use these instructions on 1d arrays -
higher rank arrays must use get_Length and Address explicitly.
 2014-05-12 13:03:27 +02:00
thefiddler bd712e4775 [X11] Flush XSendEvent on exit 2014-05-12 02:20:53 +02:00
thefiddler 1cf7386748 [X11] Fixed XI2Mouse smooth scrolling 
The scrolling valuator offsets are now calculated correctly, based on
the number of set bits in the valuator mask.
Additionally XI2Mouse now runs on a background thread, using blocking
XIfEvent. This should improve resonsiveness and reduce CPU usage, due
to reduced polling.
 2014-05-12 02:20:53 +02:00
thefiddler bba9c8c26f [X11] Improved XI2Mouse implementation 
Horizontal and vertical smooth scrolling is now supported.
Movement axes are now correctly identified. Device hotplugging
has been improved.
 2014-05-12 02:20:53 +02:00
thefiddler 2b16a641f0 [Examples] Improved Mouse.GetState output 2014-05-12 02:20:53 +02:00
thefiddler 96aaef9b37 [Mac] Implemented Mouse.GetCursorState() 2014-05-12 02:20:53 +02:00
thefiddler b89c920f32 [Examples] Test Mouse.SetPosition 2014-05-12 02:20:52 +02:00
thefiddler 7eefb3e3ff [SDL] Use h-wheel events 2014-05-12 02:20:52 +02:00
thefiddler bb8dfe4304 [Input] Improve SDL2 and Windows GetCursorState 2014-05-12 02:20:52 +02:00
thefiddler f4a3cab0e0 [Input] Added Mouse.GetCursorPos() (WIP) 2014-05-12 02:20:52 +02:00
thefiddler cd7342b688 Merge pull request #114 from thefiddler/nativewindow 
INativeWindow cleanup and consolidation
 2014-05-12 02:20:29 +02:00
thefiddler 0e48ad30d0 [Examples] Fixed Scroll.X/Y misreporting 
Scroll.X and Y are no longer swapped.
 2014-05-10 01:52:06 +02:00
thefiddler d7e0373852 [Platform] Fixed keys getting stuck on focus loss 
NativeWindowBase will now clear all keyboard keys when losing focus.
This prevents keys from getting stuck when refocusing the window.

[Win] Also fixed WindowState.Maximized when WindowBorder is Hidden and
the window is minimized.
 2014-05-09 16:45:45 +02:00
thefiddler 4556e54405 [Win] Fixed infinite recursion 2014-05-09 16:14:13 +02:00
thefiddler fb034de00d [Graphics] Made entry points internal 
Internal protected means internal *or* protected, not internal *and*
protected.
 2014-05-09 15:24:12 +02:00
thefiddler c98b4ea178 [Input] Do not hook FocusedChanged 
This is handled by NativeWindowBase now.
 2014-05-09 15:23:39 +02:00
thefiddler 8eae337d93 [Win] Cleaned up window size/pos properties 2014-05-09 15:22:33 +02:00
thefiddler f0d0f6e53a [X11] Fixed WindowBorder and WindowState setters 
After many hours of fighting with xlib, the monster is slain and
WindowBorder/WindowState changes now take effect without messing
up the window size or position on the desktop.

Phew!
 2014-05-09 13:10:23 +02:00
thefiddler ab29797079 [Platform] Raise KeyUp events on focus lost 
This ensures that no keys are stuck in pressed state when the user
switches away from the application window.
 2014-05-09 01:50:48 +02:00
thefiddler 86146f54d5 [X11] Fixed key repeat 2014-05-09 00:26:51 +02:00
thefiddler 8195800ee7 [X11] Improved vsync support 
OpenTK will now check for GLX_EXT_swap_control, GLX_MESA_swap_control
and GLX_SGI_swap_control. This allows us to control vsync on more
systems.
 2014-05-09 00:13:23 +02:00
thefiddler d430b462fe [X11] Corrected size events 2014-05-08 20:58:11 +02:00
Dave Leaver 81bf3e6f7f Correct spelling in INativeWindow 2014-05-08 10:21:27 +12:00
thefiddler bfaff0bd66 [GL] Added generic RenderbufferStorage depth-stencil formats 
According to the OpenGL 4.4 specification, RenderbufferStorage accepts
both generic and sized depth-stencil formats (DepthComponent and
DepthStencil). See sections 9.2.4, 9.2.5 and 9.4.
 2014-05-07 23:21:24 +02:00
thefiddler e3fd9e1374 [SDL] Avoid CursorVisible = true cursor jump 2014-05-06 09:36:30 +02:00
thefiddler a270b9328e [SDL] Report mouse in client coordinates 2014-05-06 09:31:35 +02:00
thefiddler 7e86d349d2 [Examples] Test MouseCursor in GameWindowStates 2014-05-06 09:12:08 +02:00
thefiddler b1f627893b [Mac] Fixed PointTo* calculations 
On HiDPI displays, the client rectangle is using a pixel-based
coordinate system, while the screen is using a point-based coordinate
system. PointToClient/PointToScreen now correctly accounts for that.
 2014-05-06 09:03:13 +02:00
thefiddler cd315a3bd6 [Platform] Forward PointToScreen to backend 2014-05-06 09:02:09 +02:00
thefiddler 637a8bee66 [Platform] More selective mouse events 
We should not raise mouse events when the cursor state hasn’t changed.
 2014-05-06 09:01:23 +02:00
thefiddler 3408523e27 [Examples] Added PointToClient test 2014-05-06 09:00:42 +02:00
thefiddler 52efa3b629 [SDL] Improved documentation of Event size hack 2014-05-05 15:11:01 +02:00
Stefanos A dffabcb94a [SDL] Fixed a stack corruption issue on win32 2014-05-05 12:46:48 +02:00
thefiddler 41276361fb [Mac] Report KeyDown/Up events for modifier flags 2014-05-05 09:14:14 +02:00
thefiddler 2e9ff4d8b9 [Examples] Print KeyboardState 2014-05-05 00:56:19 +02:00
thefiddler b53d4a6554 [Examples] Test key events for consistency 2014-05-05 00:43:58 +02:00
thefiddler 8b7d5bc7e4 [Input] Implement key repeat 2014-05-05 00:43:45 +02:00
thefiddler d968281a1b [OpenTK] Refactor keyboard and mouse handling 
A lot of duplicated code is now moved to NativeWindowBase and
LegacyInputDriver.
 2014-05-04 17:05:08 +02:00
thefiddler e155d647de [X11] Added X11KeyMap.TranslateButton() 
This code was duplicated on four different places before.
 2014-05-04 17:04:03 +02:00
thefiddler 28a1849a72 [Mac] Moved MacOSKeys to MacOS namespace 
They are used by both Carbon and Cocoa, so there is little reason to
keep them in MacOS.Carbon
 2014-05-04 17:02:37 +02:00
thefiddler 2d5afcf0e8 [Input] Update state through HandleKey* events 2014-05-04 17:02:00 +02:00
thefiddler 268e8fccde [Input] Removed pointless unsafe region 2014-05-04 17:01:34 +02:00
thefiddler 1096a8802a [Input] Removed pointless ValuePrecise setter 2014-05-04 16:58:59 +02:00
thefiddler 7af710f4dd [Input] Removed pointless MouseDevice.SetState 
MouseDevice state should only be modified through its HandleMouse*
methods, not directly.
 2014-05-04 16:58:24 +02:00
thefiddler 4b115c443b [Mac] Add horizontal scrolling 2014-05-04 15:24:02 +02:00
thefiddler 30c73e8ead [OpenTK] Raise NativeWindow.Mouse* events 2014-05-04 15:23:40 +02:00
thefiddler 9dab96c5c1 [Mac] Disable momentum scrolling and key pop-ups 
We might wish to add an option to re-enable momentum scrolling, as this
might be useful to some applications for a more native feel.
 2014-05-04 15:23:24 +02:00
thefiddler 15f5abe1e1 [Platform] Remove lambdas 2014-05-04 08:34:13 +02:00
thefiddler 1457e44309 [Examples] Hook both MouseDevice and Mouse events 
They should give identical results.
 2014-05-04 08:33:51 +02:00
thefiddler 67359a5d90 [Input] MouseDevice is now based on MouseState 
This way we have a single state representation (MouseState), shared by
all mouse APIs and events.
 2014-05-04 08:33:20 +02:00
thefiddler e093fd23f6 [Mac] Avoid calling into LegacyInputDriver 2014-05-04 08:32:26 +02:00
thefiddler ff46455e56 [X11] Removed legacy X11Input driver 
Its functionality has been moved directly into X11GLNative and
X11KeyMap.
 2014-05-04 08:32:08 +02:00
thefiddler 39eb3b1892 [Input] Improved MouseState.ToString() 2014-05-04 08:31:11 +02:00
thefiddler 94fdf1881c [Platform] Improved mouse interface 
- The complete mouse state is now available in mouse events
- Horizontal wheels are now supported
- MouseState now takes up less memory and has a simpler internal
implementation.
 2014-05-04 01:29:55 +02:00
thefiddler e85377c350 [Platform] Added support for horizontal wheel 2014-05-03 16:47:03 +02:00
thefiddler 842c0499b9 [SDL] Corrected SDL_Mouse* event structs 2014-05-02 17:39:00 +02:00
thefiddler 3e33ac9280 [Platform] Refactored INativeWindow backends 
All INativeWindow implementations are now derived from
NativeWindowBase. They no longer implement legacy IInputDriver
themselves, but rather rely on LegacyInputDriver provided by
NativeWindowBase for compatibility. They also implement the new Mouse*
events.
 2014-05-02 16:52:11 +02:00
thefiddler 674cd54c29 [Mac] Fixed initial window position 
Cocoa sets the desktop origin at the bottom-left of the main screen,
with +y going up. OpenTK is setting the origin at the top-left of the
main screen, so we need to invert the y-axis.
 2014-05-02 15:13:38 +02:00
thefiddler 3824f55f18 [Mac] Fixed cursor coords when CursorVisible=false 2014-05-02 14:21:32 +02:00
thefiddler 89fc36bde1 [Platform] Added INativeWindow.Mouse* events 2014-05-02 14:18:52 +02:00
thefiddler 612652910f [Platform] Inherit NativeWindowBase 2014-05-02 14:18:40 +02:00
thefiddler 300203f73b [Mac] Use On* methods from base class 2014-05-02 09:41:27 +02:00
thefiddler 10939fcaec [OpenTK] Add On* methods to raise events 2014-05-02 09:37:25 +02:00
thefiddler 24b19d2487 [Input] Added internal MouseDevice.Position getter 2014-05-02 09:37:25 +02:00
thefiddler f2eca2924f [Mac] Inherit from NativeWindowBase 
This reduces code duplication significantly.
 2014-05-02 09:37:25 +02:00
thefiddler 5ba1bf89f1 [OpenTK] Added NativeWindowBase 
This acts as a common base class to INativeWindow implementations and
can be used to reduce code duplication.
 2014-05-02 09:34:14 +02:00
thefiddler 495ded54d8 [Examples] Use Key.Enter to capture mouse 2014-05-01 23:56:25 +02:00
thefiddler 60f58c2ffd [Examples] Fixed cursor hotspot 2014-05-01 22:17:06 +02:00
thefiddler 9bd94c1f13 [Examples] Improved MouseCursor example 2014-05-01 17:03:47 +02:00
thefiddler 9ee728d4fc [Win] Only set MouseCursor in client area 
This is required according to the windows documentation.
 2014-05-01 16:49:23 +02:00
thefiddler 9988a2ba9c [SDL][Win] Destroy custom cursor on Close() 
X11 destroys the cursor after setting it and Cocoa uses an autorelease
pool, so that should not be necessary there.
 2014-05-01 14:27:20 +02:00
thefiddler c8c0d32fcc [OpenTK] Rearranged MouseCursor parameters 
MouseCursor and WindowIcon now match GL.TexImage2D in the way they
arrange their parameters. The expected values of each parameter are now
documented.
 2014-04-30 20:04:31 +02:00
thefiddler 8568e6dc70 [SDL] Fixed MouseCursor getting stuck after multiple changes 2014-04-30 13:46:44 +02:00
thefiddler a5ddc530c2 [SDL] Fixed custom MouseCursor 2014-04-30 13:36:16 +02:00
thefiddler bee833e712 [Example] Test custom cursor 2014-04-30 09:06:30 +02:00
thefiddler e63970e2be [Mac] Fixed cursor byte order 2014-04-30 09:06:18 +02:00
thefiddler 2632661d8a [OpenTK] Fixed compilation error 2014-04-30 08:45:27 +02:00
thefiddler 965c8baa7f [OpenTK] Renamed x/y to hotx/hoty 
The new name matches their functionality closer.
 2014-04-30 08:44:48 +02:00
thefiddler 890805f2ae [Platform] Renamed MouseCursor.Rgba to Argb 
This matches the default format of System.Drawing.Bitmap.
 2014-04-30 08:38:57 +02:00
thefiddler 7d8f14baa7 [Mac] Implement NSCursor rectangles 2014-04-30 08:38:19 +02:00
thefiddler d013ef1868 [Platform] Make MouseCursor actor public 2014-04-30 08:37:34 +02:00
thefiddler 0ed1e8b6d8 [Win] Log wglSwapIntervalEXT errors 
Note that we cannot use Marshal.GetLastWin32Error because we are not
using regular DllImports for WGL extensions.
 2014-04-29 08:48:49 +02:00
thefiddler f2dc40abdd [OpenTK] Query the driver for VSyncMode getter 
Otherwise, the user could call Context.SwapInterval directly, causing
the vsync property to fall out of sync.
 2014-04-29 08:31:47 +02:00
thefiddler 3da459b316 [All] Fixed checks for EXT_swap_control_tear 
EGL and NSOpenGL do not offer an EXT_swap_control_tear equivalent so
use regular vsync for now. The relevant extension string is now
correctly checked on WGL and GLX.
 2014-04-29 08:10:18 +02:00
thefiddler ab6b3c211c [Mac] Removed unused CarbonGLNative.cs 2014-04-28 17:17:34 +02:00
thefiddler 88a60b14c5 [Mac] Remove call to NewEventHandlerUPP 
NewEventHandlerUPP fails to load when running through MonoKickstart. It
appears that this function is only used for old PPC systems that had
trouble with function pointers - sample code online indicates that we
do not need to call this.
 2014-04-28 16:25:23 +02:00
thefiddler cf3a30d024 [Mac] CGDisplayBounds signature now matches Mac ABI 
This resolves a crash in CGDisplayBounds when running through monokick.
 2014-04-28 16:25:10 +02:00
thefiddler ffb7bd8a4c Merge branch 'pr/105' into develop 2014-04-28 16:19:17 +02:00
thefiddler 53d2c8d1e8 [Mac] Cmd-Q should raise Closing events 
It should also be cancelable.
 2014-04-28 16:19:04 +02:00
thefiddler 509f356ed4 [Win] Fixed MouseCursor.Default 
It is now possible to switch from a custom cursor back to
MouseCursor.Default.
 2014-04-28 09:37:16 +02:00
thefiddler 4f9a2f78d6 Merge branch 'cursor' of https://github.com/thefiddler/opentk into thefiddler-cursor 2014-04-28 07:07:47 +02:00
thefiddler 0f920fb205 [X11] Fixed SGI_swap_control query 
GLX can return valid function pointer to unsupported functions.
We need to check for extension support in addition to the
function pointer.

Fixes crash on OpenSUSE 13.1 in VirtualBox.
 2014-04-28 01:29:34 +02:00
thefiddler 168713aecf [GL] Added GetPName.Max*ImageUniforms 
These tokens were introduced in OpenGL 4.2 and 4.3.
 2014-04-27 22:47:04 +02:00
thefiddler c40115e223 [OpenTK] Only init X11 if SDL2 is not used 2014-04-27 22:41:24 +02:00
thefiddler 96b7419d83 [X11] Fixed INativeWindow.Cursor getter 2014-04-27 22:28:10 +02:00
thefiddler d03e9d82dc [Input] Fixed key modifiers in KeyboardDevice events 2014-04-27 22:27:18 +02:00
thefiddler d787656328 [SDL] Fixed cursor support 
SDL.CreateColorCursor takes 3 arguments, not 5.
 2014-04-27 21:09:51 +02:00
thefiddler 48e21328c5 [Mac] Implement INativeWindow.Cursor 2014-04-27 19:45:20 +02:00
thefiddler 283a785703 [OpenTK] Treat null as MouseCursor.Empty 2014-04-27 19:45:08 +02:00
thefiddler 1d8ef7165f [OpenTK] Disable custom MouseCursors 
They require further development, due to byte-order differences between
platforms.

MouseCursor is now derived from WindowIcon, which we will use for
INativeWindow.Icon support in the future, in order to remove the
dependency to System.Drawing.
 2014-04-27 19:44:45 +02:00
thefiddler 51567e610c [Examples] Set a predefined cursor on Key.Space 
Custom cursor are not enabled for OpenTK 1.1.2. They will be part of
OpenTK 1.1.3.
 2014-04-27 19:43:16 +02:00
thefiddler a61d20d2eb [Mac] Stubbed INativeWindow.Cursor 2014-04-27 10:56:08 +02:00
Fraser Waters 2207144aec Fix a bug in X11 CursorVisble with custom cursors. 
CursorVisible reset to the default cursor when showing the cursor, it
should instead show the custom cursor if it's defined (else the default
cursor).
 2014-04-27 10:53:34 +02:00
Fraser Waters 9ed32e4445 Change bool to IntPtr. 
WindowProc returns an IntPtr not a bool, so let Handle* functions return
IntPtr?. If they return a value we return that, if they return null we
call DefWindowProc and return the result from that.
 2014-04-27 10:53:34 +02:00
Fraser Waters 9239fd08e3 Custom cursors on X11. 2014-04-27 10:53:33 +02:00
Fraser Waters 6e23a55f35 Add XcursorImageLoadCursor function. 2014-04-27 10:53:33 +02:00
Fraser Waters 4f2658ab79 Make xcursor fields public. 2014-04-27 10:53:33 +02:00
Fraser Waters cb5f354ddc Change xcursor library name. 2014-04-27 10:53:33 +02:00
Fraser Waters cf43b6003c Create and Destroy functions for XcursorImage. 2014-04-27 10:53:33 +02:00
Fraser Waters 52043d5f74 Xcursor types. 2014-04-27 10:53:33 +02:00
Fraser 10112da976 Respond to WM_SETCURSOR messages. 
Calling SetCursor on mouse moves is not enough, we need to respond to
SETCURSOR messages. If we have a custom cursor we need to call SetCursor
and then NOT call DefWindowProc, otherwise we just call DefWindowProc
for the forms default cursor.
 2014-04-27 10:53:33 +02:00
Fraser 251a6e813e No need for named variable. 2014-04-27 10:53:33 +02:00
Fraser 2bb0f945f9 Copy to correct offset. 
Offset into image is y * stride, not y * bpp.
 2014-04-27 10:53:33 +02:00
Fraser Waters 5b4f75ab68 Don't hardcode cursor.png path. 2014-04-27 10:53:32 +02:00
Fraser Waters eab7e1ec0d Copy cursor.png to output. 2014-04-27 10:53:32 +02:00
Fraser 8f9311ec8d Partial implementation of Windows MouseCursor. 
Very buggy, but starting to show results.
 2014-04-27 10:53:32 +02:00
Fraser 0dd82e1485 MouseCursor example. 
Small example to show how the MouseCursor class can be used.
 2014-04-27 10:53:32 +02:00
Fraser b005b6e542 DestroyIcon function. 2014-04-27 10:53:32 +02:00
Fraser 4fb7a2d5c2 GetCursor function. 2014-04-27 10:53:32 +02:00
Fraser acf47f1ff4 SetCursor function. 2014-04-27 10:53:32 +02:00
Fraser dd75466239 GetIconInfo function. 2014-04-27 10:52:53 +02:00
Fraser f10d8568cb CreateIconIndirect function. 2014-04-27 10:52:53 +02:00
Fraser 6c65e2cdd3 IconInfo structure. 2014-04-27 10:52:53 +02:00
thefiddler dd55cea489 [All] Initial implementation of INativeWindow.Cursor property 
Affects issue #9
 2014-04-27 10:52:53 +02:00