aura: Fix shift/ctrl/alt keyevents with RWHVA and X11.

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>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/events.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/touch/touch_factory.h"
 #include "views/widget/root_view.h"
 
 namespace views {
 
 namespace {
 
-uint16 GetCharacterFromXKeyEvent(XKeyEvent* key) {
-  char buf[6];
-  int bytes_written = XLookupString(key, buf, 6, NULL, NULL);
-  DCHECK_LE(bytes_written, 6);
-
-  string16 result;
-  return (bytes_written > 0 && UTF8ToUTF16(buf, bytes_written, &result) &&
-          result.length() == 1) ? result[0] : 0;
-}
-
 // The following two functions are copied from event_gtk.cc. These will be
 // removed when GTK dependency is removed.
 #if defined(TOOLKIT_USES_GTK)
 uint16 GetCharacterFromGdkKeyval(guint keyval) {
   guint32 ch = gdk_keyval_to_unicode(keyval);
 
   // We only support BMP characters.
   return ch < 0xFFFE ? static_cast<uint16>(ch) : 0;
 }
 
@@ skipping 22 matching lines @@
       if (ch)
         return ch;
     }
 #endif
     return GetCharacterFromKeyCode(key_code_, flags());
   }
 
   DCHECK(native_event()->type == KeyPress ||
          native_event()->type == KeyRelease);
 
-  uint16 ch = GetCharacterFromXKeyEvent(&native_event()->xkey);
+  uint16 ch = ui::DefaultSymbolFromXEvent(native_event());
   return ch ? ch : GetCharacterFromKeyCode(key_code_, flags());
 }
 
 uint16 KeyEvent::GetUnmodifiedCharacter() const {
   if (unmodified_character_)
     return unmodified_character_;
 
   if (!native_event()) {
 #if defined(TOOLKIT_USES_GTK)
     // This event may have been created from a Gdk event.
@@ skipping 17 matching lines @@
           return ch;
       }
     }
 #endif
     return GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
   }
 
   DCHECK(native_event()->type == KeyPress ||
          native_event()->type == KeyRelease);
 
-  XKeyEvent key = native_event()->xkey;
+  XKeyEvent *key = &native_event()->xkey;
 
   static const unsigned int kIgnoredModifiers = ControlMask | LockMask |
       Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask;
 
   // 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);
+  key->state &= ~kIgnoredModifiers;
+  uint16 ch = ui::DefaultSymbolFromXEvent(native_event());
   return ch ? ch :
       GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent, public:
 
 TouchEvent::TouchEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
       touch_id_(ui::GetTouchId(native_event)),
@@ skipping 20 matching lines @@
     float slot;
     if (factory->ExtractTouchParam(*native_event,
                                    ui::TouchFactory::TP_SLOT_ID, &slot)) {
       factory->SetSlotUsed(slot, type() == ui::ET_TOUCH_PRESSED);
     }
   }
 #endif
 }
 
 }  // namespace views