ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-23 13:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to use the new MouseDevice interface.

Browse source
This commit is contained in:
the_fiddler 2009-02-20 18:03:05 +00:00
parent e44c93bae5
commit a1a2de03c9
2 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Examples/Tests/InputLogger.Designer.cs generated
View file

@ -329,14 +329,19 @@
// //
// MouseButtonsBox // MouseButtonsBox
// //
this.MouseButtonsBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.MouseButtonsBox.FormattingEnabled = true; this.MouseButtonsBox.FormattingEnabled = true;
this.MouseButtonsBox.Location = new System.Drawing.Point(256, 44); this.MouseButtonsBox.Location = new System.Drawing.Point(190, 44);
this.MouseButtonsBox.Name = "MouseButtonsBox"; this.MouseButtonsBox.Name = "MouseButtonsBox";
this.MouseButtonsBox.Size = new System.Drawing.Size(160, 134); this.MouseButtonsBox.Size = new System.Drawing.Size(226, 303);
this.MouseButtonsBox.TabIndex = 1; this.MouseButtonsBox.TabIndex = 1;
// //
// ChooseMouse // ChooseMouse
// //
this.ChooseMouse.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ChooseMouse.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ChooseMouse.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.ChooseMouse.FormattingEnabled = true; this.ChooseMouse.FormattingEnabled = true;
this.ChooseMouse.Location = new System.Drawing.Point(7, 7); this.ChooseMouse.Location = new System.Drawing.Point(7, 7);
@ -365,7 +370,6 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(432, 378); this.ClientSize = new System.Drawing.Size(432, 378);
this.Controls.Add(this.tabControl); this.Controls.Add(this.tabControl);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Name = "InputLogger"; this.Name = "InputLogger";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "S04: Input Logger"; this.Text = "S04: Input Logger";

68
Source/Examples/Tests/InputLogger.cs
View file

