[Ozone] Fix ui::Event::GetCharacter() when Ctrl is pressed

ui/events/event.cc

 // Copyright (c) 2012 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 "ui/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
@@ skipping 762 matching lines @@
   GetMeaningFromKeyCode(key_code_, flags(), &key_, &character_);
 #elif defined(USE_X11)
   // When a control key is held, prefer ASCII characters to non ASCII
   // characters in order to use it for shortcut keys.  GetCharacterFromKeyCode
   // returns 'a' for VKEY_A even if the key is actually bound to 'à' in X11.
   // GetCharacterFromXEvent returns 'à' in that case.
   character_ = (IsControlDown() || !native_event()) ?
       GetCharacterFromKeyCode(key_code_, flags()) :
       GetCharacterFromXEvent(native_event());
   // TODO(kpschoedel): set key_ field for X11.
 #elif defined(USE_OZONE)

[kpschoedel, 2015/01/26 19:34:22]

This code isn't run for normal key events (only for the "incomplete" synthetic
KeyEvent constructors used mostly by tests), and should soon go away (see
crbug.com/444045 and the discussion linked there). Ideally the keyboard layout
using xkb should be completely determined by the xkb layout configuration files
(in the xkeyboard-config package) but if there's a need to override that it
should be in XkbKeyboardLayoutEngine::Lookup(), so that it's applied
universally.

   KeyboardCode key_code;
-  if (!KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()->Lookup(
+  if (KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()->Lookup(
       code_, flags(), &key_, &character_, &key_code, &platform_keycode_)) {
+    if (IsControlDown()) {
+      // Use GetCharacterFromKeyCode() to set |character_| to 0x0 for keys that
+      // we do not care about.
+      character_ = GetCharacterFromKeyCode(key_code_, flags());
+    }
+  } else {
     GetMeaningFromKeyCode(key_code_, flags(), &key_, &character_);
   }
 #else
   if (native_event()) {
     DCHECK(EventTypeFromNative(native_event()) == ET_KEY_PRESSED ||
            EventTypeFromNative(native_event()) == ET_KEY_RELEASED);
   }
   // TODO(kpschoedel): revise to use DOM code_ instead of Windows key_code_
   GetMeaningFromKeyCode(key_code_, flags(), &key_, &character_);
 #endif
@@ skipping 176 matching lines @@
                    gfx::PointF(x, y),
                    time_stamp,
                    flags | EF_FROM_TOUCH),
       details_(details) {
 }
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui