tabbed: 0.7-1

3 files changed, 53 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a9774ea7494..3398dec09b20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = tabbed
 	pkgdesc = Simple generic tabbed fronted to xembed aware applications.
-	pkgver = 0.6
-	pkgrel = 3
+	pkgver = 0.7
+	pkgrel = 1
 	url = https://tools.suckless.org/tabbed
 	install = tabbed.install
 	arch = x86_64
 	license = custom:MIT/X
 	depends = libx11
-	source = https://dl.suckless.org/tools/tabbed-0.6.tar.gz
+	source = https://dl.suckless.org/tools/tabbed-0.7.tar.gz
 	source = config.h
-	sha256sums = 7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42
-	sha256sums = b53a40916d44090c31cdf5b259336deb70b79d15888f6941e7b8d216370cda55
+	sha256sums = 6e8682230a213d7dabf8a79306bd3ce023875b2295a9097db427d65c1c68f322
+	sha256sums = 2eb768bcf6474522b7765643318cb6b0178f3ad92fec3c869403db99b1a8cbaa
 
 pkgname = tabbed
-
diff --git a/PKGBUILD b/PKGBUILD
index 5fab0f70ba61..b16c87100e4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Yusuf Aktepe <yusuf@yusufaktepe.com>
+# Maintainer: Vlad Glagolev <scm(at)vaygr(dot)net>
+# Contributor: Yusuf Aktepe <yusuf@yusufaktepe.com>
 # Contributor: Lukas Fleischer <lfleischer@archlinux.org>
 # Contributor: totoloco <totoloco at gmx>
 
 pkgname=tabbed
-pkgver=0.6
-pkgrel=3
+pkgver=0.7
+pkgrel=1
 pkgdesc='Simple generic tabbed fronted to xembed aware applications.'
 arch=('x86_64')
 url='https://tools.suckless.org/tabbed'
@@ -13,8 +14,8 @@ depends=('libx11')
 install='tabbed.install'
 source=("https://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz"
         'config.h')
-sha256sums=('7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42'
-            'b53a40916d44090c31cdf5b259336deb70b79d15888f6941e7b8d216370cda55')
+sha256sums=('6e8682230a213d7dabf8a79306bd3ce023875b2295a9097db427d65c1c68f322'
+            '2eb768bcf6474522b7765643318cb6b0178f3ad92fec3c869403db99b1a8cbaa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,6 +25,7 @@ build() {
   sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
   sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
   sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
+  sed -i '/xembed.1/d' Makefile
 
   make
 }
diff --git a/config.h b/config.h
index ceda9f704531..defa426a093c 100644
--- a/config.h
+++ b/config.h
@@ -1,15 +1,19 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const char font[]        = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
+static const char font[]        = "monospace:size=9";
 static const char* normbgcolor  = "#222222";
 static const char* normfgcolor  = "#cccccc";
 static const char* selbgcolor   = "#555555";
 static const char* selfgcolor   = "#ffffff";
+static const char* urgbgcolor   = "#111111";
+static const char* urgfgcolor   = "#cc0000";
 static const char before[]      = "<";
 static const char after[]       = ">";
+static const char titletrim[]   = "...";
 static const int  tabwidth      = 200;
 static const Bool foreground    = True;
