From 1fcda77625b83545e9f67aab7ef489ef9c573d39 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 16 Nov 2011 20:40:57 +0000
Subject: [PATCH] Mac: Fix handling of numeric pad characters. Don't send
 character events for non-character numeric and function keys (issue #426).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@379 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 libcef/webwidget_host_mac.mm | 45 ++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/libcef/webwidget_host_mac.mm b/libcef/webwidget_host_mac.mm
index 45b98b0cc..64133d93f 100644
--- a/libcef/webwidget_host_mac.mm
+++ b/libcef/webwidget_host_mac.mm
@@ -275,16 +275,43 @@ void WebWidgetHost::KeyEvent(NSEvent *event) {
   WebKeyboardEvent keyboard_event(WebInputEventFactory::keyboardEvent(event));
   last_key_event_ = keyboard_event;
   webwidget_->handleInputEvent(keyboard_event);
-  if ([event type] == NSKeyDown &&
-      !([event modifierFlags] & NSNumericPadKeyMask)) {
-    // Send a Char event here to emulate the keyboard events. Do not send a
-    // Char event for arrow keys (NSNumericPadKeyMask modifier will be set).
-    // TODO(hbono): Bug 20852 <http://crbug.com/20852> implement the
-    // NSTextInput protocol and remove this code.
-    keyboard_event.type = WebInputEvent::Char;
-    last_key_event_ = keyboard_event;
-    webwidget_->handleInputEvent(keyboard_event);
+
+  if ([event type] != NSKeyDown)
+    return;
+
+  if ([event modifierFlags] & (NSNumericPadKeyMask | NSFunctionKeyMask)) {
+    // Don't send a Char event for non-char keys like arrows, function keys and
+    // clear.
+    switch ([event keyCode]) {
+      case 81: // =
+      case 75: // /
+      case 67: // *
+      case 78: // -
+      case 69: // +
+      case 76: // Enter
+      case 65: // .
+      case 82: // 0
+      case 83: // 1
+      case 84: // 2
+      case 85: // 3
+      case 86: // 4
+      case 87: // 5
+      case 88: // 6
+      case 89: // 7
+      case 91: // 8
+      case 92: // 9
+        break;
+      default:
+        return;
+    }
   }
+
+  // Send a Char event here to emulate the keyboard events. 
+  // TODO(hbono): Bug 20852 <http://crbug.com/20852> implement the NSTextInput
+  // protocol and remove this code.
+  keyboard_event.type = WebInputEvent::Char;
+  last_key_event_ = keyboard_event;
+  webwidget_->handleInputEvent(keyboard_event);
 }
 
 void WebWidgetHost::SetFocus(bool enable) {