Updating manpage, adding tab colors to settings.in

4 files changed, 145 insertions, 8 deletions

diff --git a/doc/dwb.1 b/doc/dwb.1
index 571aa6b8..27b12f60 100644
--- a/doc/dwb.1
+++ b/doc/dwb.1
@@ -851,6 +851,141 @@ Control W:tabopen http://example.com; 150zoom
 .P
 opens http://example.com in a new tab and zooms to 150%.
 
+.SS COMMAND OVERVIEW
+.nf
+Command                 |Alias           |Description
+-------------------------------------------------------------------------------
+allow_cookie            |cookie          |Allow persistent cookies for site
+allow_session_cookie    |scookie         |Allow session cookies for site
+allow_session_cookie_tmp|tcookie         |Allow session cookies for site
+                        |                |temporarily
+bookmark                |bma, bmark      |Bookmark current page
+bookmarks               |bmas, bmarks    |Show bookmarks 
+buffers                 |bu              |Show all open tabs
+close_tab               |close           |Close tab
+execute_javascript      |exja            |Execute a javascript snippet
+execute_userscript      |                |Execute userscript
+find_backward           |bfind           |Find backward
+find_forward            |ffind           |Find forward
+find_next               |fnext           |Find next
+find_previous           |fprev           |Find previous
+focus_input             |                |Focus next input
+focus_next              |tabnext         |Focus next tab
+focus_prev              |tabprev         |Focus previous tab
+focus_tab               |tab             |Focus nth tab
+fullscreen              |fs              |Toggle fullscreen
+hints                   |hi              |Follow hints
+hints_clipboard         |chints, chi     |Save link location to clipboard
+hints_download          |dhints, dhi     |Download via hints
+hints_editable          |ehints, ehi     |Focus editable elements
+hints_images            |ihints, ihi     |Follow images
+hints_images_tab        |itabhinst, ithi |Follow images in a new tab
+hints_links             |lhints, lhi     |Follow links
+hints_primary           |phints, phi     |Save link location to primary
+                        |                |selection
+hints_rapid             |rhints, rhi     |Open new tabs in background rapidly
+hints_rapid_win         |wrhints, wrhi   |Open new windows rapidly
+hints_tab               |tabhints, thi   |Follow hints in a new tab
+hints_url               |uhints, uhi     |Set hints url in commandline
+hints_url_tab           |utabhints, uthi |Set hints url in commandline, open in
+                        |                |a new tab
+hints_win               |winhints, whi   |Follow hints in a new window
+history_back            |ba, back        |Go back
+history_forward         |fo, forward     |Go forward
+insert_mode             |i, insert       |Insert mode
+lock_domain             |dlock           |Lock tab to current domain
+lock_uri                |ulock           |Lock tab to current uri
+new_tab                 |                |Open next navigation action in new tab
+new_win                 |                |Open next navigation action in new
+                        |                |window
+only                    |                |Close all tabs except for the current
+                        |                |one
+open                    |o               |Open url
+open_editor             |editor          |Open external editor for
+                        |                |input/textarea.
+open_url                |                |Open, edit current url
+paste                   |                |Open from clipboard
+paste_primary           |ppaste          |Open from primary selection
+presentation_mode       |present         |Toggle presentation mode
+print                   |ha              |Print page
+protect                 |prot            |Protect/unprotect tab 
+proxy                   |                |Toggle proxy
+quickmark               |qmarks          |Open quickmark
+quit                    |q               |Quit
+reload                  |re              |Reload current page
+reload_bypass_cache     |refull          |Reload without using cached data
+reload_scripts          |                |Reload all javascript userscripts 
+save                    |                |Save all configuration files
+save_named_session      |wqn             |Save current session with name
+save_quickmark          |qmark, quickmark|Save a quickmark
+save_search_field       |search          |Add a new searchengine 
+save_session            |wq              |Save current session
+scroll_bottom           |bottom          |Scroll to bottom of the page
+scroll_down             |down            |Scroll down
+scroll_halfpage_down    |halfdown        |Scroll one-half page down
+scroll_halfpage_up      |halfup          |Scroll one-half page up
+scroll_left             |left            |Scroll left
+scroll_page_down        |pagedown        |Scroll one page down
+scroll_page_up          |pageup          |Scroll one page up
+scroll_right            |right           |Scroll right 
+scroll_top              |top             |Scroll to the top of the page
+scroll_up               |up              |Scroll up
+set                     |                |Set a setting
+set_key                 |keys            |Set keybinding
+set_setting             |                |Set a setting interactive
+show_keys               |skeys           |Show and modify keyboard configuration
+show_settings           |ssettings       |Show and modify global properties
+start_page              |home            |Open the default homepage
+stop_loading            |st, stop        |Stop loading current page
+tab_bookmarks           |tabmarks        |Show bookmarks, open in new tab
+tab_hist_back           |tba, tabback    |Go back in a new tab
+tab_hist_forward        |tfo, tabforward |Go forward in a new tab
+tab_new                 |                |Open a new blank tab
+tab_paste               |tpaste          |Open from clipboard in a new tab
+tab_paste_primary       |tppaste         |Open from primary selection in a new
+                        |                |tab
+tab_quickmark           |tabqmarks       |Open quickmark in a new tab
+tabopen                 |t, topen        |Open in a new tab
+tabopen_url             |                |Open in a new tab, edit current url
+toggle_bars             |bars            |Toggle tabbar and statusbar
+toggle_hidden_files     |hidden          |Toggle hidden files in directory
+                        |                |listings
+toggle_plugins_host     |hplugin         |Toggle plugin blocker for host
+toggle_plugins_host_tmp |tuplugin        |Toggle plugin blocker for domain for
+                        |                |this session
+toggle_plugins_uri      |uplugin         |Toggle plugin blocker for uri
+toggle_plugins_uri_tmp  |tuplugin        |Toggle plugin blocker for uri for this
+                        |                |session
+toggle_scripts_host     |hscript         |Toggle scripts for current domain
+toggle_scripts_host_tmp |thscript        |Toggle scripts for current host for
+                        |                |this session
+toggle_scripts_uri      |uscript         |Toggle scripts for current uri
+toggle_scripts_uri_tmp  |tuscript        |Toggle scripts for current uri for
+                        |                |this session
+toggle_setting          |tog, toggle     |Toggle a setting
+toggle_statusbar        |sbar            |Toggle statusbar
+toggle_tabbar           |tbar            |Toggle tabbar
+undo                    |u               |Undo closing last tab
+view_source             |so, source      |View page source
+visible                 |vis             |Toggle visibility of a tab
+web_inspector           |insp, inspect   |Open the webinspector
+win_bookmarks           |winmarks        |Show bookmarks, open in new window
+win_hist_back           |wba, winback    |Go back in a new window
+win_hist_forward        |wfo, winforward |Go forward in a new window
+win_paste               |wpaste          |Open from clipboard in a new window
+win_paste_primary       |wppaste         |Open primary selection in a new window
+win_quickmark           |winqmarks       |Open quickmark in a new window
+winopen                 |w, wopen        |Open in a new window
+winopen_url             |                |Open in a new window, edit current url
+yank                    |                |Yank url to clipboard
+yank_primary            |pyank           |Yank url to primary selection
+yank_title              |tyank           |Yank title to clipboard
+yank_title_primary      |tpyank          |Yank title to primary selection
+zoom                    |z               |Zoom
+zoom_in                 |zi              |Zoom in
+zoom_out                |zo              |Zoom out
+.fi
+
 .SH CUSTOMIZATION
 dwb can be  customized in a web interface (command 
 .BR show_settings ) 
