ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-08-04 02:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[X11] Removed IJoystickDriver from X11Joystick

Browse source 
Legacy IJoystickDriver support is now implemented through a
LegacyJoystickDriver instance.
This commit is contained in:
Stefanos A. 2014-01-14 18:36:19 +01:00
parent f3036e5f10
commit 4203c14b22
1 changed files with 1 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Source/OpenTK/Platform/X11/X11Input.cs
View file

@ -24,8 +24,6 @@ namespace OpenTK.Platform.X11
/// </summary> /// </summary>
internal sealed class X11Input : IInputDriver internal sealed class X11Input : IInputDriver
{ {
X11Joystick joystick_driver = new X11Joystick();
//X11WindowInfo window;
KeyboardDevice keyboard = new KeyboardDevice(); KeyboardDevice keyboard = new KeyboardDevice();
MouseDevice mouse = new MouseDevice(); MouseDevice mouse = new MouseDevice();
List<KeyboardDevice> dummy_keyboard_list = new List<KeyboardDevice>(1); List<KeyboardDevice> dummy_keyboard_list = new List<KeyboardDevice>(1);
@ -96,57 +94,6 @@ namespace OpenTK.Platform.X11
#endregion #endregion
#region private void InternalPoll()
#if false
private void InternalPoll()
{
X11.XEvent e = new XEvent();
try
{
while (!disposed)
{
Functions.XMaskEvent(window.Display,
EventMask.PointerMotionMask | EventMask.PointerMotionHintMask |
EventMask.ButtonPressMask | EventMask.ButtonReleaseMask |
EventMask.KeyPressMask | EventMask.KeyReleaseMask |
EventMask.StructureNotifyMask, ref e);
if (disposed)
return;
switch (e.type)
{
case XEventName.KeyPress:
case XEventName.KeyRelease:
keyboardDriver.ProcessKeyboardEvent(ref e.KeyEvent);
break;
case XEventName.ButtonPress:
case XEventName.ButtonRelease:
mouseDriver.ProcessButton(ref e.ButtonEvent);
break;
case XEventName.MotionNotify:
mouseDriver.ProcessMotion(ref e.MotionEvent);
break;
case XEventName.DestroyNotify:
Functions.XPutBackEvent(window.Display, ref e);
Functions.XAutoRepeatOn(window.Display);
return;
}
}
}
catch (ThreadAbortException expt)
{
Functions.XUnmapWindow(window.Display, window.Handle);
Functions.XDestroyWindow(window.Display, window.Handle);
return;
}
}
#endif
#endregion
#region TranslateKey #region TranslateKey
internal bool TranslateKey(ref XKeyEvent e, out Key key) internal bool TranslateKey(ref XKeyEvent e, out Key key)
@ -242,11 +189,9 @@ namespace OpenTK.Platform.X11
#endregion #endregion
#region public IList<JoystickDevice> Joysticks
public IList<JoystickDevice> Joysticks public IList<JoystickDevice> Joysticks
{ {
get { return joystick_driver.Joysticks; } get { throw new NotImplementedException(); }
} }
#endregion #endregion
@ -258,13 +203,10 @@ namespace OpenTK.Platform.X11
/// </summary> /// </summary>
public void Poll() public void Poll()
{ {
joystick_driver.Poll();
} }
#endregion #endregion
#endregion
#region --- IDisposable Members --- #region --- IDisposable Members ---
public void Dispose() public void Dispose()