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 <gdk/gdkkeysyms.h>
 #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 327 matching lines @@
 gboolean NativeTextfieldGtk::OnKeyPressEvent(GdkEventKey* event) {
   Textfield::Controller* controller = textfield_->GetController();
   if (controller) {
     Textfield::Keystroke ks(event);
     return controller->HandleKeystroke(textfield_, ks);
   }
   return false;
 }
 
 // static
+gboolean NativeTextfieldGtk::OnActivateHandler(
+    GtkWidget* widget,
+    NativeTextfieldGtk* textfield) {
+  return textfield->OnActivate();
+}
+
+gboolean NativeTextfieldGtk::OnActivate() {
+  GdkEvent* event = gtk_get_current_event();
+  if (!event || event->type != GDK_KEY_PRESS) {
+    return false;
+  }

[James Su, 2010/12/15 06:06:43]

No braces.

[Zachary Kuznia, 2010/12/15 08:23:25]

Done.

+
+  GdkEventKey* key_event = reinterpret_cast<GdkEventKey*>(event);
+  gboolean handled = false;
+
+  Textfield::Controller* controller = textfield_->GetController();
+  if (controller) {
+    Textfield::Keystroke ks(key_event);
+    handled = controller->HandleKeystroke(textfield_, ks);
+  }
+
+  WidgetGtk* widget = static_cast<WidgetGtk*>(GetWidget());
+  if (!handled && widget) {
+    handled = widget->HandleKeyboardEvent(key_event);
+  }

[James Su, 2010/12/15 06:06:43]

No braces.

[Zachary Kuznia, 2010/12/15 08:23:25]

Done.

+  return handled;
+}
+
+// static
 gboolean NativeTextfieldGtk::OnChangedHandler(
     GtkWidget* widget,
     NativeTextfieldGtk* textfield) {
   return textfield->OnChanged();
 }
 
 gboolean NativeTextfieldGtk::OnChanged() {
   textfield_->SyncText();
   Textfield::Controller* controller = textfield_->GetController();
   if (controller)
@@ skipping 26 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_signal_connect_after(widget, "key-press-event",
                    G_CALLBACK(OnKeyPressEventHandler), this);

[James Su, 2010/12/15 06:06:43]

Alignment.

[Zachary Kuznia, 2010/12/15 08:23:25]

Done.

+  // In order to properly trigger Accelerators bound to VKEY_RETURN, we need to
+  // send an event when the widget gets the activate signal.
+  g_signal_connect(widget, "activate", G_CALLBACK(&OnActivateHandler), this);

[James Su, 2010/12/15 06:06:43]

& is not necessary.

[Zachary Kuznia, 2010/12/15 08:23:25]

Done.

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