wmii

commit 776bd2fd2b3400fbe07afe9da6d36f52feb8dce5
parent 9fdc05580040c4cbc91c4268ed991f8a021cf51f
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Wed, 10 May 2006 15:33:53 +0200

introduced Xi18n* function macros which are substituted regarding if X_UTF8_STRING is present to Xutf8* counterparts, otherwise to Xmb* counterparts


Diffstat:
cmd/wm/client.c
 | 
7
+------
liblitz/blitz.h
 | 
10
++++++++++
liblitz/draw.c
 | 
6
+-----
liblitz/font.c
 | 
6
+-----

4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/cmd/wm/client.c b/cmd/wm/client.c
@@ -34,13 +34,8 @@ update_client_name(Client *c)
 	if(name.encoding == XA_STRING)
 		cext_strlcpy(c->name, (char *)name.value, sizeof(c->name));
 	else {
-#ifdef X_HAVE_UTF8_STRING
-		if(Xutf8TextPropertyToTextList(dpy, &name, &list, &n) >= Success
+		if(Xi18nTextPropertyToTextList(dpy, &name, &list, &n) >= Success
 				&& n > 0 && *list)
-#else
-		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-				&& n > 0 && *list)
-#endif
 		{
 			cext_strlcpy(c->name, *list, sizeof(c->name));
 			XFreeStringList(list);
diff --git a/liblitz/blitz.h b/liblitz/blitz.h
@@ -10,6 +10,16 @@
 #define BLITZ_SELCOLORS		"#ffffff #285577 #4c7899"
 #define BLITZ_NORMCOLORS	"#222222 #eeeeee #666666"
 
+#ifdef X_HAVE_UTF8_STRING
+#define Xi18nTextPropertyToTextList Xutf8TextPropertyToTextList
+#define Xi18nDrawString Xutf8DrawString
+#define Xi18nTextExtents Xutf8TextExtents
+#else
+#define Xi18nTextPropertyToTextList XmbTextPropertyToTextList
+#define Xi18nDrawString XmbDrawString
+#define Xi18nTextExtents XmbTextExtents
+#endif
+
 typedef enum {
 	CENTER, WEST, NWEST, NORTH, NEAST, EAST,
 	SEAST, SOUTH, SWEST
diff --git a/liblitz/draw.c b/liblitz/draw.c
@@ -110,11 +110,7 @@ xdrawtext(Display *dpy, BlitzDraw *d)
 		break;
 	}
 	if(d->font.set)
-#ifdef X_HAVE_UTF8_STRING
-		Xutf8DrawString(dpy, d->drawable, d->font.set, d->gc, x, y, text, len);
-#else
-		XmbDrawString(dpy, d->drawable, d->font.set, d->gc, x, y, text, len);
-#endif
+		Xi18nDrawString(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
@@ -16,11 +16,7 @@ blitz_textwidth(Display *dpy, BlitzFont *font, char *text)
 {
 	if(font->set) {
 		XRectangle r;
-#ifdef X_HAVE_UTF8_STRING
-		Xutf8TextExtents(font->set, text, strlen(text), nil, &r);
-#else
-		XmbTextExtents(font->set, text, strlen(text), nil, &r);
-#endif
+		Xi18nTextExtents(font->set, text, strlen(text), nil, &r);
 		return r.width;
 	}
 	return XTextWidth(font->xfont, text, strlen(text));