[X11] Implemented modifier keys

opentk · Feb 25, 2014 · ee1fb2a · ee1fb2a
1 parent 9ba21d6
commit ee1fb2a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Source/OpenTK/Platform/X11/X11GLNative.cs b/Source/OpenTK/Platform/X11/X11GLNative.cs
@@ -849,24 +849,26 @@ public void ProcessEvents()
                         Key key;
                         if (driver.TranslateKey(ref e.KeyEvent, out key))
                         {
+                            // Update legacy GameWindow.Keyboard API:
+                            keyboard.SetKey(key, (uint)e.KeyEvent.keycode, pressed);
+
                             if (pressed)
                             {
                                 // Raise KeyDown event
                                 KeyDownEventArgs.Key = key;
                                 KeyDownEventArgs.ScanCode = (uint)e.KeyEvent.keycode;
+                                KeyDownEventArgs.Modifiers = keyboard.GetModifiers();
                                 KeyDown(this, KeyDownEventArgs);
                             }
                             else
                             {
                                 // Raise KeyUp event
                                 KeyUpEventArgs.Key = key;
                                 KeyUpEventArgs.ScanCode = (uint)e.KeyEvent.keycode;
+                                KeyUpEventArgs.Modifiers = keyboard.GetModifiers();
                                 KeyUp(this, KeyDownEventArgs);
                             }
 
-                            // Update legacy GameWindow.Keyboard API:
-                            keyboard.SetKey(key, (uint)e.KeyEvent.keycode, pressed);
-
                             if (pressed)
                             {
                                 // Translate XKeyPress to characters and