wmii

commit 4beb05d26209a0e4f8fef0bc601c3a7860d1788a
parent 481c0f1b12b1e12df2613b069a93c5a22850710d
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Sun, 23 Apr 2006 22:33:09 +0200

removed Xutf8 crap, that is totally braindamaged what 'those X morns' have designed


Diffstat:
cmd/wm/client.c
 | 
25
+++++++++++++------------
liblitz/draw.c
 | 
7
-------

2 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/cmd/wm/client.c b/cmd/wm/client.c
@@ -18,10 +18,20 @@ vector_of_clients(ClientVector *cv)
 	return (Vector *) cv;
 }
 
+static void
+update_client_name(Client *c)
+{
+	XTextProperty name;
+	XGetTextProperty(dpy, c->win, &name, XA_WM_NAME);
+	if(name.value) {
+		cext_strlcpy(c->name, (char *)name.value, sizeof(c->name));
+		free(name.value);
+	}
+}
+
 Client *
 create_client(Window w, XWindowAttributes *wa)
 {
-	XTextProperty name;
 	Client *c = (Client *) cext_emallocz(sizeof(Client));
 	XSetWindowAttributes fwa;
 	XClassHint ch;
@@ -41,11 +51,7 @@ create_client(Window w, XWindowAttributes *wa)
 	if(!XGetWMNormalHints(dpy, c->win, &c->size, &msize) || !c->size.flags)
 		c->size.flags = PSize;
 	XAddToSaveSet(dpy, c->win);
-	XGetWMName(dpy, c->win, &name);
-	if(name.value) {
-		cext_strlcpy(c->name, (char *)name.value, sizeof(c->name));
-		free(name.value);
-	}
+	update_client_name(c);
 	if(XGetClassHint(dpy, c->win, &ch)) {
 		snprintf(c->classinst, sizeof(c->classinst), "%s:%s", ch.res_class,
 				ch.res_name);
@@ -180,7 +186,6 @@ kill_client(Client * c)
 void
 prop_client(Client *c, XPropertyEvent *e)
 {
-	XTextProperty name;
 	long msize;
 
 	if(e->atom == wm_atom[WMProtocols]) {
@@ -190,11 +195,7 @@ prop_client(Client *c, XPropertyEvent *e)
 	}
 	switch (e->atom) {
 	case XA_WM_NAME:
-		XGetWMName(dpy, c->win, &name);
-		if(name.value) {
-			cext_strlcpy(c->name, (char*) name.value, sizeof(c->name));
-			free(name.value);
-		}
+		update_client_name(c);
 		if(c->frame.size)
 			draw_client(c);
 		break;
diff --git a/liblitz/draw.c b/liblitz/draw.c
@@ -102,14 +102,7 @@ xdrawtext(Display *dpy, BlitzDraw *d)
 	}
 	XSetBackground(dpy, d->gc, d->color.bg);
 	XSetForeground(dpy, d->gc, d->color.fg);
-#ifdef X_HAVE_UTF8_STRING
-	if(d->font.set)
-		Xutf8DrawString(dpy, d->drawable, d->font.set, d->gc, x, y, text, len);
-	else
-		XDrawString(dpy, d->drawable, d->gc, x, y, text, len);
-#else
 	XDrawString(dpy, d->drawable, d->gc, x, y, text, len);
-#endif
 }
 
 void