diff options
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/documentwidget.c | 2 | ||||
-rw-r--r-- | src/ui/keys.c | 4 | ||||
-rw-r--r-- | src/ui/keys.h | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c index c725a8f6..68f3c966 100644 --- a/src/ui/documentwidget.c +++ b/src/ui/documentwidget.c | |||
@@ -253,7 +253,7 @@ void init_DocumentWidget(iDocumentWidget *d) { | |||
253 | resizeToParentWidth_WidgetFlag | resizeToParentHeight_WidgetFlag); | 253 | resizeToParentWidth_WidgetFlag | resizeToParentHeight_WidgetFlag); |
254 | #if !defined (iPlatformApple) /* in system menu */ | 254 | #if !defined (iPlatformApple) /* in system menu */ |
255 | addAction_Widget(w, reload_KeyShortcut, "navigate.reload"); | 255 | addAction_Widget(w, reload_KeyShortcut, "navigate.reload"); |
256 | addAction_Widget(w, SDLK_w, KMOD_PRIMARY, "tabs.close"); | 256 | addAction_Widget(w, closeTab_KeyShortcut, "tabs.close"); |
257 | addAction_Widget(w, SDLK_d, KMOD_PRIMARY, "bookmark.add"); | 257 | addAction_Widget(w, SDLK_d, KMOD_PRIMARY, "bookmark.add"); |
258 | addAction_Widget(w, subscribeToPage_KeyModifier, "feeds.subscribe"); | 258 | addAction_Widget(w, subscribeToPage_KeyModifier, "feeds.subscribe"); |
259 | #endif | 259 | #endif |
diff --git a/src/ui/keys.c b/src/ui/keys.c index 5cf071fb..656a52ac 100644 --- a/src/ui/keys.c +++ b/src/ui/keys.c | |||
@@ -80,12 +80,14 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] = | |||
80 | { 45, { "Open link in new tab via home row keys", 'f', KMOD_SHIFT, "document.linkkeys arg:1 newtab:1" }, 0 }, | 80 | { 45, { "Open link in new tab via home row keys", 'f', KMOD_SHIFT, "document.linkkeys arg:1 newtab:1" }, 0 }, |
81 | { 46, { "Hover on link via home row keys", 'h', 0, "document.linkkeys arg:1 hover:1" }, 0 }, | 81 | { 46, { "Hover on link via home row keys", 'h', 0, "document.linkkeys arg:1 hover:1" }, 0 }, |
82 | { 47, { "Next set of home row key links", '.', 0, "document.linkkeys more:1" }, 0 }, | 82 | { 47, { "Next set of home row key links", '.', 0, "document.linkkeys more:1" }, 0 }, |
83 | { 50, { "Add bookmark", 'd', KMOD_PRIMARY, "bookmark.add" }, 0 }, | ||
83 | { 70, { "Zoom in", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" }, 0 }, | 84 | { 70, { "Zoom in", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" }, 0 }, |
84 | { 71, { "Zoom out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" }, 0 }, | 85 | { 71, { "Zoom out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" }, 0 }, |
85 | { 72, { "Reset zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" }, 0 }, | 86 | { 72, { "Reset zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" }, 0 }, |
87 | { 76, { "New tab", newTab_KeyShortcut, "tabs.new" }, 0 }, | ||
88 | { 77, { "Close tab", closeTab_KeyShortcut, "tabs.close" }, 0 }, | ||
86 | { 80, { "Previous tab", prevTab_KeyShortcut, "tabs.prev" }, 0 }, | 89 | { 80, { "Previous tab", prevTab_KeyShortcut, "tabs.prev" }, 0 }, |
87 | { 81, { "Next tab", nextTab_KeyShortcut, "tabs.next" }, 0 }, | 90 | { 81, { "Next tab", nextTab_KeyShortcut, "tabs.next" }, 0 }, |
88 | { 82, { "Close tab", 'c', 0, "tabs.close" }, 0 }, | ||
89 | { 100,{ "Toggle show URL on hover", '/', KMOD_PRIMARY, "prefs.hoverlink.toggle" }, 0 }, | 91 | { 100,{ "Toggle show URL on hover", '/', KMOD_PRIMARY, "prefs.hoverlink.toggle" }, 0 }, |
90 | /* The following cannot currently be changed (built-in duplicates). */ | 92 | /* The following cannot currently be changed (built-in duplicates). */ |
91 | { 1000, { NULL, SDLK_SPACE, KMOD_SHIFT, "scroll.page arg:-1" }, argRepeat_BindFlag }, | 93 | { 1000, { NULL, SDLK_SPACE, KMOD_SHIFT, "scroll.page arg:-1" }, argRepeat_BindFlag }, |
diff --git a/src/ui/keys.h b/src/ui/keys.h index 8bcd4f53..f6f0b465 100644 --- a/src/ui/keys.h +++ b/src/ui/keys.h | |||
@@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ | |||
28 | 28 | ||
29 | #if defined (iPlatformApple) | 29 | #if defined (iPlatformApple) |
30 | # define reload_KeyShortcut SDLK_r, KMOD_PRIMARY | 30 | # define reload_KeyShortcut SDLK_r, KMOD_PRIMARY |
31 | # define newTab_KeyShortcut SDLK_t, KMOD_PRIMARY | ||
32 | # define closeTab_KeyShortcut SDLK_w, KMOD_PRIMARY | ||
31 | # define prevTab_KeyShortcut SDLK_LEFTBRACKET, KMOD_SHIFT | KMOD_PRIMARY | 33 | # define prevTab_KeyShortcut SDLK_LEFTBRACKET, KMOD_SHIFT | KMOD_PRIMARY |
32 | # define nextTab_KeyShortcut SDLK_RIGHTBRACKET, KMOD_SHIFT | KMOD_PRIMARY | 34 | # define nextTab_KeyShortcut SDLK_RIGHTBRACKET, KMOD_SHIFT | KMOD_PRIMARY |
33 | # define navigateBack_KeyShortcut SDLK_LEFT, KMOD_PRIMARY | 35 | # define navigateBack_KeyShortcut SDLK_LEFT, KMOD_PRIMARY |
@@ -40,6 +42,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ | |||
40 | # define subscribeToPage_KeyModifier SDLK_d, KMOD_SHIFT | KMOD_PRIMARY | 42 | # define subscribeToPage_KeyModifier SDLK_d, KMOD_SHIFT | KMOD_PRIMARY |
41 | #else | 43 | #else |
42 | # define reload_KeyShortcut SDLK_r, KMOD_PRIMARY | 44 | # define reload_KeyShortcut SDLK_r, KMOD_PRIMARY |
45 | # define newTab_KeyShortcut SDLK_t, KMOD_PRIMARY | ||
46 | # define closeTab_KeyShortcut SDLK_w, KMOD_PRIMARY | ||
43 | # define prevTab_KeyShortcut SDLK_PAGEUP, KMOD_PRIMARY | 47 | # define prevTab_KeyShortcut SDLK_PAGEUP, KMOD_PRIMARY |
44 | # define nextTab_KeyShortcut SDLK_PAGEDOWN, KMOD_PRIMARY | 48 | # define nextTab_KeyShortcut SDLK_PAGEDOWN, KMOD_PRIMARY |
45 | # define navigateBack_KeyShortcut SDLK_LEFT, KMOD_ALT | 49 | # define navigateBack_KeyShortcut SDLK_LEFT, KMOD_ALT |