Integrate the new input method API for Views into Chromium.

views/focus/accelerator_handler_touch.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/focus/accelerator_handler.h"
 
 #include <bitset>
 #include <gtk/gtk.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
 #else
 #include <X11/Xlib.h>
 #endif
 
 #include "views/accelerator.h"
 #include "views/events/event.h"
 #include "views/focus/focus_manager.h"
+#include "views/ime/input_method.h"
 #include "views/touchui/touch_factory.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
 namespace views {
 
 namespace {
 
-RootView* FindRootViewForGdkWindow(GdkWindow* gdk_window) {
+Widget* FindWidgetForGdkWindow(GdkWindow* gdk_window) {
   gpointer data = NULL;
   gdk_window_get_user_data(gdk_window, &data);
   GtkWidget* gtk_widget = reinterpret_cast<GtkWidget*>(data);
   if (!gtk_widget || !GTK_IS_WIDGET(gtk_widget)) {
     DLOG(WARNING) << "no GtkWidget found for that GdkWindow";
     return NULL;
   }
   NativeWidget* widget = NativeWidget::GetNativeWidgetForNativeView(gtk_widget);
 
   if (!widget) {
     DLOG(WARNING) << "no WidgetGtk found for that GtkWidget";
     return NULL;
   }
-  return widget->GetWidget()->GetRootView();
+  return widget->GetWidget();
 }
 
 #if defined(HAVE_XINPUT2)
 bool X2EventIsTouchEvent(XEvent* xev) {
   // TODO(sad): Determine if the captured event is a touch-event.
   XGenericEventCookie* cookie = &xev->xcookie;
   switch (cookie->evtype) {
     case XI_ButtonPress:
     case XI_ButtonRelease:
     case XI_Motion: {
@@ skipping 105 matching lines @@
 #if defined(HAVE_XINPUT2)
   if (xev->type == GenericEvent) {
     XGenericEventCookie* cookie = &xev->xcookie;
     XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(cookie->data);
     xwindow = xiev->event;
   }
 #endif
 
   GdkWindow* gwind = gdk_window_lookup_for_display(gdisp, xwindow);
 
-  if (RootView* root = FindRootViewForGdkWindow(gwind)) {
+  if (Widget* widget = FindWidgetForGdkWindow(gwind)) {

[Ben Goodger (Google), 2011/03/22 20:49:30]

Can you pull this out to the line above...

Widget* widget = FindWidgetForGdkWindow(gwind);
if (widget) {

I find its current form to look weird.

[James Su, 2011/03/22 22:35:39]

Done.

+    RootView* root = widget->GetRootView();
     switch (xev->type) {
       case KeyPress:
       case KeyRelease: {
         Event::FromNativeEvent2 from_native;
         KeyEvent keyev(xev, from_native);
+        InputMethod* ime = widget->GetInputMethod();
+        // Only dispatch the key event to the input method if the focused view
+        // supports text input, then we can safely return true to prevent the
+        // event from being dispatched to Gtk native widgets.
+        // TODO(suzhe): remove it after getting rid of Gtk.
+        if (ime &&
+            widget->GetFocusManager()->GetFocusedView()->GetTextInputClient()) {
+          ime->DispatchKeyEvent(keyev);
+          return true;
+        }
         return root->ProcessKeyEvent(keyev);
       }
 
       case ButtonPress:
       case ButtonRelease: {
         if (xev->xbutton.button == 4 || xev->xbutton.button == 5) {
           // Scrolling the wheel triggers button press/release events.
           Event::FromNativeEvent2 from_native;
           MouseWheelEvent wheelev(xev, from_native);
           return root->OnMouseWheel(wheelev);
@@ skipping 46 matching lines @@
 }
 
 base::MessagePumpGlibXDispatcher::DispatchStatus
     AcceleratorHandler::DispatchX(XEvent* xev) {
   return DispatchXEvent(xev) ?
       base::MessagePumpGlibXDispatcher::EVENT_PROCESSED :
       base::MessagePumpGlibXDispatcher::EVENT_IGNORED;
 }
 
 }  // namespace views