From: Enno Boland (tox) <tox@s01.de>
Date: Mon, 17 May 2010 21:13:44 +0000 (+0200)
Subject: merge
X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=commitdiff_plain;h=7ce2856194a55a31314c19c81a05008c24076dc8;hp=-c

merge
---

7ce2856194a55a31314c19c81a05008c24076dc8
diff --combined config.def.h
index e6da45b,932b88a..6d2c6cb
--- a/config.def.h
+++ b/config.def.h
@@@ -5,13 -5,14 +5,13 @@@ static char *progress_trust = "#00FF00"
  static char *stylefile      = ".surf/style.css";
  static char *scriptfile     = ".surf/script.js";
  static char *cookiefile     = ".surf/cookies.txt";
- static time_t sessiontime   = 0;
 -static char *dldir          = ".surf/dl/";
+ static time_t sessiontime   = 3600;
  #define NOBACKGROUND 0
  
 -#define SETPROP(p)       { .v = (char *[]){ "/bin/sh", "-c", \
 -	"prop=\"`xprop -id $1 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
 -	"xprop -id $1 -f $0 8s -set $0 \"$prop\"", \
 -	p, winid, NULL } }
 +#define SETPROP(p, q)     { .v = (char *[]){ "/bin/sh", "-c", \
 +	"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
 +	"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
 +	p, q, winid, NULL } }
  #define MODKEY GDK_CONTROL_MASK
  static Key keys[] = {
      /* modifier	            keyval      function    arg             Focus */
@@@ -29,8 -30,19 +29,8 @@@
      { MODKEY,               GDK_k,      scroll,     { .i = -1 } },
      { 0,                    GDK_Escape, stop,       { 0 } },
      { MODKEY,               GDK_o,      source,     { 0 } },
 -    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI") },
 -    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND") },
 +    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
 +    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
      { MODKEY,               GDK_n,      find,       { .b = TRUE } },
      { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
  };
 -
 -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 } },
 -    { "Download",       download,  { 0 } },
 -};