mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
stash WMProtocols in flags
This commit is contained in:
10
client.c
10
client.c
@ -212,11 +212,11 @@ client_setactive(struct client_ctx *cc, int fg)
|
||||
if (fg) {
|
||||
XInstallColormap(X_Dpy, cc->colormap);
|
||||
if ((cc->flags & CLIENT_INPUT) ||
|
||||
((cc->xproto & _WM_TAKE_FOCUS) == 0)) {
|
||||
((cc->flags & CLIENT_WM_TAKE_FOCUS) == 0)) {
|
||||
XSetInputFocus(X_Dpy, cc->win,
|
||||
RevertToPointerRoot, CurrentTime);
|
||||
}
|
||||
if (cc->xproto & _WM_TAKE_FOCUS)
|
||||
if (cc->flags & CLIENT_WM_TAKE_FOCUS)
|
||||
client_msg(cc, cwmh[WM_TAKE_FOCUS]);
|
||||
conf_grab_mouse(cc->win);
|
||||
/*
|
||||
@ -532,9 +532,9 @@ client_wm_protocols(struct client_ctx *cc)
|
||||
if (XGetWMProtocols(X_Dpy, cc->win, &p, &j)) {
|
||||
for (i = 0; i < j; i++) {
|
||||
if (p[i] == cwmh[WM_DELETE_WINDOW])
|
||||
cc->xproto |= _WM_DELETE_WINDOW;
|
||||
cc->flags |= CLIENT_WM_DELETE_WINDOW;
|
||||
else if (p[i] == cwmh[WM_TAKE_FOCUS])
|
||||
cc->xproto |= _WM_TAKE_FOCUS;
|
||||
cc->flags |= CLIENT_WM_TAKE_FOCUS;
|
||||
}
|
||||
XFree(p);
|
||||
}
|
||||
@ -559,7 +559,7 @@ client_msg(struct client_ctx *cc, Atom proto)
|
||||
void
|
||||
client_send_delete(struct client_ctx *cc)
|
||||
{
|
||||
if (cc->xproto & _WM_DELETE_WINDOW)
|
||||
if (cc->flags & CLIENT_WM_DELETE_WINDOW)
|
||||
client_msg(cc, cwmh[WM_DELETE_WINDOW]);
|
||||
else
|
||||
XKillClient(X_Dpy, cc->win);
|
||||
|
Reference in New Issue
Block a user