This change list improves IME support on Linux. Many corner cases that were n...

chrome/browser/renderer_host/render_widget_host_view_gtk.h

 // Copyright (c) 2006-2009 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_
 
 #include <gdk/gdk.h>
 #include <vector>
 
 #include "base/gfx/native_widget_types.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/owned_widget_gtk.h"
 #include "chrome/common/render_messages.h"
 #include "webkit/glue/plugins/gtk_plugin_container_manager.h"
 #include "webkit/glue/webcursor.h"
 
 class RenderWidgetHost;
+// A conveience wrapper class for GtkIMContext;
+class RenderWidgetHostViewGtkIMContext;
 
 typedef struct _GtkClipboard GtkClipboard;
 typedef struct _GtkSelectionData GtkSelectionData;
 typedef struct _GtkIMContext GtkIMContext;
 
 // -----------------------------------------------------------------------------
 // See comments in render_widget_host_view.h about this class and its members.
 // -----------------------------------------------------------------------------
 class RenderWidgetHostViewGtk : public RenderWidgetHostView {
  public:
@@ skipping 80 matching lines @@
   // Variables used only for popups --------------------------------------------
   // Our parent widget.
   RenderWidgetHostView* parent_host_view_;
   // The native view of our parent, equivalent to
   // parent_host_view_->GetNativeView().
   GtkWidget* parent_;
   // We ignore the first mouse release on popups.  This allows the popup to
   // stay open.
   bool is_popup_first_mouse_release_;
 
-  // The GtkIMContext object.
-  // In terms of the DOM event specification Appendix A
-  //   <http://www.w3.org/TR/DOM-Level-3-Events/keyset.html>,
-  // GTK uses a GtkIMContext object for the following two purposes:
-  //  1. Composing Latin characters (A.1.2), and;
-  //  2. Composing CJK characters with an IME (A.1.3).
-  // Many JavaScript pages assume composed Latin characters are dispatched to
-  // their onkeypress() handlers but not dispatched CJK characters composed
-  // with an IME. To emulate this behavior, we should monitor the status of
-  // this GtkIMContext object and prevent sending Char events when a
-  // GtkIMContext object sends a "commit" signal with the CJK characters
-  // composed by an IME.
-  GtkIMContext* im_context_;
+  // Whether or not this widget was focused before shadowed by another widget.
+  // Used in OnGrabNotify() handler to track the focused state correctly.
+  bool was_focused_before_grab_;
 
-  // Whether or not the above GtkIMContext is composing a CJK text with an IME.
-  // The GtkIMContext object sends a "preedit_start" before it starts composing
-  // a CJK text and a "preedit_end" signal after it finishes composing it.
-  // On the other hand, the GtkIMContext object doesn't send them when
-  // composing Latin texts. So, we monitor the above signals to check whether
-  // or not the GtkIMContext object is composing a CJK text.
-  bool im_is_composing_cjk_text_;
-
-  // Represents the current modifier-key state.
-  // This state is used when GtkIMContext signal handlers create Char events
-  // because they don't use the GdkEventKey objects and cannot get the state.
-  int im_modifier_state_;
+  // A conveience wrapper object for GtkIMContext;
+  scoped_ptr<RenderWidgetHostViewGtkIMContext> im_context_;
 
   // Helper class that lets us allocate plugin containers and move them.
   GtkPluginContainerManager plugin_container_manager_;
 
   // A map of plugin process id -> windows related to that process.
   // Lets us clean up immediately when a plugin process crashes.
   typedef std::multimap<base::ProcessId, gfx::PluginWindowHandle> PluginPidMap;
   PluginPidMap plugin_pid_map_;
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_GTK_H_