X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=config.def.h;h=d628b762151fb55dc8e3173c472614668cb5d619;hb=d67de3a9a09ca96c993b987868f28f70ac83fc52;hp=b0dcf54d5046c92339136e10596406206ca373ad;hpb=a1b70380dbfc83b2044cad3ce46f68e2878dd976;p=surf.git

diff --git a/config.def.h b/config.def.h
index b0dcf54..d628b76 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,30 +1,32 @@
 /* modifier 0 means no modifier */
-static GdkColor progress       = { 65535,65535,0,0 };
-static GdkColor progress_trust = { 65535,0,65535,0 };
+static gchar *progress       = "#FF0000";
+static gchar *progress_trust = "#00FF00";
+#define MODKEY GDK_CONTROL_MASK
 static Key keys[] = {
-    /* modifier	            keyval      function        arg             Focus */
-    { GDK_CONTROL_MASK,     GDK_R,      reload,         {.b = TRUE},    ALWAYS },
-    { GDK_CONTROL_MASK,     GDK_r,      reload,         {.b = FALSE},   ALWAYS },
-    { GDK_CONTROL_MASK,     GDK_g,      showurl,        {0},            ALWAYS },
-    { GDK_CONTROL_MASK,     GDK_slash,  showsearch,     {0},            ALWAYS },
-    { 0,                    GDK_Escape, hidesearch,     {0},            ALWAYS },
-    { 0,                    GDK_Escape, hideurl,        {0},            ALWAYS },
-    { GDK_CONTROL_MASK,     GDK_P,      print,          {0},            ALWAYS },
-    { GDK_CONTROL_MASK,     GDK_p,      clipboard,      {.b = TRUE },   BROWSER },
-    { GDK_CONTROL_MASK,     GDK_y,      clipboard,      {.b = FALSE},   BROWSER },
-    { GDK_CONTROL_MASK,     GDK_equal,  zoom,           {.i = +1 },     BROWSER },
-    { GDK_CONTROL_MASK,     GDK_plus,   zoom,           {.i = +1 },     BROWSER },
-    { GDK_CONTROL_MASK,     GDK_minus,  zoom,           {.i = -1 },     BROWSER },
-    { GDK_CONTROL_MASK,     GDK_0,      zoom,           {.i = 0 },      BROWSER },
-    { GDK_CONTROL_MASK,     GDK_l,      navigate,       {.i = +1},      BROWSER },
-    { GDK_CONTROL_MASK,     GDK_h,      navigate,       {.i = -1},      BROWSER },
-    { 0,                    GDK_Escape, stop,           {0},            BROWSER },
-    { GDK_CONTROL_MASK,     GDK_n,      searchtext,     {.b = TRUE},    BROWSER|SEARCHBAR },
-    { GDK_CONTROL_MASK,     GDK_N,      searchtext,     {.b = FALSE},   BROWSER|SEARCHBAR },
-    { 0,                    GDK_Return, searchtext,     {.b = TRUE},    SEARCHBAR },
-    { GDK_SHIFT_MASK,       GDK_Return, searchtext,     {.b = FALSE},   SEARCHBAR },
-    { 0 },
-    { 0,                    GDK_Return, loaduri,        {.v = NULL},    URLBAR },
-    { 0,                    GDK_Return, hideurl,        {0},            URLBAR },
+    /* modifier	            keyval      function    arg             Focus */
+    { MODKEY,               GDK_R,      reload,     { .b = TRUE },  ALWAYS },
+    { MODKEY,               GDK_r,      reload,     { .b = FALSE }, ALWAYS },
+    { MODKEY,               GDK_g,      showurl,    { 0 },          ALWAYS },
+    { MODKEY,               GDK_slash,  showsearch, { 0 },          ALWAYS },
+    { 0,                    GDK_Escape, hidesearch, { 0 },          ALWAYS },
+    { 0,                    GDK_Escape, hideurl,    { 0 },          ALWAYS },
+    { MODKEY,               GDK_P,      print,      { 0 },          ALWAYS },
+    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE },  BROWSER },
+    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE }, BROWSER },
+    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 },    BROWSER },
+    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 },    BROWSER },
+    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  },    BROWSER },
+    { MODKEY,               GDK_l,      navigate,   { .i = +1 },    BROWSER },
+    { MODKEY,               GDK_h,      navigate,   { .i = -1 },    BROWSER },
+    { MODKEY,               GDK_j,      scroll,     { .i = +1 },    BROWSER },
+    { MODKEY,               GDK_k,      scroll,     { .i = -1 },    BROWSER },
+    { 0,                    GDK_Escape, stop,       { 0 },          BROWSER },
+    { MODKEY,               GDK_o,      source,     { 0 },          BROWSER },
+    { MODKEY,               GDK_n,      searchtext, { .b = TRUE },  BROWSER|SEARCHBAR },
+    { MODKEY,               GDK_N,      searchtext, { .b = FALSE }, BROWSER|SEARCHBAR },
+    { 0,                    GDK_Return, searchtext, { .b = TRUE },  SEARCHBAR },
+    { GDK_SHIFT_MASK,       GDK_Return, searchtext, { .b = FALSE }, SEARCHBAR },
+    { 0,                    GDK_Return, loaduri,    { .v = NULL },  URLBAR },
+    { 0,                    GDK_Return, hideurl,    { 0 },          URLBAR },
 };