3 files changed, 37 insertions(+), 3 deletions(-)

M Makefile
M config.def.h
M surf.c

@@ 3,10 3,10 @@
 
 include config.mk
 
-SRC = surf.c
+SRC = surf.c tabbed.c
 OBJ = ${SRC:.c=.o}
 
-all: options surf
+all: options surf tabbed
 
 options:
 	@echo surf build options:


@@ 24,10 24,14 @@ config.h:
 	@echo creating $@ from config.def.h
 	@cp config.def.h $@
 
-surf: ${OBJ}
+surf: surf.o
 	@echo CC -o $@
 	@${CC} -o $@ surf.o ${LDFLAGS}
 
+tabbed: tabbed.o
+	@echo CC -o $@
+	@${CC} -o $@ tabbed.o ${LDFLAGS}
+
 clean:
 	@echo cleaning
 	@rm -f surf ${OBJ} surf-${VERSION}.tar.gz

@@ 1,3 1,4 @@
+#ifdef SURF
 /* modifier 0 means no modifier */
 static GdkColor progress       = { 65535,65535,0,0 };
 static GdkColor progress_trust = { 65535,0,65535,0 };


@@ 27,4 28,32 @@ static Key keys[] = {
     { 0,                    GDK_Return, loaduri,        {.v = NULL},    URLBAR },
     { 0,                    GDK_Return, hideurl,        {0},            URLBAR },
 };
+#else
 
+static const char font[]            = "-*-proggytiny-*-*-*-*-*-*-*-*-*-*-*-*";
+static const char normbgcolor[]     = "#202020";
+static const char normfgcolor[]     = "#c0c0c0";
+static const char selbgcolor[]      = "#884400";
+static const char selfgcolor[]      = "#f0f0f0";
+
+static const char *surfexec[]       = { "surf", "-x" };
+
+#define MODKEY ControlMask
+Key keys[] = { \
+	/* modifier                     key        function        argument */
+	{ MODKEY|ShiftMask,             XK_Return, newtab,         { 0 } },
+	{ MODKEY,                       XK_t,      newtab,         { 0 } },
+	{ MODKEY|ShiftMask,             XK_l,      rotate,         { .i = +1 } },
+	{ MODKEY|ShiftMask,             XK_h,      rotate,         { .i = -1 } },
+	{ MODKEY|ShiftMask,             XK_1,      move,           { .i = 1 } },
+	{ MODKEY|ShiftMask,             XK_2,      move,           { .i = 2 } },
+	{ MODKEY|ShiftMask,             XK_3,      move,           { .i = 3 } },
+	{ MODKEY|ShiftMask,             XK_4,      move,           { .i = 4 } },
+	{ MODKEY|ShiftMask,             XK_5,      move,           { .i = 5 } },
+	{ MODKEY|ShiftMask,             XK_6,      move,           { .i = 6 } },
+	{ MODKEY|ShiftMask,             XK_7,      move,           { .i = 7 } },
+	{ MODKEY|ShiftMask,             XK_8,      move,           { .i = 8 } },
+	{ MODKEY|ShiftMask,             XK_9,      move,           { .i = 9 } },
+	{ MODKEY|ShiftMask,             XK_0,      move,           { .i = 0 } },
+};
+#endif

@@ 112,6 112,7 @@ static void usage();
 static void update(Client *c, const gchar *title);
 static void zoom(Client *c, const Arg *arg);
 
+#define SURF
 #include "config.h"
 
 void