ozone: xkb: Fix number pad key mappings

ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

 // Copyright 2014 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/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
 
 #include <xkbcommon/xkbcommon-names.h>
 
 #include "base/logging.h"
 #include "ui/events/event_constants.h"
@@ skipping 608 matching lines @@
 }  // anonymous namespace
 
 XkbKeyCodeConverter::XkbKeyCodeConverter() {
 }
 
 XkbKeyCodeConverter::~XkbKeyCodeConverter() {
 }
 
 XkbKeyboardLayoutEngine::XkbKeyboardLayoutEngine(
     const XkbKeyCodeConverter& converter)
-    : key_code_converter_(converter) {
+    : num_lock_mod_mask_(0),
+    key_code_converter_(converter) {
   // TODO: add XKB_CONTEXT_NO_ENVIRONMENT_NAMES
   xkb_context_.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES));
   xkb_context_include_path_append(xkb_context_.get(),
                                   "/usr/share/X11/xkb");
 }
 
 XkbKeyboardLayoutEngine::~XkbKeyboardLayoutEngine() {
 }
 
 bool XkbKeyboardLayoutEngine::CanSetCurrentLayout() const {
@@ skipping 102 matching lines @@
   xkb_state_.reset(xkb_state_new(keymap));
   // Update flag map.
   static const struct {
     int ui_flag;
     const char* xkb_name;
   } flags[] = {{ui::EF_CONTROL_DOWN, XKB_MOD_NAME_CTRL},
                {ui::EF_SHIFT_DOWN, XKB_MOD_NAME_SHIFT},
                {ui::EF_ALT_DOWN, XKB_MOD_NAME_ALT},
                {ui::EF_CAPS_LOCK_DOWN, XKB_MOD_NAME_CAPS},
                {ui::EF_COMMAND_DOWN, XKB_MOD_NAME_LOGO},
-               {ui::EF_NUMPAD_KEY, XKB_MOD_NAME_NUM},
                {ui::EF_MOD3_DOWN, "Mod3"},
                {ui::EF_ALTGR_DOWN, "Mod5"}};
   xkb_flag_map_.clear();
   xkb_flag_map_.resize(arraysize(flags));
   for (size_t i = 0; i < arraysize(flags); ++i) {
     xkb_mod_index_t index = xkb_keymap_mod_get_index(keymap, flags[i].xkb_name);
     if (index == XKB_MOD_INVALID) {
       DVLOG(3) << "XKB keyboard layout does not contain " << flags[i].xkb_name;
     } else {
       xkb_mod_mask_t flag = static_cast<xkb_mod_mask_t>(1) << index;
       XkbFlagMapEntry e = {flags[i].ui_flag, flag};
       xkb_flag_map_.push_back(e);
     }
   }
+
+  // Update num lock mask.
+  num_lock_mod_mask_ = 0;
+  xkb_mod_index_t num_mod_index =
+      xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_NUM);
+  if (num_mod_index != XKB_MOD_INVALID)
+    num_lock_mod_mask_ = static_cast<xkb_mod_mask_t>(1) << num_mod_index;
 }
 
 xkb_mod_mask_t XkbKeyboardLayoutEngine::EventFlagsToXkbFlags(
     int ui_flags) const {
   xkb_mod_mask_t xkb_flags = 0;
   for (const auto& entry : xkb_flag_map_) {
     if (ui_flags & entry.ui_flag)
       xkb_flags |= entry.xkb_flag;
   }
+  // NumLock is always on.
+  xkb_flags |= num_lock_mod_mask_;
   return xkb_flags;
 }
 
 bool XkbKeyboardLayoutEngine::XkbLookup(xkb_keycode_t xkb_keycode,
                                         xkb_mod_mask_t xkb_flags,
                                         xkb_keysym_t* xkb_keysym,
                                         base::char16* character) const {
   if (!xkb_state_) {
     LOG(ERROR) << "No current XKB state";
     return false;
@@ skipping 89 matching lines @@
   if (flags == base_flags)
     return base_character;
   xkb_keysym_t keysym;
   base::char16 character = 0;
   if (!XkbLookup(xkb_keycode, flags, &keysym, &character))
     character = kNone;
   return character;
 }
 
 }  // namespace ui