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

views/events/event_x.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 <gdk/gdkx.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
 #endif
+#include <X11/Xlib.h>
 
+#include "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
 namespace views {
 
 namespace {
 
 // Scroll amount for each wheelscroll event. 53 is also the value used for GTK+.
 static int kWheelScrollAmount = 53;
@@ skipping 184 matching lines @@
            return GetButtonMaskForX2Event(xievent) |
                   GetEventFlagsFromXState(xievent->mods.effective);
       }
     }
 #endif
   }
 
   return 0;
 }
 
+uint16 GetCharacterFromXKeyEvent(XKeyEvent* key) {
+  char buf[7];

[Yusuke Sato, 2011/03/18 12:07:41]

I guess it should be either [6]; or [7] = {};

[James Su, 2011/03/18 15:54:09]

Done.

+  int bytes_written = XLookupString(key, buf, 6, NULL, NULL);
+  DCHECK(bytes_written <= 6);
+
+  string16 result;
+  return (bytes_written > 0 && UTF8ToUTF16(buf, bytes_written, &result) &&
+          result.length() == 1) ? result[0] : 0;
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Event, private:
 
 void Event::InitWithNativeEvent2(NativeEvent2 native_event_2,
                                  FromNativeEvent2) {
   native_event_ = NULL;
   // TODO(beng): remove once we rid views of Gtk/Gdk.
   native_event_2_ = native_event_2;
@@ skipping 15 matching lines @@
 // KeyEvent, public:
 
 KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native)
     : Event(native_event_2,
             EventTypeFromNative(native_event_2),
             GetEventFlagsFromXState(native_event_2->xkey.state),
             from_native),
       key_code_(ui::KeyboardCodeFromXKeyEvent(native_event_2)) {
 }
 
+uint16 KeyEvent::GetCharacter() const {
+  if (!native_event_2())

[Yusuke Sato, 2011/03/18 12:07:41]

when native_event_2() can be NULL?

+    return GetCharacterFromKeyCode(key_code_, flags());
+
+  DCHECK(native_event_2()->type == KeyPress ||
+         native_event_2()->type == KeyRelease);
+
+  uint16 ch = GetCharacterFromXKeyEvent(&native_event_2()->xkey);
+  return ch ? ch : GetCharacterFromKeyCode(key_code_, flags());
+}
+
+uint16 KeyEvent::GetUnmodifiedCharacter() const {
+  static const unsigned int kIgnoredModifiers = ControlMask | LockMask |
+      Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask;
+
+  if (!native_event_2())

[Yusuke Sato, 2011/03/18 12:07:41]

ditto.

+    return GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
+
+  DCHECK(native_event_2()->type == KeyPress ||
+         native_event_2()->type == KeyRelease);
+
+  XKeyEvent key = native_event_2()->xkey;
+
+  // We can't use things like (key.state & ShiftMask), as it may mask out bits
+  // used by X11 internally.
+  key.state &= ~kIgnoredModifiers;
+  uint16 ch = GetCharacterFromXKeyEvent(&key);
+  return ch ? ch :
+      GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // MouseEvent, public:
 
 MouseEvent::MouseEvent(NativeEvent2 native_event_2,
                        FromNativeEvent2 from_native)
     : LocatedEvent(native_event_2, from_native) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent, public:
@@ skipping 11 matching lines @@
 TouchEvent::TouchEvent(NativeEvent2 native_event_2,
                        FromNativeEvent2 from_native)
     : LocatedEvent(GetTouchEventType(native_event_2),
                    GetEventLocation(native_event_2),
                    GetLocatedEventFlags(native_event_2, true)),
       touch_id_(GetTouchIDFromXEvent(native_event_2)) {
 }
 #endif
 
 }  // namespace views