OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/gtk/accelerators_gtk.h" | 5 #include "chrome/browser/ui/gtk/accelerators_gtk.h" |
6 | 6 |
7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
8 #include <gdk/gdkkeysyms.h> | 8 #include <gdk/gdkkeysyms.h> |
9 #include <X11/XF86keysym.h> | 9 #include <X11/XF86keysym.h> |
10 | 10 |
(...skipping 16 matching lines...) Expand all Loading... |
27 { XF86XK_Search, IDC_FOCUS_SEARCH, GdkModifierType(0) }, | 27 { XF86XK_Search, IDC_FOCUS_SEARCH, GdkModifierType(0) }, |
28 { GDK_l, IDC_FOCUS_LOCATION, GDK_CONTROL_MASK }, | 28 { GDK_l, IDC_FOCUS_LOCATION, GDK_CONTROL_MASK }, |
29 { GDK_d, IDC_FOCUS_LOCATION, GDK_MOD1_MASK }, | 29 { GDK_d, IDC_FOCUS_LOCATION, GDK_MOD1_MASK }, |
30 { GDK_F6, IDC_FOCUS_LOCATION, GdkModifierType(0) }, | 30 { GDK_F6, IDC_FOCUS_LOCATION, GdkModifierType(0) }, |
31 { XF86XK_OpenURL, IDC_FOCUS_LOCATION, GdkModifierType(0) }, | 31 { XF86XK_OpenURL, IDC_FOCUS_LOCATION, GdkModifierType(0) }, |
32 { XF86XK_Go, IDC_FOCUS_LOCATION, GdkModifierType(0) }, | 32 { XF86XK_Go, IDC_FOCUS_LOCATION, GdkModifierType(0) }, |
33 | 33 |
34 // Tab/window controls. | 34 // Tab/window controls. |
35 { GDK_Page_Down, IDC_SELECT_NEXT_TAB, GDK_CONTROL_MASK }, | 35 { GDK_Page_Down, IDC_SELECT_NEXT_TAB, GDK_CONTROL_MASK }, |
36 { GDK_Page_Up, IDC_SELECT_PREVIOUS_TAB, GDK_CONTROL_MASK }, | 36 { GDK_Page_Up, IDC_SELECT_PREVIOUS_TAB, GDK_CONTROL_MASK }, |
| 37 { GDK_asciitilde, IDC_SELECT_NEXT_MRU_TAB, GDK_CONTROL_MASK }, |
| 38 { GDK_quoteleft, IDC_SELECT_NEXT_MRU_TAB, GDK_CONTROL_MASK }, |
37 { GDK_Page_Down, IDC_MOVE_TAB_NEXT, | 39 { GDK_Page_Down, IDC_MOVE_TAB_NEXT, |
38 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 40 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
39 { GDK_Page_Up, IDC_MOVE_TAB_PREVIOUS, | 41 { GDK_Page_Up, IDC_MOVE_TAB_PREVIOUS, |
40 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 42 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
41 { GDK_Page_Up, IDC_SELECT_PREVIOUS_TAB, GDK_CONTROL_MASK }, | 43 { GDK_Page_Up, IDC_SELECT_PREVIOUS_TAB, GDK_CONTROL_MASK }, |
42 { GDK_w, IDC_CLOSE_TAB, GDK_CONTROL_MASK }, | 44 { GDK_w, IDC_CLOSE_TAB, GDK_CONTROL_MASK }, |
43 { GDK_t, IDC_RESTORE_TAB, | 45 { GDK_t, IDC_RESTORE_TAB, |
44 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 46 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
45 { GDK_t, IDC_NEW_TAB, GDK_CONTROL_MASK }, | 47 { GDK_t, IDC_NEW_TAB, GDK_CONTROL_MASK }, |
46 { GDK_n, IDC_NEW_WINDOW, GDK_CONTROL_MASK }, | 48 { GDK_n, IDC_NEW_WINDOW, GDK_CONTROL_MASK }, |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 all_accelerators_.push_back(std::make_pair(entry.command_id, accelerator)); | 201 all_accelerators_.push_back(std::make_pair(entry.command_id, accelerator)); |
200 | 202 |
201 if (primary_accelerators_.find(entry.command_id) == | 203 if (primary_accelerators_.find(entry.command_id) == |
202 primary_accelerators_.end()) { | 204 primary_accelerators_.end()) { |
203 primary_accelerators_[entry.command_id] = accelerator; | 205 primary_accelerators_[entry.command_id] = accelerator; |
204 } | 206 } |
205 } | 207 } |
206 } | 208 } |
207 | 209 |
208 AcceleratorsGtk::~AcceleratorsGtk() {} | 210 AcceleratorsGtk::~AcceleratorsGtk() {} |
OLD | NEW |