wmii

commit e204c6f5eb47bac75c0fc25d0b1099018c6f2810
parent 896f22dec0b8959757f902ce844ec27ed855a527
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Thu, 27 Apr 2006 14:18:54 +0200

made Xmb active again


Diffstat:
cmd/wm/client.c
 | 
2
+-
liblitz/draw.c
 | 
4
++--
liblitz/font.c
 | 
4
++--

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmd/wm/client.c b/cmd/wm/client.c
@@ -32,7 +32,7 @@ update_client_name(Client *c)
 	if(name.encoding == XA_STRING)
 		cext_strlcpy(c->name, (char *)name.value, sizeof(c->name));
 	else {
-		if(Xutf8TextPropertyToTextList(dpy, &name, &list, &n) >= Success
+		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
 				&& n > 0 && *list)
 		{
 			cext_strlcpy(c->name, *list, sizeof(c->name));
diff --git a/liblitz/draw.c b/liblitz/draw.c
@@ -102,8 +102,8 @@ xdrawtext(Display *dpy, BlitzDraw *d)
 	}
 	XSetBackground(dpy, d->gc, d->color.bg);
 	XSetForeground(dpy, d->gc, d->color.fg);
-	if(0&&d->font.set)
-		Xutf8DrawString(dpy, d->drawable, d->font.set, d->gc, x, y, text, len);
+	if(d->font.set)
+		XmbDrawString(dpy, d->drawable, d->font.set, d->gc, x, y, text, len);
 	else
 		XDrawString(dpy, d->drawable, d->gc, x, y, text, len);
 }
diff --git a/liblitz/font.c b/liblitz/font.c
@@ -14,8 +14,8 @@ unsigned int
 blitz_textwidth(Display *dpy, BlitzFont *font, char *text)
 {
 	XRectangle r;
-	if(0&&font->set) {
-		Xutf8TextExtents(font->set, text, strlen(text), nil, &r);
+	if(font->set) {
+		XmbTextExtents(font->set, text, strlen(text), nil, &r);
 		return r.width;
 	}
 	return XTextWidth(font->xfont, text, strlen(text));