Forward unhandled KeyEvents to WidgetGtk's HandleKeyboardEvent() in native textfields.

views/controls/textfield/native_textfield_gtk.cc

 // Copyright (c) 2010 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 <gtk/gtk.h>
 
 #include "views/controls/textfield/native_textfield_gtk.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/gtk_util.h"
 #include "gfx/insets.h"
 #include "gfx/skia_utils_gtk.h"
 #include "views/controls/textfield/gtk_views_entry.h"
 #include "views/controls/textfield/gtk_views_textview.h"
 #include "views/controls/textfield/textfield.h"
+#include "views/widget/widget_gtk.h"
 
 namespace views {
 
 // A character used to hide a text in password mode.
 static const char kPasswordChar = '*';
 
 // Border width for GtkTextView.
 const int kTextViewBorderWidth = 4;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 318 matching lines @@
 
 // static
 gboolean NativeTextfieldGtk::OnKeyPressEventHandler(
     GtkWidget* widget,
     GdkEventKey* event,
     NativeTextfieldGtk* textfield) {
   return textfield->OnKeyPressEvent(event);
 }
 
 gboolean NativeTextfieldGtk::OnKeyPressEvent(GdkEventKey* event) {
+  bool handled = false;
+
   Textfield::Controller* controller = textfield_->GetController();
   if (controller) {
     Textfield::Keystroke ks(event);
-    return controller->HandleKeystroke(textfield_, ks);
+    handled = controller->HandleKeystroke(textfield_, ks);
   }
-  return false;
+
+  // If the controller doesn't handle the event, invite the widget's
+  // keyboard event handler.  This picks up accelerators that would otherwise be
+  // lost to the widget.
+  if (!handled) {
+    WidgetGtk* widget = static_cast<WidgetGtk*>(GetWidget());
+    if (widget)
+      handled = widget->HandleKeyboardEvent(event);
+  }
+  return handled;

[James Su, 2010/12/02 08:37:24]

This approach can cause problem as it handles a key event before sending it to
the native widget. As I said, all keyboard events should be sent to the native
widget before being handled in views.
Actually the original OnKeyPressEvent() method already has this issue.

Hooking "activate" signal should be the best approach. Just call
widget->HandleKeyboardEvent(gtk_get_current_event()) in the signal handler. Of
course, it's better to check if the current event is a key press event.

 }
 
 // static
 gboolean NativeTextfieldGtk::OnChangedHandler(
     GtkWidget* widget,
     NativeTextfieldGtk* textfield) {
   return textfield->OnChanged();
 }
 
 gboolean NativeTextfieldGtk::OnChanged() {
@@ skipping 30 matching lines @@
   if (GTK_IS_TEXT_VIEW(widget)) {
     GtkTextBuffer* text_buffer = gtk_text_view_get_buffer(
         GTK_TEXT_VIEW(widget));
     g_signal_connect(text_buffer, "changed",
                      G_CALLBACK(OnChangedHandler), this);
   } else {
     g_signal_connect(widget, "changed",
                      G_CALLBACK(OnChangedHandler), this);
   }
   g_signal_connect(widget, "key-press-event",
                    G_CALLBACK(OnKeyPressEventHandler), this);

[James Su, 2010/12/02 08:37:24]

We need to use g_signal_connect_after() here to make sure all key events will be
handled by the native widget first.

 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWrapper, public:
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldGtk(field);
 }
 
 }  // namespace views