Added KeyboardKeyEventArgs.

Modified KeyboardDevice.KeyDown/KeyUp to follow the class library design guidelines.
Modified samples to use the new KeyDown/KeyUp event signatures.

Source/Examples/OpenGL/1.1/VertexArrays.cs

@@ -38,13 +38,13 @@ namespace Examples.Tutorial
             : base(800, 600)
         {
             //this.VSync = VSyncMode.On;
-            this.Keyboard.KeyUp += new KeyUpEvent(Keyboard_KeyUp);
+            this.Keyboard.KeyUp += Keyboard_KeyUp;
         }
 
-        void Keyboard_KeyUp(KeyboardDevice sender, Key key)
+        void Keyboard_KeyUp(object sender, KeyboardKeyEventArgs e)
         {
             // F4 cycles between available VSync modes.
-            if (key == Key.F4)
+            if (e.Key == Key.F4)
             {
                 if (this.VSync == VSyncMode.Off)
                     this.VSync = VSyncMode.On;

Source/Examples/OpenGL/EXT/GeometryShaderAdvanced.cs

@@ -69,10 +69,11 @@ namespace Examples.Tutorial
         public SimpleGeometryShader2()
             : base(800, 600)
         {
-            Keyboard.KeyDown += new KeyDownEvent(Keyboard_KeyDown);
+            Keyboard.KeyDown += Keyboard_KeyDown;
         }
 
-        enum ViewMode {
+        enum ViewMode
+        {
             CubemapCross,
             Scene,
         }
@@ -110,8 +111,10 @@ namespace Examples.Tutorial
 
         #region keyboard handler
 
-        void Keyboard_KeyDown(KeyboardDevice sender, Key key) {
+        void Keyboard_KeyDown(object sender, KeyboardKeyEventArgs e)
-            switch (key) {
+        {
+            switch (e.Key)
+            {
                 case Key.F1:
                     switchToMode(ViewMode.CubemapCross);
                     break;
@@ -139,7 +142,8 @@ namespace Examples.Tutorial
 
         #region init methods
 
-        void initShaderProgramBox() {
+        void initShaderProgramBox()
+        {
             // create a program object.
             shaderProgramBox = GL.CreateProgram();
             // create shader objects.
@@ -192,7 +196,8 @@ namespace Examples.Tutorial
                 GL.DeleteShader(vert);
         }
 
-        void initShaderProgramSphere() {
+        void initShaderProgramSphere()
+        {
             // create a program object.
             shaderProgramSphere = GL.CreateProgram();
             // create shader objects.
@@ -245,7 +250,8 @@ namespace Examples.Tutorial
                 GL.DeleteShader(vert);
         }
 
-        void initShaderProgramCubemap() {
+        void initShaderProgramCubemap()
+        {
             // create a program object.
             shaderProgramCubemap = GL.CreateProgram();
             // create shader objects.
@@ -393,7 +399,8 @@ namespace Examples.Tutorial
         /// </summary>
         /// <param name="shader">A shader object, gotten from GL.CreateShader.</param>
         /// <param name="source">The GLSL source to compile.</param>
-        void compileShader(int shader, string source) {
+        void compileShader(int shader, string source)
+        {
             GL.ShaderSource(shader, source);
             GL.CompileShader(shader);
 
@@ -403,13 +410,15 @@ namespace Examples.Tutorial
 
             int compileResult;
             GL.GetShader(shader, ShaderParameter.CompileStatus, out compileResult);
-            if (compileResult != 1) {
+            if (compileResult != 1)
+            {
                 Debug.WriteLine("Compile Error!");
                 Debug.WriteLine(source);
             }
         }
 
-        void initTextureCube() {
+        void initTextureCube()
+        {
             textureCubeColor = GL.GenTexture();
             GL.BindTexture(TextureTarget.TextureCubeMap, textureCubeColor);
             GL.TexParameter(TextureTarget.TextureCubeMap, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
@@ -424,7 +433,8 @@ namespace Examples.Tutorial
                 TextureTarget.TextureCubeMapNegativeY,
                 TextureTarget.TextureCubeMapPositiveZ,
                 TextureTarget.TextureCubeMapNegativeZ,
-            }) {
+            })
+            {
                 GL.TexImage2D(target, 0, PixelInternalFormat.Rgba8, 512, 512, 0, PixelFormat.Rgba, PixelType.UnsignedByte, IntPtr.Zero);
             }
 
@@ -458,53 +468,65 @@ namespace Examples.Tutorial
 
             #region Test for Error
             FramebufferErrorCode e = GL.Ext.CheckFramebufferStatus(FramebufferTarget.FramebufferExt);
-            switch (e) {
+            switch (e)
-                case FramebufferErrorCode.FramebufferCompleteExt: {
+            {
+                case FramebufferErrorCode.FramebufferCompleteExt:
+                    {
                         Console.WriteLine("FBO: The framebuffer is complete and valid for rendering.");
                         break;
                     }
-                case FramebufferErrorCode.FramebufferIncompleteAttachmentExt: {
+                case FramebufferErrorCode.FramebufferIncompleteAttachmentExt:
+                    {
                         Console.WriteLine("FBO: One or more attachment points are not framebuffer attachment complete. This could mean there’s no texture attached or the format isn’t renderable. For color textures this means the base format must be RGB or RGBA and for depth textures it must be a DEPTH_COMPONENT format. Other causes of this error are that the width or height is zero or the z-offset is out of range in case of render to volume.");
                         break;
                     }
-                case FramebufferErrorCode.FramebufferIncompleteMissingAttachmentExt: {
+                case FramebufferErrorCode.FramebufferIncompleteMissingAttachmentExt:
+                    {
                         Console.WriteLine("FBO: There are no attachments.");
                         break;
                     }
-/*               case  FramebufferErrorCode.GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT: 
+                /*               case  FramebufferErrorCode.GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT: 
                                      {
                                          Console.WriteLine("FBO: An object has been attached to more than one attachment point.");
                                          break;
                                      }*/
-                case FramebufferErrorCode.FramebufferIncompleteDimensionsExt: {
+                case FramebufferErrorCode.FramebufferIncompleteDimensionsExt:
+                    {
                         Console.WriteLine("FBO: Attachments are of different size. All attachments must have the same width and height.");
                         break;
                     }
-                case FramebufferErrorCode.FramebufferIncompleteFormatsExt: {
+                case FramebufferErrorCode.FramebufferIncompleteFormatsExt:
+                    {
                         Console.WriteLine("FBO: The color attachments have different format. All color attachments must have the same format.");
                         break;
                     }
-                case FramebufferErrorCode.FramebufferIncompleteDrawBufferExt: {
+                case FramebufferErrorCode.FramebufferIncompleteDrawBufferExt:
+                    {
                         Console.WriteLine("FBO: An attachment point referenced by GL.DrawBuffers() doesn’t have an attachment.");
                         break;
                     }
-                case FramebufferErrorCode.FramebufferIncompleteReadBufferExt: {
+                case FramebufferErrorCode.FramebufferIncompleteReadBufferExt:
+                    {
                         Console.WriteLine("FBO: The attachment point referenced by GL.ReadBuffers() doesn’t have an attachment.");
                         break;
                     }
-                case FramebufferErrorCode.FramebufferUnsupportedExt: {
+                case FramebufferErrorCode.FramebufferUnsupportedExt:
+                    {
                         Console.WriteLine("FBO: This particular FBO configuration is not supported by the implementation.");
                         break;
                     }
-                case (FramebufferErrorCode)All.FramebufferIncompleteLayerTargetsExt: {
+                case (FramebufferErrorCode)All.FramebufferIncompleteLayerTargetsExt:
+                    {
                         Console.WriteLine("FBO: Framebuffer Incomplete Layer Targets.");
                         break;
                     }
-                case (FramebufferErrorCode)All.FramebufferIncompleteLayerCountExt: {
+                case (FramebufferErrorCode)All.FramebufferIncompleteLayerCountExt:
+                    {
                         Console.WriteLine("FBO: Framebuffer Incomplete Layer Count.");
                         break;
                     }
-                default: {
+                default:
+                    {
                         Console.WriteLine("FBO: Status unknown. (yes, this is really bad.)");
                         break;
                     }
@@ -528,7 +550,8 @@ namespace Examples.Tutorial
             GL.Ext.BindFramebuffer(FramebufferTarget.FramebufferExt, 0); // disable rendering into the FBO
         }
 
-        void initVBOCube() {
+        void initVBOCube()
+        {
             GL.GenBuffers(1, out vboCube);
             // vertex 3 floats
             // normal 3 floats
@@ -540,7 +563,8 @@ namespace Examples.Tutorial
             GL.BindBuffer(BufferTarget.ArrayBuffer, 0);
         }
 
-        void initVBOSpere() {
+        void initVBOSpere()
+        {
             VertexPositionNormalTexture[] sphereVertices = CalculateSphereVertices(1, 1, 16, 16);
             ushort[] sphereElements = CalculateSphereElements(1, 1, 16, 16);
             sphereElementCount = sphereElements.Length;
@@ -560,19 +584,22 @@ namespace Examples.Tutorial
 
         #region perspective
 
-        void setOrtho() {
+        void setOrtho()
+        {
             OpenTK.Matrix4 proj;
             proj = OpenTK.Matrix4.CreateOrthographicOffCenter(-1, 1, -1, 1, 1, -1);
             GL.LoadMatrix(ref proj);
         }
 
-        void setPerspective() {
+        void setPerspective()
+        {
             OpenTK.Matrix4 proj;
             proj = OpenTK.Matrix4.CreatePerspectiveFieldOfView(MathHelper.PiOver4, Width / (float)Height, 0.1f, 200f);
             GL.LoadMatrix(ref proj);
         }
 
-        void switchToMode(ViewMode m) {
+        void switchToMode(ViewMode m)
+        {
             mode = m;
             // force update of projection matrix by calling OnResize
             this.OnResize(EventArgs.Empty);
@@ -582,7 +609,8 @@ namespace Examples.Tutorial
 
         #region render methods
 
-        void drawCubemapCross() {
+        void drawCubemapCross()
+        {
             GL.ClearColor(0.1f, 0.1f, 0.1f, 0.1f);
             GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
 
@@ -680,7 +708,8 @@ namespace Examples.Tutorial
             GL.PopAttrib();
         }
 
-        void renderCubeVBO() {
+        void renderCubeVBO()
+        {
             GL.EnableClientState(EnableCap.VertexArray);
             GL.EnableClientState(EnableCap.NormalArray);
             GL.EnableClientState(EnableCap.TextureCoordArray);
@@ -699,7 +728,8 @@ namespace Examples.Tutorial
             GL.DisableClientState(EnableCap.TextureCoordArray);
         }
 
-        void renderSphereVBO() {
+        void renderSphereVBO()
+        {
             GL.EnableClientState(EnableCap.VertexArray);
             GL.EnableClientState(EnableCap.NormalArray);
             GL.EnableClientState(EnableCap.TextureCoordArray);
@@ -721,7 +751,8 @@ namespace Examples.Tutorial
             GL.DisableClientState(EnableCap.TextureCoordArray);
         }
 
-        void renderCubemap() {
+        void renderCubemap()
+        {
             GL.Disable(EnableCap.DepthTest);
 
             // draw onto cubemap FBO using geometry shader
@@ -733,7 +764,8 @@ namespace Examples.Tutorial
 
                 // clear all cubemap faces to blue
                 GL.ClearColor(0f, 0f, 1f, 0f);
-                for (int i = 0; i < 6; i++) {
+                for (int i = 0; i < 6; i++)
+                {
                     GL.Ext.FramebufferTexture2D(FramebufferTarget.FramebufferExt, FramebufferAttachment.ColorAttachment0, TextureTarget.TextureCubeMapPositiveX + i, textureCubeColor, 0);
                     //todo select depth renderbuffer face and trun depth_test on again
                     GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
@@ -769,7 +801,8 @@ namespace Examples.Tutorial
             GL.Enable(EnableCap.DepthTest);
         }
 
-        void renderScene() {
+        void renderScene()
+        {
             GL.MatrixMode(MatrixMode.Projection);
             GL.PushMatrix();
             setPerspective();
@@ -852,7 +885,8 @@ namespace Examples.Tutorial
 
             // Set projection matrix
             GL.MatrixMode(MatrixMode.Projection);
-            switch (mode) {
+            switch (mode)
+            {
                 case ViewMode.CubemapCross:
                     setOrtho();
                     break;
@@ -877,8 +911,8 @@ namespace Examples.Tutorial
             // elapsed time in ms since last start
             double elapsed = (DateTime.Now - startTime).TotalMilliseconds;
 
-            spherePos.X = (float)Math.Sin(elapsed/5000) * 3;
+            spherePos.X = (float)Math.Sin(elapsed / 5000) * 3;
-            spherePos.Z = (float)Math.Cos(elapsed/5000) * 3;
+            spherePos.Z = (float)Math.Cos(elapsed / 5000) * 3;
             eyePos.X = (float)Math.Cos(elapsed / 3000) * 8;
             eyePos.Z = (float)Math.Sin(elapsed / 2000) * 8;
 
@@ -892,11 +926,13 @@ namespace Examples.Tutorial
 
         protected override void OnRenderFrame(FrameEventArgs e)
         {
-            if (mode == ViewMode.CubemapCross) {
+            if (mode == ViewMode.CubemapCross)
+            {
                 renderCubemap();
                 drawCubemapCross();
             }
-            if (mode == ViewMode.Scene) {
+            if (mode == ViewMode.Scene)
+            {
                 renderCubemap();
                 GL.ClearColor(0.1f, 0.1f, 0.1f, 0.1f);
                 GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);

Source/Examples/OpenGL/GLSL/JuliaSetFractal.cs

@@ -18,6 +18,7 @@ using System.IO;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Graphics.OpenGL;
+using OpenTK.Input;
 
 namespace Examples.Tutorial
 {
@@ -170,9 +171,9 @@ namespace Examples.Tutorial
         }
 
         int i = 0;
-        void KeyUp(OpenTK.Input.KeyboardDevice sender, OpenTK.Input.Key e)
+        void KeyUp(object sender, KeyboardKeyEventArgs e)
         {
-            if (e == OpenTK.Input.Key.F12)
+            if (e.Key == Key.F12)
             {
                 Bitmap bmp = new Bitmap(this.Width, this.Height);
                 System.Drawing.Imaging.BitmapData data = 

Source/Examples/OpenTK/GameWindow/FullscreenAntialias.cs

@@ -43,12 +43,12 @@ namespace Examples
         public FullscreenAntialias()
             : base(800, 600, new GraphicsMode(32, 0, 0, 4))
         {
-            Keyboard.KeyDown += delegate(KeyboardDevice sender, Key key)
+            Keyboard.KeyDown += delegate(object sender, KeyboardKeyEventArgs e)
             {
-                if (sender[Key.Escape])
+                if (e.Key == Key.Escape)
                     this.Exit();
 
-                if ((sender[Key.AltLeft] || sender[Key.AltRight]) && (sender[Key.Enter] || sender[Key.KeypadEnter]))
+                if ((e.Key == Key.AltLeft || e.Key == Key.AltRight) && (e.Key == Key.Enter || e.Key == Key.KeypadEnter))
                     if (this.WindowState == WindowState.Fullscreen)
                         this.WindowState = WindowState.Normal;
                     else

Source/Examples/OpenTK/GameWindow/SimpleWindow.cs

@@ -24,7 +24,7 @@ namespace Examples.Tutorial
     {
         public SimpleWindow() : base(800, 600)
         {
-            Keyboard.KeyDown += new OpenTK.Input.KeyDownEvent(Keyboard_KeyDown);
+            Keyboard.KeyDown += Keyboard_KeyDown;
         }
 
         #region Keyboard_KeyDown
@@ -33,13 +33,13 @@ namespace Examples.Tutorial
         /// Occurs when a key is pressed.
         /// </summary>
         /// <param name="sender">The KeyboardDevice which generated this event.</param>
-        /// <param name="key">The key that was pressed.</param>
+        /// <param name="e">The key that was pressed.</param>
-        void Keyboard_KeyDown(KeyboardDevice sender, Key key)
+        void Keyboard_KeyDown(object sender, KeyboardKeyEventArgs e)
         {
-            if (sender[Key.Escape])
+            if (e.Key == Key.Escape)
                 this.Exit();
 
-            if ((sender[Key.AltLeft] || sender[Key.AltRight]) && (sender[Key.Enter] || sender[Key.KeypadEnter]))
+            if ((e.Key == Key.AltLeft || e.Key == Key.AltRight) && (e.Key == Key.Enter || e.Key == Key.KeypadEnter))
                 if (this.WindowState == WindowState.Fullscreen)
                     this.WindowState = WindowState.Normal;
                 else

Source/Examples/OpenTK/Test/GameWindowStates.cs

@@ -34,9 +34,9 @@ namespace Examples.Tests
             WindowStateChanged += WindowBorderOrStateChangedHandler;
         }
 
-        void KeyUpHandler(KeyboardDevice sender, Key key)
+        void KeyUpHandler(object sender, KeyboardKeyEventArgs e)
         {
-            switch (key)
+            switch (e.Key)
             {
                 case OpenTK.Input.Key.Escape: this.Exit(); break;
 

Source/Examples/OpenTK/Test/InputLogger.cs

@@ -277,12 +277,12 @@ namespace Examples.Tests
             this.BeginInvoke(ControlLogMouseKeyUp, hidden, this, sender, e);
         }
 
-        void LogKeyDown(KeyboardDevice sender, Key key)
+        void LogKeyDown(object sender, KeyboardKeyEventArgs key)
         {
             this.BeginInvoke(ControlLogKeyboardDown, hidden, this, sender, key);
         }
 
-        void LogKeyUp(KeyboardDevice sender, Key key)
+        void LogKeyUp(object sender, KeyboardKeyEventArgs key)
         {
             this.BeginInvoke(ControlLogKeyboardUp, hidden, this, sender, key);
         }

Source/OpenTK/Input/KeyboardDevice.cs

@@ -26,6 +26,7 @@ namespace OpenTK.Input
         private int numKeys, numFKeys, numLeds;
         private IntPtr devID;
         private bool repeat;
+        private KeyboardKeyEventArgs args = new KeyboardKeyEventArgs();
 
         #region --- Constructors ---
 
@@ -50,9 +51,15 @@ namespace OpenTK.Input
                     keys[(int)key] = value;
 
                     if (value && KeyDown != null)
-                        KeyDown(this, key);
+                    {
+                        args.Key = key;
+                        KeyDown(this, args);
+                    }
                     else if (!value && KeyUp != null)
-                        KeyUp(this, key);
+                    {
+                        args.Key = key;
+                        KeyUp(this, args);
+                    }
                 }
             }
         }
@@ -119,21 +126,21 @@ namespace OpenTK.Input
 
         #endregion
 
-        #region public event KeyDownEvent KeyDown;
+        #region KeyDown
 
         /// <summary>
         /// Occurs when a key is pressed.
         /// </summary>
-        public event KeyDownEvent KeyDown;
+        public event EventHandler<KeyboardKeyEventArgs> KeyDown;
 
         #endregion
 
-        #region public event KeyUpEvent KeyUp;
+        #region KeyUp
 
         /// <summary>
         /// Occurs when a key is released.
         /// </summary>
-        public event KeyUpEvent KeyUp;
+        public event EventHandler<KeyboardKeyEventArgs> KeyUp;
 
         #endregion
 
@@ -198,9 +205,4 @@ namespace OpenTK.Input
 
         #endregion
     }
-
-    [Obsolete]
-    public delegate void KeyDownEvent(KeyboardDevice sender, Key key);
-    [Obsolete]
-    public delegate void KeyUpEvent(KeyboardDevice sender, Key key);
 }

Source/OpenTK/Input/KeyboardKeyEventArgs.cs

@@ -0,0 +1,83 @@
+#region License
+//
+// The Open Toolkit Library License
+//
+// Copyright (c) 2006 - 2009 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;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenTK.Input
+{
+    /// <summary>
+    /// Defines the event data for <see cref="KeyboardDevice"/> events.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Do not cache instances of this type outside their event handler.
+    /// If necessary, you can clone a KeyboardEventArgs instance using the 
+    /// <see cref="KeyboardKeyEventArgs(KeyboardKeyEventArgs)"/> constructor.
+    /// </para>
+    /// </remarks>
+    public class KeyboardKeyEventArgs : EventArgs
+    {
+        #region Fields
+
+        Key key;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Constructs a new KeyboardEventArgs instance.
+        /// </summary>
+        public KeyboardKeyEventArgs() { }
+
+        /// <summary>
+        /// Constructs a new KeyboardEventArgs instance.
+        /// </summary>
+        /// <param name="args">An existing KeyboardEventArgs instance to clone.</param>
+        public KeyboardKeyEventArgs(KeyboardKeyEventArgs args)
+        {
+            Key = args.Key;
+        }
+
+        #endregion
+
+        #region Public Members
+
+        /// <summary>
+        /// Gets the <see cref="Key"/> that generated this event.
+        /// </summary>
+        public Key Key
+        {
+            get { return key; }
+            internal set { key = value; }
+        }
+
+        #endregion
+    }
+}