summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Lohmann <20h@r-36.net>2012-11-16 16:12:09 +0100
committerChristoph Lohmann <20h@r-36.net>2012-11-16 16:12:09 +0100
commite7b36f693f184427c51be59e98c5f1bb5904e806 (patch)
tree997c1afc84b1002ade6468c966444c92b8674194
parentd6bbef74fefaf4f5b9943a821867d99a7200f7ed (diff)
downloadsurf-e7b36f693f184427c51be59e98c5f1bb5904e806.tar.gz
surf-e7b36f693f184427c51be59e98c5f1bb5904e806.tar.bz2
surf-e7b36f693f184427c51be59e98c5f1bb5904e806.zip
Adding a surf-open.sh script for easier tabbed(1) integration.
-rw-r--r--README17
-rw-r--r--config.def.h2
-rwxr-xr-xsurf-open.sh32
3 files changed, 49 insertions, 2 deletions
diff --git a/README b/README
index 229d913..c87b69b 100644
--- a/README
+++ b/README
@@ -17,9 +17,22 @@ necessary as root):
make clean install
-
Running surf
------------
run
- surf [URL]
+ surf [URI]
+
+See the manpage for further options.
+
+Running surf in tabbed
+----------------------
+For running surf in tabbed[0] there is a script included in the distribution,
+which is run like this:
+
+ surf-open.sh [URI]
+
+Further invocations of the script will run surf with the specified URI in this
+instance of tabbed.
+
+[0] http://tools.suckless.org/tabbed
diff --git a/config.def.h b/config.def.h
index 0a16f3e..9c1a76a 100644
--- a/config.def.h
+++ b/config.def.h
@@ -13,6 +13,8 @@ static time_t sessiontime = 3600;
static char *cafile = "/etc/ssl/certs/ca-certificates.crt";
static char *strictssl = FALSE; /* Refuse untrusted SSL connections */
static int indicator_thickness = 2;
+
+/* Webkit features */
static Bool spatialbrowsing = TRUE;
static Bool hidebackground = FALSE;
diff --git a/surf-open.sh b/surf-open.sh
new file mode 100755
index 0000000..29036f8
--- /dev/null
+++ b/surf-open.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# See the LICENSE file for copyright and license details.
+#
+
+xidfile="$HOME/tmp/tabbed-surf.xid"
+uri=""
+
+if [ "$#" -gt 0 ];
+then
+ uri="$1"
+fi
+
+runtabbed() {
+ tabbed -dn tabbed-surf -r 2 surf -e '' "$uri" >"$xidfile" \
+ 2>/dev/null &
+}
+
+if [ ! -r "$xidfile" ];
+then
+ runtabbed
+else
+ xid=$(cat "$xidfile")
+ xprop -id "$xid" 2>&1 >/dev/null
+ if [ $? -gt 0 ];
+ then
+ runtabbed
+ else
+ surf -e "$xid" "$uri" 2>&1 >/dev/null &
+ fi
+fi
+