diff --git a/src/config.h b/src/config.h
index a7126990..58473600 100644
--- a/src/config.h
+++ b/src/config.h
@@ -187,7 +187,7 @@ static FunctionMap FMAP [] = {
 
   { { "toggle_statusbar",    "Toggle visibility of statusbar" },                 1, 
     (Func) commands_toggle_bars,                                     NULL,     ALWAYS_SM,    
-    { .n = BAR_VIS_STATUS }, EP_NONE, { NULL }, },
+    { .n = BAR_VIS_STATUS }, EP_NONE, { "sbar", NULL }, },
 
   { { "presentation_mode",    "Toggle presentation mode" },                 1, 
     (Func) commands_presentation_mode,                                     NULL,     ALWAYS_SM,    
@@ -282,7 +282,7 @@ static FunctionMap FMAP [] = {
   
   { { "hints",             "Follow hints",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
-    { .n = OPEN_NORMAL, .i = HINT_T_ALL }, EP_NONE, { "hints", "hi",  NULL }, },
+    { .n = OPEN_NORMAL, .i = HINT_T_ALL }, EP_NONE, { "hi",  NULL }, },
   
   { { "hints_links",       "Follow links",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          "No links",                          NEVER_SM,    
@@ -334,7 +334,7 @@ static FunctionMap FMAP [] = {
   
   { { "hints_download",         "Download",                          }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
-    { .n = OPEN_DOWNLOAD }, EP_NONE, { "dhints",  }, },
+    { .n = OPEN_DOWNLOAD }, EP_NONE, { "dhints", "dhi", NULL }, },
   
   { { "history_back",          "Go Back",                           }, 1, 
     (Func)commands_history,        "Beginning of History",            ALWAYS_SM, 
@@ -544,7 +544,7 @@ static FunctionMap FMAP [] = {
   
   { { "tab_paste",              "Open url from clipboard in a new tab",                   }, 1, 
     (Func)commands_paste,               "Clipboard is empty",    ALWAYS_SM, 
-    { .n = OPEN_NEW_VIEW, .p = GDK_NONE, .ro = true }, EP_NONE, { "tabpaste", NULL }, },
+    { .n = OPEN_NEW_VIEW, .p = GDK_NONE, .ro = true }, EP_NONE, { "tpaste", NULL }, },
   
   { { "tab_paste_primary",      "Open url from primary selection in a new window", }, 1, 
     (Func)commands_paste,               "No primary selection",  ALWAYS_SM, 
diff --git a/util/keys.in b/util/keys.in
index 03f8c263..b3ac7130 100644
--- a/util/keys.in
+++ b/util/keys.in
@@ -43,7 +43,7 @@ hints_rapid_win Open new windows rapidly
 
 # bookmark_keys Bookmarks &amp Quickmarks
 bookmark Bookmark current page
-bookmarks Show bookmarks in a pop up menu and open
+bookmarks Show bookmarks in a pop up menu
 tab_bookmarks Show bookmarks in a pop up menu and open in new tab
 win_bookmarks Show bookmarks in a pop up menu and open in new window
 save_quickmark Save a quickmark for this page
@@ -108,7 +108,7 @@ paste Open url from clipboard
 tab_paste Open url from clipboard in a new tab
 win_paste Open url from clipboard in a new window
 paste_primary Open url from primary selection
-tab_paste_primary Open url from primary selection in a new window
+tab_paste_primary Open url from primary selection in a new tab
 win_paste_primary Open url from primary selection in a new window
 yank Yank current url to clipboard
 yank_primary Yank current url to primary selection
diff --git a/util/settings.in b/util/settings.in
index f7f100b8..4f1fd455 100644
--- a/util/settings.in
+++ b/util/settings.in
@@ -58,8 +58,10 @@ status-allowed-color text Color for script blocker, status allowed
 status-blocked-color text Color for script blocker, status blocked
 tab-active-bg-color text Background color of the active tab
 tab-active-fg-color text Foreground color of the active tab
-tab-normal-bg-color text Background color of the normal tab
-tab-normal-fg-color text Foreground color of the normal tab
+tab-normal-bg-color-1 text Background color 1 of the normal tab
+tab-normal-fg-color-1 text Foreground color 1 of the normal tab
+tab-normal-bg-color-2 text Background color 2 of the normal tab
+tab-normal-fg-color-2 text Foreground color 2 of the normal tab
 tab-number-color text Color of the tabnumber
 tab-protected-color text Color of the tabnumber for protected tabs