sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

chrome/browser/chromeos/input_method/input_method_engine_ibus.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 "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 #include <map>
 
@@ skipping 14 matching lines @@
 #include "chromeos/ime/ibus_keymap.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "dbus/object_path.h"
 
 namespace chromeos {
 const char* kErrorNotActive = "IME is not active";
 const char* kErrorWrongContext = "Context is not active";
 const char* kCandidateNotFound = "Candidate not found";
 const char* kEngineBusPrefix = "org.freedesktop.IBus.";
 
-namespace {
-const uint32 kIBusAltKeyMask = 1 << 3;
-const uint32 kIBusCtrlKeyMask = 1 << 2;
-const uint32 kIBusShiftKeyMask = 1 << 0;
-const uint32 kIBusCapsLockMask = 1 << 1;
-const uint32 kIBusKeyReleaseMask = 1 << 30;
-}
-
 InputMethodEngineIBus::InputMethodEngineIBus()
     : focused_(false),
       active_(false),
       context_id_(0),
       next_context_id_(1),
       aux_text_(new IBusText()),
       aux_text_visible_(false),
       observer_(NULL),
       preedit_text_(new IBusText()),
       preedit_cursor_(0),
@@ skipping 407 matching lines @@
 
 void InputMethodEngineIBus::SetCapability(
     IBusCapability capability) {
 }
 
 void InputMethodEngineIBus::Reset() {
   observer_->OnReset(engine_id_);
 }
 
 void InputMethodEngineIBus::ProcessKeyEvent(
-    uint32 keysym,
-    uint32 keycode,
-    uint32 state,
+    const std::string& keysym,
+    const std::string& keycode,
+    bool is_key_down,
+    bool is_alt_down,
+    bool is_ctrl_down,
+    bool is_shift_down,
+    bool is_caps_lock_down,
     const KeyEventDoneCallback& callback) {
-
   KeyEventDoneCallback *handler = new KeyEventDoneCallback();
   *handler = callback;
 
   KeyboardEvent event;
-  event.type = !(state & kIBusKeyReleaseMask) ? "keydown" : "keyup";
-  event.key = input_method::GetIBusKey(keysym);
-  event.code = input_method::GetIBusKeyCode(keycode);
-  event.alt_key = state & kIBusAltKeyMask;
-  event.ctrl_key = state & kIBusCtrlKeyMask;
-  event.shift_key = state & kIBusShiftKeyMask;
-  event.caps_lock = state & kIBusCapsLockMask;
+  event.type = is_key_down ? "keydown" : "keyup";
+  event.key = keysym;
+  event.code = keycode;
+  event.alt_key = is_alt_down;
+  event.ctrl_key = is_ctrl_down;
+  event.shift_key = is_shift_down;
+  event.caps_lock = is_caps_lock_down;
   observer_->OnKeyEvent(
       engine_id_,
       event,
       reinterpret_cast<input_method::KeyEventHandle*>(handler));
 }
 
 void InputMethodEngineIBus::CandidateClicked(uint32 index,
                                              ibus::IBusMouseButton button,
                                              uint32 state) {
   if (index > candidate_ids_.size()) {
@@ skipping 115 matching lines @@
   DBusThreadManager::Get()->RemoveIBusEngineService(object_path_);
 
   object_path_ = DBusThreadManager::Get()->GetIBusEngineFactoryService()->
       GenerateUniqueObjectPath();
 
   GetCurrentService()->SetEngine(this);
   sender.Run(object_path_);
 }
 
 }  // namespace chromeos