Reverted to wait for messages.
This commit is contained in:
the_fiddler
parent
e695429db1
commit
1f037d077c
1 changed files with 104 additions and 105 deletions
|
|
@ -1,28 +1,28 @@
|
|||
#region License
|
||||
//
|
||||
// The Open Toolkit Library License
|
||||
//
|
||||
// Copyright (c) 2006 - 2010 the Open Toolkit library.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights to
|
||||
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
// the Software, and to permit persons to whom the Software is furnished to do
|
||||
// so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in all
|
||||
// copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
#region License
|
||||
//
|
||||
// The Open Toolkit Library License
|
||||
//
|
||||
// Copyright (c) 2006 - 2010 the Open Toolkit library.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights to
|
||||
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
// the Software, and to permit persons to whom the Software is furnished to do
|
||||
// so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in all
|
||||
// copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
|
|
@ -44,51 +44,51 @@ namespace OpenTK.Platform.Windows
|
|||
IntPtr OldWndProc;
|
||||
INativeWindow native;
|
||||
|
||||
protected INativeWindow Native { get { return native; } private set { native = value; } }
|
||||
protected WinWindowInfo Parent { get { return (WinWindowInfo)Native.WindowInfo; } }
|
||||
|
||||
protected INativeWindow Native { get { return native; } private set { native = value; } }
|
||||
protected WinWindowInfo Parent { get { return (WinWindowInfo)Native.WindowInfo; } }
|
||||
|
||||
static readonly IntPtr Unhandled = new IntPtr(-1);
|
||||
|
||||
#endregion
|
||||
|
||||
#region Constructors
|
||||
|
||||
public WinInputBase()
|
||||
public WinInputBase()
|
||||
{
|
||||
WndProc = WindowProcedure;
|
||||
|
||||
InputThread = new Thread(ProcessEvents);
|
||||
InputThread.IsBackground = true;
|
||||
WndProc = WindowProcedure;
|
||||
|
||||
InputThread = new Thread(ProcessEvents);
|
||||
InputThread.IsBackground = true;
|
||||
InputThread.Start();
|
||||
|
||||
InputReady.WaitOne();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Private Members
|
||||
|
||||
#region ConstructMessageWindow
|
||||
|
||||
INativeWindow ConstructMessageWindow()
|
||||
{
|
||||
Debug.WriteLine("Initializing input driver.");
|
||||
Debug.Indent();
|
||||
|
||||
// Create a new message-only window to retrieve WM_INPUT messages.
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Private Members
|
||||
|
||||
#region ConstructMessageWindow
|
||||
|
||||
INativeWindow ConstructMessageWindow()
|
||||
{
|
||||
Debug.WriteLine("Initializing input driver.");
|
||||
Debug.Indent();
|
||||
|
||||
// Create a new message-only window to retrieve WM_INPUT messages.
|
||||
INativeWindow native = new NativeWindow();
|
||||
native.ProcessEvents();
|
||||
WinWindowInfo parent = native.WindowInfo as WinWindowInfo;
|
||||
Functions.SetParent(parent.WindowHandle, Constants.MESSAGE_ONLY);
|
||||
native.ProcessEvents();
|
||||
|
||||
native.ProcessEvents();
|
||||
|
||||
Debug.Unindent();
|
||||
return native;
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
return native;
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#region ProcessEvents
|
||||
|
||||
void ProcessEvents()
|
||||
|
|
@ -105,20 +105,19 @@ namespace OpenTK.Platform.Windows
|
|||
MSG msg = new MSG();
|
||||
while (Native.Exists)
|
||||
{
|
||||
Native.ProcessEvents();
|
||||
//int ret = Functions.GetMessage(ref msg, Parent.WindowHandle, 0, 0);
|
||||
//if (ret == -1)
|
||||
//{
|
||||
// throw new PlatformException(String.Format(
|
||||
// "An error happened while processing the message queue. Windows error: {0}",
|
||||
// Marshal.GetLastWin32Error()));
|
||||
//}
|
||||
int ret = Functions.GetMessage(ref msg, Parent.WindowHandle, 0, 0);
|
||||
if (ret == -1)
|
||||
{
|
||||
throw new PlatformException(String.Format(
|
||||
"An error happened while processing the message queue. Windows error: {0}",
|
||||
Marshal.GetLastWin32Error()));
|
||||
}
|
||||
|
||||
//Functions.TranslateMessage(ref msg);
|
||||
//Functions.DispatchMessage(ref msg);
|
||||
Functions.TranslateMessage(ref msg);
|
||||
Functions.DispatchMessage(ref msg);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region WndProcHandler
|
||||
|
|
@ -160,45 +159,45 @@ namespace OpenTK.Platform.Windows
|
|||
|
||||
#region IInputDriver2 Members
|
||||
|
||||
public abstract IMouseDriver2 MouseDriver { get; }
|
||||
public abstract IMouseDriver2 MouseDriver { get; }
|
||||
public abstract IKeyboardDriver2 KeyboardDriver { get; }
|
||||
public abstract IGamePadDriver GamePadDriver { get; }
|
||||
|
||||
#endregion
|
||||
|
||||
#region IDisposable Members
|
||||
|
||||
protected bool Disposed;
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
|
||||
protected virtual void Dispose(bool manual)
|
||||
{
|
||||
if (!Disposed)
|
||||
{
|
||||
if (manual)
|
||||
{
|
||||
if (Native != null)
|
||||
{
|
||||
Native.Close();
|
||||
Native.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
Disposed = true;
|
||||
}
|
||||
}
|
||||
|
||||
~WinInputBase()
|
||||
{
|
||||
Debug.Print("[Warning] Resource leaked: {0}.", this);
|
||||
Dispose(false);
|
||||
}
|
||||
|
||||
public abstract IGamePadDriver GamePadDriver { get; }
|
||||
|
||||
#endregion
|
||||
|
||||
#region IDisposable Members
|
||||
|
||||
protected bool Disposed;
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
|
||||
protected virtual void Dispose(bool manual)
|
||||
{
|
||||
if (!Disposed)
|
||||
{
|
||||
if (manual)
|
||||
{
|
||||
if (Native != null)
|
||||
{
|
||||
Native.Close();
|
||||
Native.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
Disposed = true;
|
||||
}
|
||||
}
|
||||
|
||||
~WinInputBase()
|
||||
{
|
||||
Debug.Print("[Warning] Resource leaked: {0}.", this);
|
||||
Dispose(false);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue