remove NetWMName

This commit is contained in:
Julien Danjou 2007-09-10 16:49:54 +02:00
parent a6a91757c1
commit c95c4173a6
4 changed files with 3 additions and 4 deletions

View File

@ -149,7 +149,6 @@ setup(Display *disp, awesome_config *awesomeconf)
/* init atoms */ /* init atoms */
netatom[NetSupported] = XInternAtom(disp, "_NET_SUPPORTED", False); netatom[NetSupported] = XInternAtom(disp, "_NET_SUPPORTED", False);
netatom[NetWMName] = XInternAtom(disp, "_NET_WM_NAME", False);
XChangeProperty(disp, DefaultRootWindow(disp), netatom[NetSupported], XA_ATOM, 32, XChangeProperty(disp, DefaultRootWindow(disp), netatom[NetSupported], XA_ATOM, 32,
PropModeReplace, (unsigned char *) netatom, NetLast); PropModeReplace, (unsigned char *) netatom, NetLast);
/* init cursors */ /* init cursors */

View File

@ -37,7 +37,7 @@
enum enum
{ CurNormal, CurResize, CurMove, CurLast }; /* cursor */ { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
enum enum
{ NetSupported, NetWMName, NetLast }; /* EWMH atoms */ { NetSupported, NetLast }; /* EWMH atoms */
Bool gettextprop(Display *, Window, Atom, char *, unsigned int); /* return text property, UTF-8 compliant */ Bool gettextprop(Display *, Window, Atom, char *, unsigned int); /* return text property, UTF-8 compliant */
void updatebarpos(Display *, Statusbar); /* updates the bar position */ void updatebarpos(Display *, Statusbar); /* updates the bar position */

View File

@ -179,7 +179,7 @@ attach(Client * c)
inline void inline void
updatetitle(Client * c) updatetitle(Client * c)
{ {
if(!gettextprop(c->display, c->win, netatom[NetWMName], c->name, sizeof c->name)) if(!gettextprop(c->display, c->win, XInternAtom(c->display, "_NET_WM_NAME", False), c->name, sizeof c->name))
gettextprop(c->display, c->win, XInternAtom(c->display, "WM_NAME", False), c->name, sizeof c->name); gettextprop(c->display, c->win, XInternAtom(c->display, "WM_NAME", False), c->name, sizeof c->name);
} }

View File

@ -348,7 +348,7 @@ handle_event_propertynotify(XEvent * e, awesome_config *awesomeconf)
updatesizehints(c); updatesizehints(c);
break; break;
} }
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) if(ev->atom == XA_WM_NAME || ev->atom == XInternAtom(c->display, "_NET_WM_NAME", False))
{ {
updatetitle(c); updatetitle(c);
if(c == sel) if(c == sel)