awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove WMDelete

This commit is contained in:
Julien Danjou 2007-09-10 16:43:20 +02:00
parent baa1e422fe
commit deadd850ae
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awesome.c
View File

@ -148,7 +148,6 @@ setup(Display *disp, awesome_config *awesomeconf)
/* init atoms */ /* init atoms */
wmatom[WMProtocols] = XInternAtom(disp, "WM_PROTOCOLS", False); wmatom[WMProtocols] = XInternAtom(disp, "WM_PROTOCOLS", False);
wmatom[WMDelete] = XInternAtom(disp, "WM_DELETE_WINDOW", False);
wmatom[WMName] = XInternAtom(disp, "WM_NAME", False); wmatom[WMName] = XInternAtom(disp, "WM_NAME", False);
wmatom[WMState] = XInternAtom(disp, "WM_STATE", False); wmatom[WMState] = XInternAtom(disp, "WM_STATE", False);
netatom[NetSupported] = XInternAtom(disp, "_NET_SUPPORTED", False); netatom[NetSupported] = XInternAtom(disp, "_NET_SUPPORTED", False);

2
awesome.h
View File

@ -39,7 +39,7 @@ enum
enum enum
{ NetSupported, NetWMName, NetLast }; /* EWMH atoms */ { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
enum enum
{ WMProtocols, WMDelete, WMName, WMState, WMLast }; /* default atoms */ { WMProtocols, WMName, WMState, WMLast }; /* default 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 */

6
client.c
View File

@ -108,7 +108,7 @@ grabbuttons(Client * c, Bool focused, KeySym modkey, unsigned int numlockmask)
/** XXX: No idea /** XXX: No idea
* \param c the client * \param c the client
* \return True if atom has WMDelete * \return True if atom has WM_DELETE_WINDOW
*/ */
static Bool static Bool
isprotodel(Client * c) isprotodel(Client * c)
@ -120,7 +120,7 @@ isprotodel(Client * c)
if(XGetWMProtocols(c->display, c->win, &protocols, &n)) if(XGetWMProtocols(c->display, c->win, &protocols, &n))
{ {
for(i = 0; !ret && i < n; i++) for(i = 0; !ret && i < n; i++)
if(protocols[i] == wmatom[WMDelete]) if(protocols[i] == XInternAtom(c->display, "WM_DELETE_WINDOW", False))
ret = True; ret = True;
XFree(protocols); XFree(protocols);
} }
@ -295,7 +295,7 @@ uicb_killclient(Display *disp __attribute__ ((unused)),
ev.xclient.window = sel->win; ev.xclient.window = sel->win;
ev.xclient.message_type = wmatom[WMProtocols]; ev.xclient.message_type = wmatom[WMProtocols];
ev.xclient.format = 32; ev.xclient.format = 32;
ev.xclient.data.l[0] = wmatom[WMDelete]; ev.xclient.data.l[0] = XInternAtom(disp, "WM_DELETE_WINDOW", False);
ev.xclient.data.l[1] = CurrentTime; ev.xclient.data.l[1] = CurrentTime;
XSendEvent(sel->display, sel->win, False, NoEventMask, &ev); XSendEvent(sel->display, sel->win, False, NoEventMask, &ev);
} }