small cleanups

[surf.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index e2f1ba3..be44d28 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -1,20 +1,22 @@
 /* modifier 0 means no modifier */
-static gchar *useragent      = "Mozilla/5.0 (X11; U; Linux; en-us) AppleWebKit/531.2+ (KHTML, like Gecko, surf-"VERSION") Safari/531.2+";
-static gchar *progress       = "#FF0000";
-static gchar *progress_trust = "#00FF00";
-static gchar *stylefile      = ".surf/style.css";
-static gchar *scriptfile     = ".surf/script.js";
-static gchar *cookiefile     = ".surf/cookie.txt";
-static gchar *dldir          = ".surf/dl";
+static char *useragent      = "Mozilla/5.0 (X11; U; Linux; en-us) AppleWebKit/531.2+ (KHTML, like Gecko, surf-"VERSION") Safari/531.2+";
+static char *progress       = "#FF0000";
+static char *progress_trust = "#00FF00";
+static char *stylefile      = ".surf/style.css";
+static char *scriptfile     = ".surf/script.js";
+static char *cookiefile     = ".surf/cookies.txt";
+static char *dldir          = ".surf/dl";
+static time_t sessiontime   = 3600;
+
 #define MODKEY GDK_CONTROL_MASK
 static Key keys[] = {
     /* modifier                    keyval      function    arg             Focus */
     { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE },  Any },
     { MODKEY,               GDK_r,      reload,     { .b = FALSE }, Any },
-    { MODKEY,               GDK_g,      showurl,    { 0 },          Any },
+    { MODKEY,               GDK_g,      showuri,    { 0 },          Any },
     { MODKEY,               GDK_slash,  showsearch, { 0 },          Any },
     { 0,                    GDK_Escape, hidesearch, { 0 },          Any },
-    { 0,                    GDK_Escape, hideurl,    { 0 },          Any },
+    { 0,                    GDK_Escape, hideuri,    { 0 },          Any },
     { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 },          Any },
     { MODKEY,               GDK_p,      clipboard,  { .b = TRUE },  Browser },
     { MODKEY,               GDK_y,      clipboard,  { .b = FALSE }, Browser },
@@ -31,7 +33,16 @@ static Key keys[] = {
     { MODKEY|GDK_SHIFT_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,                    GDK_Return, loaduri,    { .v = NULL },  UrlBar },
-    { 0,                    GDK_Return, hideurl,    { 0 },          UrlBar },
+    { 0,                    GDK_Return, loaduri,    { .v = NULL },  UriBar },
+    { 0,                    GDK_Return, hideuri,    { 0 },          UriBar },
 };
 
+static Item items[] = {
+    { "Back",        navigate,  { .i = -1 } },
+    { "Forward",     navigate,  { .i = +1 } },
+    { "New Window",     newwindow, { .v = NULL } },
+    { "Reload",         reload,    { .b = FALSE } },
+    { "Stop",           stop,      { 0 } },
+    { "Paste URI",      clipboard, { .b = TRUE } },
+    { "Copy URI",       clipboard, { .b = FALSE } },
+};