Add GetCharacter() and GetUnmodifiedCharacter() methods to views::Event.

views/events/event_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/events/event.h"
 
 #include <gdk/gdk.h>
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
@@ skipping 59 matching lines @@
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY:
       return native_event->crossing.state;
     default:
       NOTREACHED();
       break;
   }
   return 0;
 }
 
+#if !defined(TOUCH_UI)
+uint16 GetCharacterFromGdkKeyval(guint keyval) {
+  guint32 ch = gdk_keyval_to_unicode(keyval);
+
+  // We only support BMP characters.
+  return ch < 0xFFFE ? static_cast<uint16>(ch) : 0;
+}
+#endif
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Event, public:
 
 // static
 int Event::GetFlagsFromGdkState(unsigned int state) {
   int flags = 0;
   if (state & GDK_LOCK_MASK)
     flags |= ui::EF_CAPS_LOCK_DOWN;
@@ skipping 82 matching lines @@
                 GetGdkEventKeyFromNative(native_event))) {
 }
 
 #if !defined(TOUCH_UI)
 KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native)
     : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) {
   // No one should ever call this on Gtk-views.
   // TODO(beng): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
 }
+
+uint16 KeyEvent::GetCharacter() const {
+  // Gtk doesn't support control characters.
+  if (IsControlDown() || !native_event())
+    return GetCharacterFromKeyCode(key_code_, flags());
+
+  uint16 ch = GetCharacterFromGdkKeyval(
+      GetGdkEventKeyFromNative(native_event())->keyval);
+  return ch ? ch : GetCharacterFromKeyCode(key_code_, flags());
+}
+
+uint16 KeyEvent::GetUnmodifiedCharacter() const {
+  static const guint kIgnoredModifiers =

[Evan Stade, 2011/03/18 21:13:07]

declare this right above where it's used (and near the comment that pretains to
it)

[James Su, 2011/03/18 21:22:14]

Done.

+      GDK_CONTROL_MASK | GDK_LOCK_MASK | GDK_MOD1_MASK | GDK_MOD2_MASK |
+      GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK | GDK_SUPER_MASK |
+      GDK_HYPER_MASK | GDK_META_MASK;
+
+  if (!native_event())
+    return GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
+
+  GdkEventKey* key = GetGdkEventKeyFromNative(native_event());
+
+  // We can't use things like (key->state & GDK_SHIFT_MASK), as it may mask out
+  // bits used by X11 or Gtk internally.
+  GdkModifierType modifiers =
+      static_cast<GdkModifierType>(key->state & ~kIgnoredModifiers);
+  guint keyval = 0;
+  uint16 ch = 0;
+  if (gdk_keymap_translate_keyboard_state(
+      NULL, key->hardware_keycode, modifiers, key->group, &keyval,
+      NULL, NULL, NULL))

[Evan Stade, 2011/03/18 21:13:07]

curlies

[James Su, 2011/03/18 21:22:14]

Done.

+    ch = GetCharacterFromGdkKeyval(keyval);
+
+  return ch ? ch :
+      GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
+}
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent, public:
 
 MouseWheelEvent::MouseWheelEvent(NativeEvent native_event)
     : MouseEvent(native_event),
       offset_(GetMouseWheelOffset(native_event)) {
 }
 
 #if !defined(TOUCH_UI)
 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
                                  FromNativeEvent2 from_native)
     : MouseEvent(native_event_2, from_native) {
   // No one should ever call this on Gtk-views.
   // TODO(msw): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
 }
 #endif
 
 }  // namespace views