ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-25 06:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cosmetic fixes. Removed unused code.

Browse source
This commit is contained in:
the_fiddler 2010-11-08 21:36:10 +00:00
parent 3a57aa777a
commit 9150a99252
1 changed files with 38 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
Source/OpenTK/Platform/Windows/WinGLNative.cs
View file

@ -49,9 +49,11 @@ namespace OpenTK.Platform.Windows
const ExtendedWindowStyle ParentStyleEx = ExtendedWindowStyle.WindowEdge | ExtendedWindowStyle.ApplicationWindow; const ExtendedWindowStyle ParentStyleEx = ExtendedWindowStyle.WindowEdge | ExtendedWindowStyle.ApplicationWindow;
const ExtendedWindowStyle ChildStyleEx = 0; const ExtendedWindowStyle ChildStyleEx = 0;
static readonly WinKeyMap KeyMap = new WinKeyMap();
readonly IntPtr Instance = Marshal.GetHINSTANCE(typeof(WinGLNative).Module); readonly IntPtr Instance = Marshal.GetHINSTANCE(typeof(WinGLNative).Module);
readonly IntPtr ClassName = Marshal.StringToHGlobalAuto(Guid.NewGuid().ToString()); readonly IntPtr ClassName = Marshal.StringToHGlobalAuto(Guid.NewGuid().ToString());
readonly WindowProcedure WindowProcedureDelegate; readonly WindowProcedure WindowProcedureDelegate;
readonly uint ModalLoopTimerPeriod = 1; readonly uint ModalLoopTimerPeriod = 1;
UIntPtr timer_handle; UIntPtr timer_handle;
readonly Functions.TimerProc ModalLoopCallback; readonly Functions.TimerProc ModalLoopCallback;
@ -78,16 +80,12 @@ namespace OpenTK.Platform.Windows
const ClassStyle DefaultClassStyle = ClassStyle.OwnDC; const ClassStyle DefaultClassStyle = ClassStyle.OwnDC;
readonly IntPtr DefaultWindowProcedure =
Marshal.GetFunctionPointerForDelegate(new WindowProcedure(Functions.DefWindowProc));
// Used for IInputDriver implementation // Used for IInputDriver implementation
WinMMJoystick joystick_driver = new WinMMJoystick(); WinMMJoystick joystick_driver = new WinMMJoystick();
KeyboardDevice keyboard = new KeyboardDevice(); KeyboardDevice keyboard = new KeyboardDevice();
MouseDevice mouse = new MouseDevice(); MouseDevice mouse = new MouseDevice();
IList<KeyboardDevice> keyboards = new List<KeyboardDevice>(1); IList<KeyboardDevice> keyboards = new List<KeyboardDevice>(1);
IList<MouseDevice> mice = new List<MouseDevice>(1); IList<MouseDevice> mice = new List<MouseDevice>(1);
internal static readonly WinKeyMap KeyMap = new WinKeyMap();
const long ExtendedBit = 1 << 24; // Used to distinguish left and right control, alt and enter keys. const long ExtendedBit = 1 << 24; // Used to distinguish left and right control, alt and enter keys.
static readonly uint ShiftRightScanCode = Functions.MapVirtualKey(VirtualKeys.RSHIFT, 0); // Used to distinguish left and right shift keys. static readonly uint ShiftRightScanCode = Functions.MapVirtualKey(VirtualKeys.RSHIFT, 0); // Used to distinguish left and right shift keys.
@ -95,44 +93,49 @@ namespace OpenTK.Platform.Windows
int cursor_visible_count = 0; int cursor_visible_count = 0;
static readonly object SyncRoot = new object();
#endregion #endregion
#region Contructors #region Contructors
public WinGLNative(int x, int y, int width, int height, string title, GameWindowFlags options, DisplayDevice device) public WinGLNative(int x, int y, int width, int height, string title, GameWindowFlags options, DisplayDevice device)
{ {
// This is the main window procedure callback. We need the callback in order to create the window, so lock (SyncRoot)
// don't move it below the CreateWindow calls. {
WindowProcedureDelegate = WindowProcedure; // This is the main window procedure callback. We need the callback in order to create the window, so
// don't move it below the CreateWindow calls.
WindowProcedureDelegate = WindowProcedure;
//// This timer callback is called periodically when the window enters a sizing / moving modal loop. //// This timer callback is called periodically when the window enters a sizing / moving modal loop.
//ModalLoopCallback = delegate(IntPtr handle, WindowMessage msg, UIntPtr eventId, int time) //ModalLoopCallback = delegate(IntPtr handle, WindowMessage msg, UIntPtr eventId, int time)
//{ //{
// // Todo: find a way to notify the frontend that it should process queued up UpdateFrame/RenderFrame events. // // Todo: find a way to notify the frontend that it should process queued up UpdateFrame/RenderFrame events.
// if (Move != null) // if (Move != null)
// Move(this, EventArgs.Empty); // Move(this, EventArgs.Empty);
//}; //};
// To avoid issues with Ati drivers on Windows 6+ with compositing enabled, the context will not be // To avoid issues with Ati drivers on Windows 6+ with compositing enabled, the context will not be
// bound to the top-level window, but rather to a child window docked in the parent. // bound to the top-level window, but rather to a child window docked in the parent.
window = new WinWindowInfo( window = new WinWindowInfo(
CreateWindow(x, y, width, height, title, options, device, IntPtr.Zero), null); CreateWindow(x, y, width, height, title, options, device, IntPtr.Zero), null);
child_window = new WinWindowInfo( child_window = new WinWindowInfo(
CreateWindow(0, 0, ClientSize.Width, ClientSize.Height, title, options, device, window.WindowHandle), window); CreateWindow(0, 0, ClientSize.Width, ClientSize.Height, title, options, device, window.WindowHandle), window);
exists = true; exists = true;
keyboard.Description = "Standard Windows keyboard"; keyboard.Description = "Standard Windows keyboard";
keyboard.NumberOfFunctionKeys = 12; keyboard.NumberOfFunctionKeys = 12;
keyboard.NumberOfKeys = 101; keyboard.NumberOfKeys = 101;
keyboard.NumberOfLeds = 3; keyboard.NumberOfLeds = 3;
mouse.Description = "Standard Windows mouse"; mouse.Description = "Standard Windows mouse";
mouse.NumberOfButtons = 3; mouse.NumberOfButtons = 3;
mouse.NumberOfWheels = 1; mouse.NumberOfWheels = 1;
keyboards.Add(keyboard); keyboards.Add(keyboard);
mice.Add(mouse); mice.Add(mouse);
}
} }
#endregion #endregion
@ -405,14 +408,14 @@ namespace OpenTK.Platform.Windows
return IntPtr.Zero; return IntPtr.Zero;
default: default:
if (!WMInput.KeyMap.ContainsKey((VirtualKeys)wParam)) if (!KeyMap.ContainsKey((VirtualKeys)wParam))
{ {
Debug.Print("Virtual key {0} ({1}) not mapped.", (VirtualKeys)wParam, (long)lParam); Debug.Print("Virtual key {0} ({1}) not mapped.", (VirtualKeys)wParam, (long)lParam);
break; break;
} }
else else
{ {
keyboard[WMInput.KeyMap[(VirtualKeys)wParam]] = pressed; keyboard[KeyMap[(VirtualKeys)wParam]] = pressed;
} }
return IntPtr.Zero; return IntPtr.Zero;
} }
@ -644,7 +647,7 @@ namespace OpenTK.Platform.Windows
Marshal.GetLastWin32Error())); Marshal.GetLastWin32Error()));
} }
static void UngrabCursor() void UngrabCursor()
{ {
if (!Functions.ClipCursor(IntPtr.Zero)) if (!Functions.ClipCursor(IntPtr.Zero))
Debug.WriteLine(String.Format("Failed to ungrab cursor. Error: {0}", Debug.WriteLine(String.Format("Failed to ungrab cursor. Error: {0}",
@ -1117,31 +1120,20 @@ namespace OpenTK.Platform.Windows
#region Events #region Events
public event EventHandler<EventArgs> Move = delegate { }; public event EventHandler<EventArgs> Move = delegate { };
public event EventHandler<EventArgs> Resize = delegate { }; public event EventHandler<EventArgs> Resize = delegate { };
public event EventHandler<System.ComponentModel.CancelEventArgs> Closing = delegate { }; public event EventHandler<System.ComponentModel.CancelEventArgs> Closing = delegate { };
public event EventHandler<EventArgs> Closed = delegate { }; public event EventHandler<EventArgs> Closed = delegate { };
public event EventHandler<EventArgs> Disposed = delegate { }; public event EventHandler<EventArgs> Disposed = delegate { };
public event EventHandler<EventArgs> IconChanged = delegate { }; public event EventHandler<EventArgs> IconChanged = delegate { };
public event EventHandler<EventArgs> TitleChanged = delegate { }; public event EventHandler<EventArgs> TitleChanged = delegate { };
public event EventHandler<EventArgs> VisibleChanged = delegate { }; public event EventHandler<EventArgs> VisibleChanged = delegate { };
public event EventHandler<EventArgs> FocusedChanged = delegate { }; public event EventHandler<EventArgs> FocusedChanged = delegate { };
public event EventHandler<EventArgs> WindowBorderChanged = delegate { }; public event EventHandler<EventArgs> WindowBorderChanged = delegate { };
public event EventHandler<EventArgs> WindowStateChanged = delegate { }; public event EventHandler<EventArgs> WindowStateChanged = delegate { };
public event EventHandler<OpenTK.Input.KeyboardKeyEventArgs> KeyDown = delegate { };
public event EventHandler<KeyPressEventArgs> KeyPress = delegate { }; public event EventHandler<KeyPressEventArgs> KeyPress = delegate { };
public event EventHandler<OpenTK.Input.KeyboardKeyEventArgs> KeyUp = delegate { };
public event EventHandler<EventArgs> MouseEnter = delegate { }; public event EventHandler<EventArgs> MouseEnter = delegate { };
public event EventHandler<EventArgs> MouseLeave = delegate { }; public event EventHandler<EventArgs> MouseLeave = delegate { };
#endregion #endregion