Changeset 10285

Timestamp:

05/28/09 16:09:16 (4 years ago)

Author:

robert

Message:

From Stephan Huber, "attached you'll find a small fix for GrphicsWindowCocoa?. There was a bug
with certain key-strokes, which led to a crash."

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

@@ -670 +670 @@
     
     NSString* chars = [theEvent charactersIgnoringModifiers]; 
-    unsigned int keyCode = remapCocoaKey([chars characterAtIndex:0], ([theEvent modifierFlags] & NSFunctionKeyMask) );
-    // std::cout << "key dn: " <<[chars characterAtIndex:0] << "=" << keyCode << std::endl;   
-    _win->getEventQueue()->keyPress( remapCocoaKey(keyCode), [theEvent timestamp]);
+    if ((chars) && ([chars length] > 0)) {
+        unsigned int keyCode = remapCocoaKey([chars characterAtIndex:0], ([theEvent modifierFlags] & NSFunctionKeyMask) );
+        // std::cout << "key dn: " <<[chars characterAtIndex:0] << "=" << keyCode << std::endl;   
+        _win->getEventQueue()->keyPress( remapCocoaKey(keyCode), [theEvent timestamp]);
+    }
 }
 
@@ -681 +683 @@
     
     NSString* chars = [theEvent charactersIgnoringModifiers]; 
-    unsigned int keyCode = remapCocoaKey([chars characterAtIndex:0], ([theEvent modifierFlags] & NSFunctionKeyMask));
-    // std::cout << "key up: " <<[chars characterAtIndex:0] << "=" << keyCode << std::endl;   
-    _win->getEventQueue()->keyRelease( remapCocoaKey(keyCode), [theEvent timestamp]);
+    if ((chars) && ([chars length] > 0)) {
+        unsigned int keyCode = remapCocoaKey([chars characterAtIndex:0], ([theEvent modifierFlags] & NSFunctionKeyMask));
+        // std::cout << "key up: " <<[chars characterAtIndex:0] << "=" << keyCode << std::endl;   
+        _win->getEventQueue()->keyRelease( remapCocoaKey(keyCode), [theEvent timestamp]);
+    }
 }