diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 22:16:51 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 22:16:51 +0000 |
commit | 89fe216da236a9930cfab994a67e3110575e6e87 (patch) | |
tree | a7bbb77a7a9d8033cb4bf26798f043c34f2a590b /chrome/browser/tab_contents | |
parent | 841dfe96f45b4f7b369738f03d881893468bd032 (diff) | |
download | chromium_src-89fe216da236a9930cfab994a67e3110575e6e87.zip chromium_src-89fe216da236a9930cfab994a67e3110575e6e87.tar.gz chromium_src-89fe216da236a9930cfab994a67e3110575e6e87.tar.bz2 |
Implement accelerators in the gtk port.
- Adds accelerators to all the menu items that had them on windows.
- Adds accelerators to back (Alt+left), forward (Alt+right), reload
(Ctr+R) and focus the URL box (Ctr+L).
Review URL: http://codereview.chromium.org/28105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r-- | chrome/browser/tab_contents/web_contents_view_gtk.cc | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/chrome/browser/tab_contents/web_contents_view_gtk.cc b/chrome/browser/tab_contents/web_contents_view_gtk.cc index c63d2bf..8a25381 100644 --- a/chrome/browser/tab_contents/web_contents_view_gtk.cc +++ b/chrome/browser/tab_contents/web_contents_view_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/tab_contents/web_contents_view_gtk.h" +#include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include "base/gfx/point.h" @@ -12,6 +13,8 @@ #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" #include "chrome/browser/tab_contents/web_contents.h" +#include "webkit/glue/webinputevent.h" + namespace { // Callback used in WebContentsViewGtk::CreateViewForWidget(). @@ -116,11 +119,25 @@ void WebContentsViewGtk::TakeFocus(bool reverse) { } void WebContentsViewGtk::HandleKeyboardEvent(const WebKeyboardEvent& event) { - // The renderer returned a keyboard event it did not process. This may be - // a keyboard shortcut that we have to process. - // The windows code forwards this event onwards to accelerator handling, - // and then to DefWindowProc. TODO(port): should do something similar. - NOTIMPLEMENTED(); + // The renderer returned a keyboard event it did not process. This may be a + // keyboard shortcut that we have to process or a cursor key/page up/down + // etc. + switch (event.gdk_keyval) { + case GDK_Page_Up: + case GDK_Page_Down: + case GDK_Left: + case GDK_Right: + case GDK_Up: + case GDK_Down: + NOTIMPLEMENTED() + << "Need better navigation support in HandleKeyboardEvent"; + break; + default: + // This may be an accelerator. Pass it on to GTK. + gtk_accel_groups_activate(G_OBJECT(vbox_->window), + event.gdk_keyval, + GdkModifierType(event.gdk_modifier)); + } } void WebContentsViewGtk::OnFindReply(int request_id, |