viking

commit 3b6efb1ca4c850ec084d1972e3fe32196c93274f
parent b68bbf0911fd7845b0623a8d1a5a13bb51723daa
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Fri, 14 Dec 2012 15:39:10 -0700

keymap: nuke w, o, x hotkeys until input method signals are avail

Diffstat:
M
src/keymap.h
 | 
15
++++++++-------

1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/keymap.h b/src/keymap.h
@@ -61,7 +61,7 @@ static Key keys[] = {
 	{ "Control",  0,      "o",    navigate,   {NavigationForward} },
 	{ 0,          0,      "H",    navigate,   {NavigationBack} },
 	{ 0,          0,      "L",    navigate,   {NavigationForward} },
-	{ 0,          0,      "r",    navigate,   {NavigationReload} },
+	// { 0,          0,      "r",    navigate,   {NavigationReload} },
 	{ 0,          0,      "R",    navigate,   {NavigationForceReload} },
 	{ 0,          0,      "c",    navigate,   {NavigationCancel} },
 
@@ -95,11 +95,11 @@ static Key keys[] = {
 	{ 0,          0,      "N",    search,     {DirectionPrev     | CaseInsensitive   | Wrapping} },
 
 	{ 0,          0,      "colon", input,     {.s = ":" } },
-	{ 0,          0,      "o",    input,      {.s = ":open "} },
+	// { 0,          0,      "o",    input,      {.s = ":open "} },
 	{ 0,          0,      "O",    input,      {.s = ":open ", .i = InsertCurrentURL} },
-	{ 0,          0,      "t",    input,      {.s = ":tabopen "} },
+	// { 0,          0,      "t",    input,      {.s = ":tabopen "} },
 	{ 0,          0,      "T",    input,      {.s = ":tabopen ", .i = InsertCurrentURL} },
-	{ 0,          0,      "w",    input,      {.s = ":winopen "} },
+	// { 0,          0,      "w",    input,      {.s = ":winopen "} },
 	{ 0,          0,      "W",    input,      {.s = ":winopen ", .i = InsertCurrentURL} },
 	{ 0,          0,      "slash",    input,      {.s = "/"} },
 	//    { 0,          0,      GDK_KP_Divide,  input,      {.s = "/"} },
@@ -128,10 +128,9 @@ static Key keys[] = {
 	{ 0,          'g',    "i",    focus_input,{} },
 	{ 0,          0,      "u",    revive,     {} },
 
-	{ 0,          0,      "x",    buffer,       {0} },
+	// { 0,          0,      "x",    buffer,       {0} },
 	// { 0,          0,      "X",    revive_last_tab,       {0} },
 	{ 0,          0,      "b",    switch_buffer, {0}},
-	{ 0,          0,      "i",    inspector, {0} },
 	/* leave this last line as last */
 	{ 0,          0,      0,      0,          {0} },
 };
@@ -139,7 +138,8 @@ static Key keys[] = {
 /* command mapping */
 static Command commands[] = {
 	/* command,               function,         argument */
-	{ "b",                    switch_buffer,   {0} },
+	{ "b",                    switch_buffer,    {0} },
+	{ "bdelete",              buffer,           {0} },
 	{ "ba",                   navigate,         {NavigationBack} },
 	{ "back",                 navigate,         {NavigationBack} },
 	{ "ec",                   script,           {Info} },
@@ -149,6 +149,7 @@ static Command commands[] = {
 	{ "fw",                   navigate,         {NavigationForward} },
 	{ "fo",                   navigate,         {NavigationForward} },
 	{ "forward",              navigate,         {NavigationForward} },
+	{ "inspector",            inspector,        {0} },
 	{ "javascript",           script,           {Silent} },
 	{ "o",                    open_arg,         {TargetCurrent} },
 	{ "open",                 open_arg,         {TargetCurrent} },