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

views/events/event_gtk.cc

Index: views/events/event_gtk.cc
diff --git a/views/events/event_gtk.cc b/views/events/event_gtk.cc
index 8dfa62d23dd938a84ead199ac583ce02602dcd5e..ec530b092e87824bd5d6c0ade3c339f1a5cb19cd 100644
--- a/views/events/event_gtk.cc
+++ b/views/events/event_gtk.cc
@@ -77,6 +77,15 @@ unsigned int GetGdkStateFromNative(NativeEvent native_event) {
   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
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -179,6 +188,43 @@ KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native)
   // 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 {
+  if (!native_event())
+    return GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
+
+  GdkEventKey* key = GetGdkEventKeyFromNative(native_event());
+
+  static const guint kIgnoredModifiers =
+      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;
+
+  // 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)) {

[oshima, 2011/03/21 18:35:42]

indent

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

Done.

+    ch = GetCharacterFromGdkKeyval(keyval);
+  }
+
+  return ch ? ch :
+      GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
+}
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////