mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2024-12-25 21:06:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

s/Xi18n/Xmb/ global

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-06-12 12:32:35 +02:00
parent e02481607e
commit f45bd87e8a
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/wm/client.c
View File

@ -29,7 +29,7 @@ update_client_name(Client *c)
if(name.encoding == XA_STRING)
cext_strlcpy(c->name, (char *)name.value, sizeof(c->name));
else {
if(Xi18nTextPropertyToTextList(dpy, &name, &list, &n) >= Success
if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
&& n > 0 && *list)
{
cext_strlcpy(c->name, *list, sizeof(c->name));

14
liblitz/blitz.h
View File

@ -10,20 +10,6 @@
#define BLITZ_SELCOLORS "#ffffff #335577 #447799"
#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 {
NORTH = 0x01,
EAST = 0x02,

2
liblitz/draw.c
View File

@ -110,7 +110,7 @@ xdrawtext(Display *dpy, BlitzDraw *d)
break;
}
if(d->font.set)
Xi18nDrawString(dpy, d->drawable, d->font.set, d->gc, x, y, text, len);
XmbDrawString(dpy, d->drawable, d->font.set, d->gc, x, y, text, len);
else
XDrawString(dpy, d->drawable, d->gc, x, y, text, len);
}

2
liblitz/font.c
View File

@ -16,7 +16,7 @@ blitz_textwidth(Display *dpy, BlitzFont *font, char *text)
{
if(font->set) {
XRectangle r;
Xi18nTextExtents(font->set, text, strlen(text), nil, &r);
XmbTextExtents(font->set, text, strlen(text), nil, &r);
return r.width;
}
return XTextWidth(font->xfont, text, strlen(text));