xap/dmenu: Upgraded to dmenu-4.2.1.

xap/dmenu/dmenu-4.0-utf8.diff

@@ -1,21 +0,0 @@
-diff -Naur dmenu-4.0.orig/dmenu.c dmenu-4.0.mod/dmenu.c
---- dmenu-4.0.orig/dmenu.c	2009-04-18 13:50:04.000000000 +0200
-+++ dmenu-4.0.mod/dmenu.c	2010-02-08 11:08:19.986605992 +0100
-@@ -234,7 +234,7 @@
- 		for(i = len; i && i > len - 3; buf[--i] = '.');
- 	XSetForeground(dpy, dc.gc, col[ColFG]);
- 	if(dc.font.set)
--		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-+		Xutf8DrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
- 	else
- 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
- }
-@@ -652,7 +652,7 @@
- 	XRectangle r;
- 
- 	if(dc.font.set) {
--		XmbTextExtents(dc.font.set, text, len, NULL, &r);
-+		Xutf8TextExtents(dc.font.set, text, len, NULL, &r);
- 		return r.width;
- 	}
- 	return XTextWidth(dc.font.xfont, text, len);

xap/dmenu/dmenu-4.0-vertical_meillo.diff

@@ -1,221 +0,0 @@
-# dmenu-4.0 vertical patch
-#
-# assembled by meillo@marmaro.de
-#
-# this is a minimal version of fresch's patch
-#   http://schiewek.net/fresch/dmenu-3.9-fresch-3.diff
-#   http://bbs.archlinux.org/viewtopic.php?id=54086
-
-
-diff -up dmenu-4.0/config.mk dmenu-v/config.mk
---- dmenu-4.0/config.mk	2009-04-18 13:50:04.000000000 +0200
-+++ dmenu-v/config.mk	2009-06-03 10:48:35.000000000 +0200
-@@ -1,5 +1,5 @@
- # dmenu version
--VERSION = 4.0
-+VERSION = 4.0-vertical
- 
- # Customize below to fit your system
- 
-diff -up dmenu-4.0/dmenu.1 dmenu-v/dmenu.1
---- dmenu-4.0/dmenu.1	2009-04-18 13:50:04.000000000 +0200
-+++ dmenu-v/dmenu.1	2009-06-03 12:54:25.000000000 +0200
-@@ -5,6 +5,7 @@ dmenu \- dynamic menu
- .B dmenu
- .RB [ \-i ]
- .RB [ \-b ]
-+.RB [ \-l " <lines>"]
- .RB [ \-fn " <font>"]
- .RB [ \-nb " <color>"]
- .RB [ \-nf " <color>"]
-@@ -26,6 +27,10 @@ makes dmenu match menu entries case inse
- .B \-b
- defines that dmenu appears at the bottom.
- .TP
-+.B \-l <lines>
-+activates vertical list mode.
-+The given number of lines will be displayed. Window height will get adjusted.
-+.TP
- .B \-fn <font>
- defines the font.
- .TP
-@@ -57,7 +62,7 @@ dmenu is completely controlled by the ke
- Appends the character to the text in the input field.  This works as a filter:
- only items containing this text will be displayed.
- .TP
--.B Left/Right (Mod1\-h/Mod1\-l)
-+.B Left/Right (Up/Down) (Mod1\-h/Mod1\-l)
- Select the previous/next item.
- .TP
- .B PageUp/PageDown (Mod1\-k/Mod1\-j)
-diff -up dmenu-4.0/dmenu.c dmenu-v/dmenu.c
---- dmenu-4.0/dmenu.c	2009-04-18 13:50:04.000000000 +0200
-+++ dmenu-v/dmenu.c	2009-06-03 12:31:00.000000000 +0200
-@@ -47,10 +47,12 @@ struct Item {
- 
- /* forward declarations */
- static void appenditem(Item *i, Item **list, Item **last);
--static void calcoffsets(void);
-+static void calcoffsetsh(void);
-+static void calcoffsetsv(void);
- static char *cistrstr(const char *s, const char *sub);
- static void cleanup(void);
--static void drawmenu(void);
-+static void drawmenuh(void);
-+static void drawmenuv(void);
- static void drawtext(const char *text, unsigned long col[ColLast]);
- static void eprint(const char *errstr, ...);
- static unsigned long getcolor(const char *colstr);
-@@ -88,6 +90,10 @@ static Item *curr = NULL;
- static Window root, win;
- static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
- static char *(*fstrstr)(const char *, const char *) = strstr;
-+static Bool vlist = False;
-+static unsigned int lines = 0;
-+static void (*calcoffsets)(void) = calcoffsetsh;
-+static void (*drawmenu)(void) = drawmenuh;
- 
- void
- appenditem(Item *i, Item **list, Item **last) {
-@@ -101,7 +107,7 @@ appenditem(Item *i, Item **list, Item **
- }
- 
- void
--calcoffsets(void) {
-+calcoffsetsh(void) {
- 	int tw;
- 	unsigned int w;
- 
-@@ -127,6 +133,26 @@ calcoffsets(void) {
- 	}
- }
- 
-+void
-+calcoffsetsv(void) {
-+	static unsigned int w;
-+
-+	if(!curr)
-+		return;
-+	w = (dc.font.height + 2) * (lines + 1);
-+	for(next = curr; next; next=next->right) {
-+		w -= dc.font.height + 2;
-+		if(w <= 0)
-+			break;
-+	}
-+	w = (dc.font.height + 2) * (lines + 1);
-+	for(prev = curr; prev && prev->left; prev=prev->left) {
-+		w -= dc.font.height + 2;
-+		if(w <= 0)
-+			break;
-+	}
-+}
-+
- char *
- cistrstr(const char *s, const char *sub) {
- 	int c, csub;
-@@ -171,7 +197,7 @@ cleanup(void) {
- }
- 
- void
--drawmenu(void) {
-+drawmenuh(void) {
- 	Item *i;
- 
- 	dc.x = 0;
-@@ -212,6 +238,39 @@ drawmenu(void) {
- }
- 
- void
-+drawmenuv(void) {
-+	Item *i;
-+
-+	dc.x = 0;
-+	dc.y = 0;
-+	dc.w = mw;
-+	dc.h = mh;
-+	drawtext(NULL, dc.norm);
-+	/* print prompt? */
-+	if(promptw) {
-+		dc.w = promptw;
-+		drawtext(prompt, dc.sel);
-+	}
-+	dc.x += promptw;
-+	dc.w = mw - promptw;
-+	/* print command */
-+	drawtext(text[0] ? text : NULL, dc.norm);
-+	if(curr) {
-+		dc.x = 0;
-+		dc.w = mw;
-+		dc.y += dc.font.height + 2;
-+		/* determine maximum items */
-+		for(i = curr; i != next; i=i->right) {
-+			drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
-+			dc.y += dc.font.height + 2;
-+		}
-+		drawtext(NULL, dc.norm);
-+	}
-+	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
-+	XFlush(dpy);
-+}
-+
-+void
- drawtext(const char *text, unsigned long col[ColLast]) {
- 	char buf[256];
- 	int i, x, y, h, len, olen;
-@@ -222,8 +281,8 @@ drawtext(const char *text, unsigned long
- 	if(!text)
- 		return;
- 	olen = strlen(text);
--	h = dc.font.ascent + dc.font.descent;
--	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
-+	h = dc.font.height;
-+	y = dc.y + ((h+2) / 2) - (h / 2) + dc.font.ascent;
- 	x = dc.x + (h / 2);
- 	/* shorten text if necessary */
- 	for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
-@@ -426,6 +485,7 @@ kpress(XKeyEvent * e) {
- 		calcoffsets();
- 		break;
- 	case XK_Left:
-+	case XK_Up:
- 		if(!(sel && sel->left))
- 			return;
- 		sel=sel->left;
-@@ -457,6 +517,7 @@ kpress(XKeyEvent * e) {
- 		running = False;
- 		break;
- 	case XK_Right:
-+	case XK_Down:
- 		if(!(sel && sel->right))
- 			return;
- 		sel=sel->right;
-@@ -598,6 +659,7 @@ setup(Bool topbar) {
- 
- 	/* menu window geometry */
- 	mh = dc.font.height + 2;
-+	mh = vlist ? mh * (lines+1) : mh;
- #if XINERAMA
- 	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
- 		i = 0;
-@@ -676,6 +738,12 @@ main(int argc, char *argv[]) {
- 		}
- 		else if(!strcmp(argv[i], "-b"))
- 			topbar = False;
-+		else if(!strcmp(argv[i], "-l")) {
-+			vlist = True;
-+			calcoffsets = calcoffsetsv;
-+			drawmenu = drawmenuv;
-+			if(++i < argc) lines += atoi(argv[i]);
-+		}
- 		else if(!strcmp(argv[i], "-fn")) {
- 			if(++i < argc) font = argv[i];
- 		}
-@@ -697,7 +765,7 @@ main(int argc, char *argv[]) {
- 		else if(!strcmp(argv[i], "-v"))
- 			eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
- 		else
--			eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-+			eprint("usage: dmenu [-i] [-b] [-l <lines>] [-fn <font>] [-nb <color>] [-nf <color>]\n"
- 			       "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
- 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
- 		fprintf(stderr, "warning: no locale support\n");

xap/dmenu/dmenu-4.0.tar.gz.sha1

@@ -1 +0,0 @@
-6fb1ff6e414d5ef33d2f627b0ec563eaac19fbd8  dmenu-4.0.tar.gz

xap/dmenu/dmenu-4.2.1-utf8.diff

@@ -0,0 +1,22 @@
+diff -Naur dmenu-4.2.1.orig/draw.c dmenu-4.2.1/draw.c
+--- dmenu-4.2.1.orig/draw.c	2011-04-29 12:43:01.952075026 +0200
++++ dmenu-4.2.1/draw.c	2011-04-29 12:45:17.348585202 +0200
+@@ -53,7 +53,8 @@
+ 
+ 	XSetForeground(dc->dpy, dc->gc, FG(dc, col));
+ 	if(dc->font.set)
+-		XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
++        Xutf8DrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
++
+ 	else {
+ 		XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
+ 		XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
+@@ -172,7 +173,7 @@
+ 	if(dc->font.set) {
+ 		XRectangle r;
+ 
+-		XmbTextExtents(dc->font.set, text, len, NULL, &r);
++        Xutf8TextExtents(dc->font.set, text, len, NULL, &r);
+ 		return r.width;
+ 	}
+ 	return XTextWidth(dc->font.xfont, text, len);

xap/dmenu/dmenu-4.2.1.tar.gz.sha1

@@ -0,0 +1 @@
+79351add653ba9bcb9ab37aee05322a898270d17  dmenu-4.2.1.tar.gz

xap/dmenu/dmenu.SlackBuild

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Build script for Slackware
-# Copyright (C) 2008,2009,2010 Damien Goutte-Gattat
+# Copyright (C) 2008,2009,2010,2011 Damien Goutte-Gattat
 #
 # Redistribution and use of this script, with or without modifications,
 # is permitted provided that the following conditions are met:
@@ -26,14 +26,14 @@
 
 # Source package infos
 NAMESRC=${NAMESRC:-dmenu}
-VERSION=${VERSION:-4.0}
+VERSION=${VERSION:-4.2.1}
 ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
-WGET=${WGET:-http://code.suckless.org/dl/tools/$ARCHIVE}
+WGET=${WGET:-http://dl.suckless.org/tools/$ARCHIVE}
 
 # Built package infos
 NAMEPKG=${NAMEPKG:-dmenu}
-BUILD=${BUILD:-3GGD}
-ARCH=${ARCH:-i486}
+BUILD=${BUILD:-1GGD}
+ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
 EXT=${EXT:-txz}
 
 # Directories
@@ -82,8 +82,7 @@ cd $TMP
 echo "Building $ARCHIVE..."
 tar xf $CWD/$ARCHIVE
 cd $NAME
-patch -p 1 < $CWD/dmenu-4.0-vertical_meillo.diff
-patch -p 1 < $CWD/dmenu-4.0-utf8.diff
+patch -p 1 < $CWD/dmenu-4.2.1-utf8.diff
 sed -i "s,/lib,/lib$LIBDIRSUFFIX,
 s,^CFLAGS =,CFLAGS = $CPUOPT," config.mk
 make