From 7b3e8dd4ae9e8503766924ee8458f45dbd373660 Mon Sep 17 00:00:00 2001
From: Daniel Carl <danielcarl@gmx.de>
Date: Mon, 13 May 2013 18:53:45 +0200
Subject: [PATCH] Removed short commands for hinting.
Added manual entries for the new short commands.
---
doc/vimb.1.txt | 46 ++++++++++++++++++++++++++--------------------
src/command.c | 20 ++++++++++----------
2 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/doc/vimb.1.txt b/doc/vimb.1.txt
index e22970f..59426ee 100644
--- a/doc/vimb.1.txt
+++ b/doc/vimb.1.txt
@@ -56,24 +56,24 @@ bound to the keybinding.
.SS Open
.TP
-.BI "open [" URI ]
+.BI "open [" URI "], o [" URI ]
Open the give \fIURI\fP into current window. If \fIURI\fP is empty the
configured 'home-page' is opened.
.TP
-.BI "tabopen [" URI ]
+.BI "tabopen [" URI "], t [" URI ]
Open the give \fIURI\fP into a new window. If \fIURI\fP is empty the
configured 'home-page' is opened.
.TP
.B (tab)open-closed
Open the last closed page.
.TP
-.B (tab)open-clipboard
+.B (tab)open-clipboard, (t)oc
Open the url from clipboard.
.SS Input
Switches the browser into Command Mode and prefill the inputbox on th bottom of
the browser with various prefilled content.
.TP
-.BI "input [" "TEXT" "]"
+.BI "input [" TEXT "], in [" TEXT ]
Writes
.I TEXT
into to inputbox and switch to command mode. If no
@@ -90,21 +90,21 @@ is not given use ':' instead.
.SS Navigate
Following commands are used to navigate within the browser history.
.TP
-.BI [ N "]back"
+.BI [ N "]back, [" N "]ba"
Move
. I N
steps back in browser history.
.TP
-.BI [ N "]forward"
+.BI [ N "]forward, [" N "]fo"
Move \fIN\fP steps back in browser history.
.TP
-.B reload
+.B reload, re
Reload the current viewed url.
.TP
-.B reload!
+.B reload!, re!
Discard any caches and reload the current viewed url.
.TP
-.B stop
+.B stop, st
Stop loading the current url.
.SS Scroll
Following commands are used to scroll ad jump within the current view.
@@ -211,10 +211,10 @@ Start hinting to open inputboxes or textareas with external editor. If
\fIPREFIX\fP is given, print this into the inputbox, default ';e'.
.SS Yank
.TP
-.B yank-uri
+.B yank-uri, yu
Yank the current url to the primary and secondary clipboard.
.TP
-.B yank-selection
+.B yank-selection, ys
Yank the selected text into the primary and secondary clipboard.
.SS Shortcuts
Shortcuts allows to open URL build up from a named template with additional
@@ -259,13 +259,19 @@ Show the current set value of variable
Toggle the value of boolean variable \fIVAR\fP and display the new set value.
.SS Zoom
.TP
-.BI [ N "]zoomin, [" N "]zoomout"
-Zoom \fIN\fP steps in or out of the current page - effects only the text.
+.BI [ N "]zoomin, [" N "]zi"
+Zoom \fIN\fP steps in of the current page - effects only the text.
.TP
-.BI [ N "]zoominfull, [" N "]zoomoutfull"
-Zoom \fIN\fP steps in or out of the current page - effecting all elements.
+.BI [ N "]zoomout, [" N "]zo"
+Zoom \fIN\fP steps out of the current page - effects only the text.
.TP
-.B zoomreset
+.BI [ N "]zoominfull, [" N "]zif"
+Zoom \fIN\fP steps in of the current page - effecting all elements.
+.TP
+.BI [ N "]zoomoutfull, [" N "]zof"
+Zoom \fIN\fP steps out of the current page - effecting all elements.
+.TP
+.B zoomreset, zr
Reset the zoomlevel to the default value.
.SS History
.TP
@@ -277,11 +283,11 @@ into inputbox that begins with \fI[:/?]\fP. So the history contains real
commands and search queries.
.SS Bookmark
.TP
-.BI "bookmark-add [" TAGS "]"
+.BI "bookmark-add [" TAGS "], bma [" TAGS ]
Save the current opened uri with \fITAGS\fP to the bookmark file.
.SS Misc
.TP
-.B next, prev
+.B next, n, prev, p
This are wrapper commands to start completion and to step through the
completion items, or to focus previous or next hints if hinting is active.
@@ -322,13 +328,13 @@ Search in current page forward or backward.
Toggles the webinspector for current page. This is only available if the config
"webinspector" is enabled.
.TP
-.B quit
+.B quit, q
Close the browser.
.TP
.B source
Toggle between normal view and source view for the current page.
.TP
-.BI eval " JAVASCRIPT"
+.BI eval " JAVASCRIPT" ", e" " JAVASCRIPT"
Runs the given \fIJAVASCRIPT\fP in the current page and display the evaluated
value.
diff --git a/src/command.c b/src/command.c
index f23ea47..7d2058d 100644
--- a/src/command.c
+++ b/src/command.c
@@ -81,8 +81,8 @@ static CommandInfo cmd_list[] = {
{"source", NULL, command_view_source, {0}},
{"back", "ba", command_navigate, {VB_NAVIG_BACK}},
{"forward", "fo", command_navigate, {VB_NAVIG_FORWARD}},
- {"reload", "rel", command_navigate, {VB_NAVIG_RELOAD}},
- {"reload!", "rel!", command_navigate, {VB_NAVIG_RELOAD_FORCE}},
+ {"reload", "re", command_navigate, {VB_NAVIG_RELOAD}},
+ {"reload!", "re!", command_navigate, {VB_NAVIG_RELOAD_FORCE}},
{"stop", "st", command_navigate, {VB_NAVIG_STOP_LOADING}},
{"jumpleft", NULL, command_scroll, {VB_SCROLL_TYPE_JUMP | VB_SCROLL_DIRECTION_LEFT}},
{"jumpright", NULL, command_scroll, {VB_SCROLL_TYPE_JUMP | VB_SCROLL_DIRECTION_RIGHT}},
@@ -104,14 +104,14 @@ static CommandInfo cmd_list[] = {
{"cunmap", NULL, command_unmap, {VB_MODE_COMMAND}},
{"set", NULL, command_set, {0}},
{"inspect", NULL, command_inspect, {0}},
- {"hint-link", "ho", command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_OPEN, "."}},
- {"hint-link-new", "hto", command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_OPEN | HINTS_OPEN_NEW, ","}},
- {"hint-input-open", "hio", command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_INPUT, ";o"}},
- {"hint-input-tabopen", "hito", command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_INPUT | HINTS_OPEN_NEW, ";t"}},
- {"hint-yank", "hy", command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_YANK, ";y"}},
- {"hint-image-open", "hio", command_hints, {HINTS_TYPE_IMAGE | HINTS_PROCESS_OPEN, ";i"}},
- {"hint-image-tabopen", "hito", command_hints, {HINTS_TYPE_IMAGE | HINTS_PROCESS_OPEN | HINTS_OPEN_NEW, ";I"}},
- {"hint-editor", "he", command_hints, {HINTS_TYPE_EDITABLE, ";e"}},
+ {"hint-link", NULL, command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_OPEN, "."}},
+ {"hint-link-new", NULL, command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_OPEN | HINTS_OPEN_NEW, ","}},
+ {"hint-input-open", NULL, command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_INPUT, ";o"}},
+ {"hint-input-tabopen", NULL, command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_INPUT | HINTS_OPEN_NEW, ";t"}},
+ {"hint-yank", NULL, command_hints, {HINTS_TYPE_LINK | HINTS_PROCESS_YANK, ";y"}},
+ {"hint-image-open", NULL, command_hints, {HINTS_TYPE_IMAGE | HINTS_PROCESS_OPEN, ";i"}},
+ {"hint-image-tabopen", NULL, command_hints, {HINTS_TYPE_IMAGE | HINTS_PROCESS_OPEN | HINTS_OPEN_NEW, ";I"}},
+ {"hint-editor", NULL, command_hints, {HINTS_TYPE_EDITABLE, ";e"}},
{"yank-uri", "yu", command_yank, {VB_CLIPBOARD_PRIMARY | VB_CLIPBOARD_SECONDARY | COMMAND_YANK_URI}},
{"yank-selection", "ys", command_yank, {VB_CLIPBOARD_PRIMARY | VB_CLIPBOARD_SECONDARY | COMMAND_YANK_SELECTION}},
{"search-forward", NULL, command_search, {VB_SEARCH_FORWARD}},
--
2.20.1