ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-22 15:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed Move event from IMouse (too inefficient). Polled input only.

Browse source 
S04 now polls for the mouse position.
Keyboard now handles events generated from code and not from physical devices.
This commit is contained in:
the_fiddler 2007-09-21 22:49:42 +00:00
parent 21d6030a6a
commit 52a6690150
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/Examples/Tests/S04_Input_Logger.cs
View file

@ -21,6 +21,17 @@ namespace Examples.Tests
public S04_Input_Logger() public S04_Input_Logger()
{ {
InitializeComponent(); InitializeComponent();
Application.Idle += new EventHandler(Application_Idle);
}
void Application_Idle(object sender, EventArgs e)
{
// Update mouse coordinates.
textBox1.Text = driver.Mouse[ChooseMouse.SelectedIndex].X.ToString();
textBox2.Text = driver.Mouse[ChooseMouse.SelectedIndex].Y.ToString();
textBox3.Text = driver.Mouse[ChooseMouse.SelectedIndex].DeltaX.ToString();
textBox4.Text = driver.Mouse[ChooseMouse.SelectedIndex].DeltaY.ToString();
} }
protected override void OnLoad(EventArgs e) protected override void OnLoad(EventArgs e)
@ -76,7 +87,6 @@ namespace Examples.Tests
ChooseMouse.Items.Add(String.Format("Mouse {0} ({1})", ++i, m.Description)); ChooseMouse.Items.Add(String.Format("Mouse {0} ({1})", ++i, m.Description));
m.ButtonDown += LogMouseButtonDown; m.ButtonDown += LogMouseButtonDown;
m.ButtonUp += LogMouseButtonUp; m.ButtonUp += LogMouseButtonUp;
//m.Move += LogMouseMove;
} }
if (i > 0) if (i > 0)
{ {
@ -102,11 +112,6 @@ namespace Examples.Tests
MouseButtons.Items.Remove(button); MouseButtons.Items.Remove(button);
} }
void LogMouseMove(IMouse sender, MouseMoveData key)
{
throw new Exception("The method or operation is not implemented.");
}
void LogKeyDown(object sender, Key key) void LogKeyDown(object sender, Key key)
{ {
Debug.Print("Key down: {0} on device: {1}", key, (sender as Keyboard).DeviceID); Debug.Print("Key down: {0} on device: {1}", key, (sender as Keyboard).DeviceID);

2
Source/OpenTK/Input/IMouse.cs
View file

@ -21,7 +21,7 @@ namespace OpenTK.Input
int DeltaX { get; } int DeltaX { get; }
int DeltaY { get; } int DeltaY { get; }
event MouseMoveEvent Move; //event MouseMoveEvent Move;
event MouseButtonDownEvent ButtonDown; event MouseButtonDownEvent ButtonDown;
event MouseButtonUpEvent ButtonUp; event MouseButtonUpEvent ButtonUp;
} }

6
Source/OpenTK/Platform/Windows/WinRawKeyboard.cs
View file

@ -279,10 +279,16 @@ namespace OpenTK.Platform.Windows
bool pressed = bool pressed =
rin.Data.Keyboard.Message == (int)WindowMessage.KEYDOWN || rin.Data.Keyboard.Message == (int)WindowMessage.KEYDOWN ||
rin.Data.Keyboard.Message == (int)WindowMessage.SYSKEYDOWN; rin.Data.Keyboard.Message == (int)WindowMessage.SYSKEYDOWN;
// Find the device where the button was pressed. It can be that the input notification
// came not from a physical keyboard device but from a code-generated input message - in
// that case, the event goes to the default (first) keyboard.
// TODO: Send the event to all keyboards instead of the default one.
int index = keyboards.FindIndex(delegate(Keyboard kb) int index = keyboards.FindIndex(delegate(Keyboard kb)
{ {
return kb.DeviceID == rin.Header.Device; return kb.DeviceID == rin.Header.Device;
}); });
if (index == -1) index = 0;
// Generic control, shift, alt keys may be sent instead of left/right. // Generic control, shift, alt keys may be sent instead of left/right.
// It seems you have to explicitly register left/right events. // It seems you have to explicitly register left/right events.