@ -84,14 +84,13 @@ namespace Examples.Tests
ChooseMouse.Items.Add(String.Format("Mouse {0} ({1})", 0, hidden.Mouse.Description)); ChooseMouse.Items.Add(String.Format("Mouse {0} ({1})", 0, hidden.Mouse.Description));
ChooseMouse.SelectedIndex = 0; ChooseMouse.SelectedIndex = 0;
//hidden.Mouse.Move += LogMouseMove; hidden.Mouse.Move += LogMouseMove;
hidden.Mouse.WheelChanged += LogMouseWheelChanged;
hidden.Mouse.ButtonDown += LogMouseButtonDown; hidden.Mouse.ButtonDown += LogMouseButtonDown;
hidden.Mouse.ButtonUp += LogMouseButtonUp; hidden.Mouse.ButtonUp += LogMouseButtonUp;
hidden.Keyboard.KeyDown += LogKeyDown; hidden.Keyboard.KeyDown += LogKeyDown;
hidden.Keyboard.KeyUp += LogKeyUp; hidden.Keyboard.KeyUp += LogKeyUp;
hidden.UpdateFrame += hidden_UpdateFrame;
} }
protected override void OnClosing(CancelEventArgs e) protected override void OnClosing(CancelEventArgs e)
@ -106,41 +105,39 @@ namespace Examples.Tests
e.Cancel = false; e.Cancel = false;
} }
delegate void ControlLogMouseKey(GameWindow input_window, InputLogger control, MouseDevice sender, MouseButton button); delegate void ControlLogMouseKey(GameWindow input_window, InputLogger control, object sender, MouseButtonEventArgs e);
ControlLogMouseKey ControlLogMouseKeyDown = ControlLogMouseKey ControlLogMouseKeyDown =
delegate(GameWindow input_window, InputLogger control, MouseDevice sender, MouseButton button) delegate(GameWindow input_window, InputLogger control, object sender, MouseButtonEventArgs e)
{ {
if (sender.DeviceID == input_window.Mouse.DeviceID) if ((sender as MouseDevice).DeviceID == input_window.Mouse.DeviceID)
{ {
control.MouseButtonsBox.Items.Add(button); control.MouseButtonsBox.Items.Add(e.Button);
System.Diagnostics.Debug.Print("Button down: {0}", button); System.Diagnostics.Debug.Print("Button down: {0}", e.Button);
} }
}; };
ControlLogMouseKey ControlLogMouseKeyUp = ControlLogMouseKey ControlLogMouseKeyUp =
delegate(GameWindow input_window, InputLogger control, MouseDevice sender, MouseButton button) delegate(GameWindow input_window, InputLogger control, object sender, MouseButtonEventArgs e)
{ {
if (sender.DeviceID == input_window.Mouse.DeviceID) if ((sender as MouseDevice).DeviceID == input_window.Mouse.DeviceID)
{ {
control.MouseButtonsBox.Items.Remove(button); control.MouseButtonsBox.Items.Remove(e.Button);
System.Diagnostics.Debug.Print("Button up: {0}", button); System.Diagnostics.Debug.Print("Button up: {0}", e.Button);
} }
}; };
delegate void ControlLogMousePosition(GameWindow input_window, InputLogger control); delegate void ControlLogMouseMove(GameWindow input_window, InputLogger control, object sender, MouseMoveEventArgs e);
ControlLogMousePosition ControlLogMousePositionChanges = ControlLogMouseMove ControlLogMouseMoveChanges =
delegate(GameWindow input_window, InputLogger control) delegate(GameWindow input_window, InputLogger control, object sender, MouseMoveEventArgs e)
{ {
// Update mouse coordinates. control.MouseXText.Text = e.X.ToString();
control.MouseXText.Text = input_window.Mouse.X.ToString(); control.MouseYText.Text = e.Y.ToString();
control.MouseYText.Text = input_window.Mouse.Y.ToString(); };
control.MouseDXText.Text = input_window.Mouse.XDelta.ToString();
control.MouseDYText.Text = input_window.Mouse.YDelta.ToString(); delegate void ControlLogMouseWheel(GameWindow input_window, InputLogger control, object sender, MouseWheelEventArgs e);
control.MouseWheelText.Text = input_window.Mouse.Wheel.ToString(); ControlLogMouseWheel ControlLogMouseWheelChanges =
//System.Drawing.Point p = input_window.PointToClient(input_window.Mouse.Position); delegate(GameWindow input_window, InputLogger control, object sender, MouseWheelEventArgs e)
//System.Drawing.Point p = control.PointToClient(input_window.Mouse.Position); {
//control.MouseXWindow.Text = p.X.ToString(); control.MouseWheelText.Text = e.Value.ToString();
//control.MouseYWindow.Text = p.Y.ToString();
control.MouseWheelDelta.Text = input_window.Mouse.WheelDelta.ToString();
}; };
delegate void ControlLogKeyboard(GameWindow input_window, InputLogger control, OpenTK.Input.KeyboardDevice sender, Key key); delegate void ControlLogKeyboard(GameWindow input_window, InputLogger control, OpenTK.Input.KeyboardDevice sender, Key key);
@ -155,25 +152,24 @@ namespace Examples.Tests
control.keyboardListBoxes[sender.DeviceID].Items.Remove(key); control.keyboardListBoxes[sender.DeviceID].Items.Remove(key);
}; };
void hidden_UpdateFrame(object sender, UpdateFrameEventArgs e) void LogMouseMove(object sender, MouseMoveEventArgs e)
{ {
this.BeginInvoke(ControlLogMousePositionChanges, hidden, this); this.BeginInvoke(ControlLogMouseMoveChanges, hidden, this, e);
//Thread.Sleep(0);
} }
void LogMouseMove(MouseDevice sender, EventArgs e) void LogMouseWheelChanged(object sender, MouseWheelEventArgs e)
{ {
//this.BeginInvoke(ControlLogMousePositionChanges, hidden, this); this.BeginInvoke(ControlLogMouseWheelChanges, hidden, this, e);
} }
void LogMouseButtonDown(MouseDevice sender, MouseButton button) void LogMouseButtonDown(object sender, MouseButtonEventArgs e)
{ {
this.BeginInvoke(ControlLogMouseKeyDown, hidden, this, sender, button); this.BeginInvoke(ControlLogMouseKeyDown, hidden, this, sender, e);
} }
void LogMouseButtonUp(MouseDevice sender, MouseButton button) void LogMouseButtonUp(object sender, MouseButtonEventArgs e)
{ {
this.BeginInvoke(ControlLogMouseKeyUp, hidden, this, sender, button); this.BeginInvoke(ControlLogMouseKeyUp, hidden, this, sender, e);
} }
void LogKeyDown(KeyboardDevice sender, Key key) void LogKeyDown(KeyboardDevice sender, Key key)