From bc933c6e18a68d9cd94b0349fb516852ac0c7457 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 18 Jan 2012 03:42:52 +0100
Subject: NEWT/OSX: Cleanup 'javaWindowObject' @ window-close & avoid NPE;
 Disable lostFocus (resignKeyWindow) when in fullscreen mode; Ignore invalid
 key release/type events.

- Cleanup 'javaWindowObject' @ window-close & avoid NPE
  Ensure that the direct window.close() impl. removes the global reference
  and that all use cases check for NULL pointer.

- Disable lostFocus (resignKeyWindow) when in fullscreen mode
  Similar to the X11 KDE bug, OS X delivers a lostFocus event
  which we prevent from being processed in fullscreen mode.

- Ignore invalid key release/type events

  In case of offscreen/onscreen switching (fullscreen/reparenting) via destroy/create,
  the still pressed key would be send to the new window and repeat the action (key typed).
  State validation discards the double processing.
---
 .../jogamp/newt/driver/macosx/MacWindow.java       | 44 ++++++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

(limited to 'src/newt/classes')

diff --git a/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java b/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java
index f879ad86c..32e76ec00 100644
--- a/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java
@@ -296,10 +296,13 @@ public class MacWindow extends WindowImpl implements SurfaceChangeable, DriverCl
         // Note that we send the key char for the key code on this
         // platform -- we do not get any useful key codes out of the system
         final int keyCode2 = MacKeyUtil.validateKeyCode(keyCode, keyChar);
-        if(DEBUG_IMPLEMENTATION) System.err.println("MacWindow.sendKeyEvent "+Thread.currentThread().getName()+" char: 0x"+Integer.toHexString(keyChar)+", code 0x"+Integer.toHexString(keyCode)+" -> 0x"+Integer.toHexString(keyCode2));
-        // only deliver keyChar on key Typed events, harmonizing platform behavior
-        keyChar = KeyEvent.EVENT_KEY_TYPED == eventType ? keyChar : (char)-1;
-        super.sendKeyEvent(eventType, modifiers, keyCode2, keyChar);        
+        final boolean valid = validateKeyEvent(eventType, modifiers, keyCode);
+        if(DEBUG_IMPLEMENTATION) System.err.println("MacWindow.sendKeyEvent "+Thread.currentThread().getName()+" char: 0x"+Integer.toHexString(keyChar)+", code 0x"+Integer.toHexString(keyCode)+" -> 0x"+Integer.toHexString(keyCode2)+", valid "+valid);
+        if(valid) {
+            // only deliver keyChar on key Typed events, harmonizing platform behavior
+            keyChar = KeyEvent.EVENT_KEY_TYPED == eventType ? keyChar : (char)-1;
+            super.sendKeyEvent(eventType, modifiers, keyCode2, keyChar);
+        }
     }
     
     @Override
@@ -307,12 +310,37 @@ public class MacWindow extends WindowImpl implements SurfaceChangeable, DriverCl
         // Note that we send the key char for the key code on this
         // platform -- we do not get any useful key codes out of the system
         final int keyCode2 = MacKeyUtil.validateKeyCode(keyCode, keyChar);
-        if(DEBUG_IMPLEMENTATION) System.err.println("MacWindow.enqueueKeyEvent "+Thread.currentThread().getName()+" char: 0x"+Integer.toHexString(keyChar)+", code 0x"+Integer.toHexString(keyCode)+" -> 0x"+Integer.toHexString(keyCode2));
-        // only deliver keyChar on key Typed events, harmonizing platform behavior
-        keyChar = KeyEvent.EVENT_KEY_TYPED == eventType ? keyChar : (char)-1;
-        super.enqueueKeyEvent(wait, eventType, modifiers, keyCode2, keyChar);
+        final boolean valid = validateKeyEvent(eventType, modifiers, keyCode);
+        if(DEBUG_IMPLEMENTATION) System.err.println("MacWindow.enqueueKeyEvent "+Thread.currentThread().getName()+" char: 0x"+Integer.toHexString(keyChar)+", code 0x"+Integer.toHexString(keyCode)+" -> 0x"+Integer.toHexString(keyCode2)+", valid "+valid);
+        if(valid) {
+            // only deliver keyChar on key Typed events, harmonizing platform behavior
+            keyChar = KeyEvent.EVENT_KEY_TYPED == eventType ? keyChar : (char)-1;
+            super.enqueueKeyEvent(wait, eventType, modifiers, keyCode2, keyChar);
+        }
     }
 
+    private int keyDownModifiers = 0;
+    private int keyDownCode = 0;
+    
+    private boolean validateKeyEvent(int eventType, int modifiers, int keyCode) {
+        switch(eventType) {
+            case KeyEvent.EVENT_KEY_PRESSED:
+                keyDownModifiers = modifiers;
+                keyDownCode = keyCode;
+                return true;
+            case KeyEvent.EVENT_KEY_RELEASED:
+                return keyDownModifiers == modifiers && keyDownCode == keyCode;
+            case KeyEvent.EVENT_KEY_TYPED:
+                final boolean matchKeyDown = keyDownModifiers == modifiers && keyDownCode == keyCode;
+                keyDownModifiers = 0;
+                keyDownCode = 0;
+                return matchKeyDown;
+            default:
+                throw new NativeWindowException("Unexpected key event type " + eventType);
+        }
+    }
+    
+
     //----------------------------------------------------------------------
     // Internals only
     //    
-- 
cgit v1.2.3