+static       Bool urgentswitch  = False;
 
 /*
  * Where to place a new tab when it is opened. When npisrelative is True,
@@ -20,39 +24,43 @@ static int  newposition   = 0;
 static Bool npisrelative  = False;
 
 #define SETPROP(p) { \
-	.v = (char *[]){ "/bin/sh", "-c", \
-		"prop=\"`xwininfo -children -id $1 | grep '^     0x' | sed -e's@^ *\\(0x[0-9a-f]*\\) \"\\([^\"]*\\)\".*@\\1 \\2@' | xargs -0 printf %b | dmenu -l 10`\" &&" \
-		"xprop -id $1 -f $0 8s -set $0 \"$prop\"", \
-		p, winid, NULL \
-	} \
+        .v = (char *[]){ "/bin/sh", "-c", \
+                "prop=\"`xwininfo -children -id $1 | grep '^     0x' |" \
+                "sed -e's@^ *\\(0x[0-9a-f]*\\) \"\\([^\"]*\\)\".*@\\1 \\2@' |" \
+                "xargs -0 printf %b | dmenu -l 10 -w $1`\" &&" \
+                "xprop -id $1 -f $0 8s -set $0 \"$prop\"", \
+                p, winid, NULL \
+        } \
 }
 
 #define MODKEY ControlMask
-static Key keys[] = { \
-	/* modifier                     key        function        argument */
-	{ MODKEY|ShiftMask,             XK_Return, focusonce,      { 0 } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          { 0 } },
-	{ MODKEY,                       XK_t,      spawn,          SETPROP("_TABBED_SELECT_TAB") },
-
-	{ MODKEY|ShiftMask,             XK_l,      rotate,         { .i = +1 } },
-	{ MODKEY|ShiftMask,             XK_h,      rotate,         { .i = -1 } },
-	{ MODKEY|ShiftMask,             XK_j,      movetab,        { .i = -1 } },
-	{ MODKEY|ShiftMask,             XK_k,      movetab,        { .i = +1 } },
-	{ MODKEY,                       XK_Tab,    rotate,         { .i = 0 } },
-
-	{ MODKEY,                       XK_1,      move,           { .i = 0 } },
-	{ MODKEY,                       XK_2,      move,           { .i = 1 } },
-	{ MODKEY,                       XK_3,      move,           { .i = 2 } },
-	{ MODKEY,                       XK_4,      move,           { .i = 3 } },
-	{ MODKEY,                       XK_5,      move,           { .i = 4 } },
-	{ MODKEY,                       XK_6,      move,           { .i = 5 } },
-	{ MODKEY,                       XK_7,      move,           { .i = 6 } },
-	{ MODKEY,                       XK_8,      move,           { .i = 7 } },
-	{ MODKEY,                       XK_9,      move,           { .i = 8 } },
-	{ MODKEY,                       XK_0,      move,           { .i = 9 } },
-
-	{ MODKEY,                       XK_q,      killclient,     { 0 } },
-
-	{ 0,                            XK_F11,    fullscreen,     { 0 } },
-};
+static Key keys[] = {
+	/* modifier             key        function     argument */
+	{ MODKEY|ShiftMask,     XK_Return, focusonce,   { 0 } },
+	{ MODKEY|ShiftMask,     XK_Return, spawn,       { 0 } },
+
+	{ MODKEY|ShiftMask,     XK_l,      rotate,      { .i = +1 } },
+	{ MODKEY|ShiftMask,     XK_h,      rotate,      { .i = -1 } },
+	{ MODKEY|ShiftMask,     XK_j,      movetab,     { .i = -1 } },
+	{ MODKEY|ShiftMask,     XK_k,      movetab,     { .i = +1 } },
+	{ MODKEY,               XK_Tab,    rotate,      { .i = 0 } },
+
+	{ MODKEY,               XK_grave,  spawn,       SETPROP("_TABBED_SELECT_TAB") },
+	{ MODKEY,               XK_1,      move,        { .i = 0 } },
+	{ MODKEY,               XK_2,      move,        { .i = 1 } },
+	{ MODKEY,               XK_3,      move,        { .i = 2 } },
+	{ MODKEY,               XK_4,      move,        { .i = 3 } },
+	{ MODKEY,               XK_5,      move,        { .i = 4 } },
+	{ MODKEY,               XK_6,      move,        { .i = 5 } },
+	{ MODKEY,               XK_7,      move,        { .i = 6 } },
+	{ MODKEY,               XK_8,      move,        { .i = 7 } },
+	{ MODKEY,               XK_9,      move,        { .i = 8 } },
+	{ MODKEY,               XK_0,      move,        { .i = 9 } },
 
+	{ MODKEY,               XK_q,      killclient,  { 0 } },
+
+	{ MODKEY,               XK_u,      focusurgent, { 0 } },
+	{ MODKEY|ShiftMask,     XK_u,      toggle,      { .v = (void*) &urgentswitch } },
+
+	{ 0,                    XK_F11,    fullscreen,  { 0 } },
+};