Reapply Caps Lock and Num Lock to core keyboard whenever new X input device is added

chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc

Index: chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
diff --git a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
index 9e30df3e86adeee8edc9cab844fbb3fb8bd677a8..f8570be7ba54019b3a4deb41d9a758444a3a81c4 100644
--- a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
+++ b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
@@ -50,8 +50,12 @@ void HandleHierarchyChangedEvent(XIHierarchyEvent* event) {
     if ((event->flags & XISlaveAdded) &&
         (info->use == XIFloatingSlave) &&
         (info->flags & XISlaveAdded)) {

[Daniel Kurtz, 2011/11/04 11:49:18]

I think this searches the entire hierarchy on every HierarchyChangeEvent
(add/attach/detach/remove).  Also, we really only care about Keyboards, so, you
can try just watching for when a new SlaveKeyboard is Attached to a Master.

So, can you try this, instead:

void HHCE() {
  XHI* info = &event->info[i];
  if (!(event->flags & XISlaveAttached))
    return;
  for (int i = 0; i < event->num_info; ++i) {
    XIHI* info = event->info[i];
    if (info->flags & XISlaveAttached &&
        info->use == XISlaveKeyboard) {
      ...
    }
  }
}

[Yusuke Sato, 2011/11/07 04:31:28]

Do you mean 'if (!(event->flags & XISlaveAdded))'? Assuming the answer is yes,
it seems that X does not send an XISlaveAdded+XISlaveKeyboard event to Chrome
when an external keyboard is plugged.

So, let me go with this:

   if (!(event->flags & XISlaveAdded))
     return;
   for (int i = 0; i < event->num_info; ++i) {
     XIHI* info = event->info[i];
     if (info->flags & XISlaveAttached &&
         info->use == XIFloatingSlave) {

-      chromeos::input_method::InputMethodManager::GetInstance()->
-          GetXKeyboard()->ReapplyCurrentKeyboardLayout();
+      chromeos::input_method::InputMethodManager* input_method_manager =
+          chromeos::input_method::InputMethodManager::GetInstance();
+      chromeos::input_method::XKeyboard* xkeyboard =
+          input_method_manager->GetXKeyboard();
+      xkeyboard->ReapplyCurrentModifierLockStatus();
+      xkeyboard->ReapplyCurrentKeyboardLayout();
       break;
     }
   }