Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: views/events/event_gtk.cc

Issue 6713027: Add GetCharacter() and GetUnmodifiedCharacter() methods to views::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/events/event_gtk.cc
diff --git a/views/events/event_gtk.cc b/views/events/event_gtk.cc
index 8dfa62d23dd938a84ead199ac583ce02602dcd5e..024f45b3439345147ca96fe75431408461560c5f 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,42 @@ 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())
Yusuke Sato 2011/03/18 12:07:41 question: when native_event() can be NULL?
James Su 2011/03/18 15:54:09 It could be NULL if it's a fabricated 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 =
+ 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())
Yusuke Sato 2011/03/18 12:07:41 when native_event() can be NULL?
+ 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))
+ ch = GetCharacterFromGdkKeyval(keyval);
+
+ return ch ? ch :
+ GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
+}
#endif
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698