OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <Carbon/Carbon.h> | 5 #include <Carbon/Carbon.h> |
6 | 6 |
7 #include "chrome/browser/global_keyboard_shortcuts_mac.h" | 7 #include "chrome/browser/global_keyboard_shortcuts_mac.h" |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "chrome/app/chrome_dll_resource.h" | 10 #include "chrome/app/chrome_dll_resource.h" |
11 | 11 |
12 const KeyboardShortcutData* GetWindowKeyboardShortcutTable | 12 const KeyboardShortcutData* GetWindowKeyboardShortcutTable |
13 (size_t* num_entries) { | 13 (size_t* num_entries) { |
14 static const KeyboardShortcutData keyboard_shortcuts[] = { | 14 static const KeyboardShortcutData keyboard_shortcuts[] = { |
15 {true, true, false, kVK_ANSI_RightBracket, IDC_SELECT_NEXT_TAB}, | 15 {true, true, false, kVK_ANSI_RightBracket, IDC_SELECT_NEXT_TAB}, |
16 {false, false, true, kVK_PageDown, IDC_SELECT_NEXT_TAB}, | 16 {false, false, true, kVK_PageDown, IDC_SELECT_NEXT_TAB}, |
17 {false, false, true, kVK_Tab, IDC_SELECT_NEXT_TAB}, | 17 {false, false, true, kVK_Tab, IDC_SELECT_NEXT_TAB}, |
18 {true, true, false, kVK_ANSI_LeftBracket, IDC_SELECT_PREVIOUS_TAB}, | 18 {true, true, false, kVK_ANSI_LeftBracket, IDC_SELECT_PREVIOUS_TAB}, |
19 {false, false, true, kVK_PageUp, IDC_SELECT_PREVIOUS_TAB}, | 19 {false, false, true, kVK_PageUp, IDC_SELECT_PREVIOUS_TAB}, |
20 {false, true, true, kVK_Tab, IDC_SELECT_PREVIOUS_TAB}, | 20 {false, true, true, kVK_Tab, IDC_SELECT_PREVIOUS_TAB}, |
21 // Cmd-0..8 select the Nth tab, with cmd-9 being "last tab". | 21 // Cmd-0..8 select the Nth tab, with cmd-9 being "last tab". |
22 {true, false, false, kVK_ANSI_1, IDC_SELECT_TAB_0}, | 22 {true, false, false, kVK_ANSI_1, IDC_SELECT_TAB_0}, |
23 {true, false, false, kVK_ANSI_2, IDC_SELECT_TAB_1}, | 23 {true, false, false, kVK_ANSI_2, IDC_SELECT_TAB_1}, |
24 {true, false, false, kVK_ANSI_3, IDC_SELECT_TAB_2}, | 24 {true, false, false, kVK_ANSI_3, IDC_SELECT_TAB_2}, |
25 {true, false, false, kVK_ANSI_4, IDC_SELECT_TAB_3}, | 25 {true, false, false, kVK_ANSI_4, IDC_SELECT_TAB_3}, |
26 {true, false, false, kVK_ANSI_5, IDC_SELECT_TAB_4}, | 26 {true, false, false, kVK_ANSI_5, IDC_SELECT_TAB_4}, |
27 {true, false, false, kVK_ANSI_6, IDC_SELECT_TAB_5}, | 27 {true, false, false, kVK_ANSI_6, IDC_SELECT_TAB_5}, |
28 {true, false, false, kVK_ANSI_7, IDC_SELECT_TAB_6}, | 28 {true, false, false, kVK_ANSI_7, IDC_SELECT_TAB_6}, |
29 {true, false, false, kVK_ANSI_8, IDC_SELECT_TAB_7}, | 29 {true, false, false, kVK_ANSI_8, IDC_SELECT_TAB_7}, |
30 {true, false, false, kVK_ANSI_9, IDC_SELECT_LAST_TAB}, | 30 {true, false, false, kVK_ANSI_9, IDC_SELECT_LAST_TAB}, |
31 }; | 31 }; |
32 | 32 |
33 *num_entries = arraysize(keyboard_shortcuts); | 33 *num_entries = arraysize(keyboard_shortcuts); |
34 | 34 |
35 return keyboard_shortcuts; | 35 return keyboard_shortcuts; |
36 } | 36 } |
37 | 37 |
38 const KeyboardShortcutData* GetBrowserKeyboardShortcutTable | 38 const KeyboardShortcutData* GetBrowserKeyboardShortcutTable |
39 (size_t* num_entries) { | 39 (size_t* num_entries) { |
40 static const KeyboardShortcutData keyboard_shortcuts[] = { | 40 static const KeyboardShortcutData keyboard_shortcuts[] = { |
41 {true, false, false, kVK_LeftArrow, IDC_BACK}, | 41 {true, false, false, kVK_LeftArrow, IDC_BACK}, |
42 {true, false, false, kVK_RightArrow, IDC_FORWARD}, | 42 {true, false, false, kVK_RightArrow, IDC_FORWARD}, |
| 43 {false, false, false, kVK_Delete, IDC_BACK}, |
| 44 {false, true, false, kVK_Delete, IDC_FORWARD}, |
43 }; | 45 }; |
44 | 46 |
45 *num_entries = arraysize(keyboard_shortcuts); | 47 *num_entries = arraysize(keyboard_shortcuts); |
46 | 48 |
47 return keyboard_shortcuts; | 49 return keyboard_shortcuts; |
48 } | 50 } |
49 | 51 |
50 static int CommandForKeyboardShortcut( | 52 static int CommandForKeyboardShortcut( |
51 const KeyboardShortcutData* (*get_keyboard_shortcut_table)(size_t*), | 53 const KeyboardShortcutData* (*get_keyboard_shortcut_table)(size_t*), |
52 bool command_key, bool shift_key, bool cntrl_key, int vkey_code) { | 54 bool command_key, bool shift_key, bool cntrl_key, int vkey_code) { |
(...skipping 23 matching lines...) Expand all Loading... |
76 command_key, shift_key, | 78 command_key, shift_key, |
77 cntrl_key, vkey_code); | 79 cntrl_key, vkey_code); |
78 } | 80 } |
79 | 81 |
80 int CommandForBrowserKeyboardShortcut( | 82 int CommandForBrowserKeyboardShortcut( |
81 bool command_key, bool shift_key, bool cntrl_key, int vkey_code) { | 83 bool command_key, bool shift_key, bool cntrl_key, int vkey_code) { |
82 return CommandForKeyboardShortcut(GetBrowserKeyboardShortcutTable, | 84 return CommandForKeyboardShortcut(GetBrowserKeyboardShortcutTable, |
83 command_key, shift_key, | 85 command_key, shift_key, |
84 cntrl_key, vkey_code); | 86 cntrl_key, vkey_code); |
85 } | 87 } |
OLD | NEW |