Move handler functions to "dwm/handlers.c"
This commit is contained in:
parent
9c7ab7bf24
commit
3826ba31b0
GPG Key ID:
553C0EBBEB5D5F08
2
Makefile
2
Makefile
|
|
@ -17,7 +17,7 @@ options:
|
|||
%.o: %.c
|
||||
${CC} -c $< -o $@ ${CFLAGS}
|
||||
|
||||
dwm.o: dwm/layouts.c dwm/swallow.c dwm/systray.c
|
||||
dwm.o: dwm/handlers.c dwm/layouts.c dwm/swallow.c dwm/systray.c
|
||||
${OBJ}: atoms.h drw.h config.def.h config.mk helpers.h layouts.h settings.h spawn.h tags.h util.h
|
||||
|
||||
polytreewm: ${OBJ}
|
||||
|
|
|
|||
371
dwm.c
371
dwm.c
|
|
@ -342,6 +342,7 @@ struct Pertag {
|
|||
|
||||
/* function implementations */
|
||||
|
||||
#include "dwm/handlers.c"
|
||||
#include "dwm/layouts.c"
|
||||
#include "dwm/swallow.c"
|
||||
#include "dwm/systray.c"
|
||||
|
|
@ -522,54 +523,6 @@ attachstack(Client *c)
|
|||
c->mon->stack = c;
|
||||
}
|
||||
|
||||
void
|
||||
buttonpress(XEvent *e)
|
||||
{
|
||||
unsigned int i, x, click, occ = 0;
|
||||
Arg arg = {0};
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
XButtonPressedEvent *ev = &e->xbutton;
|
||||
|
||||
click = ClkRootWin;
|
||||
/* focus monitor if necessary */
|
||||
if ((m = wintomon(ev->window)) && m != selmon
|
||||
&& (settings_get_focus_on_wheel() || (ev->button != Button4 && ev->button != Button5))) {
|
||||
unfocus(selmon->sel, 1);
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
if (ev->window == selmon->barwin) {
|
||||
i = x = 0;
|
||||
for (c = m->clients; c; c = c->next)
|
||||
occ |= c->tags == 255 ? 0 : c->tags;
|
||||
do {
|
||||
/* do not reserve space for vacant tags */
|
||||
if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i || tags_get(i)->has_custom_name))
|
||||
continue;
|
||||
x += TEXTW(tags_get(i)->name.cstr);
|
||||
} while (ev->x >= x && ++i < TAGS_COUNT);
|
||||
if (i < TAGS_COUNT) {
|
||||
click = ClkTagBar;
|
||||
arg.ui = 1 << i;
|
||||
} else if (ev->x < x + blw)
|
||||
click = ClkLtSymbol;
|
||||
else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth())
|
||||
click = ClkStatusText;
|
||||
else
|
||||
click = ClkWinTitle;
|
||||
} else if ((c = wintoclient(ev->window))) {
|
||||
if (settings_get_focus_on_wheel() || (ev->button != Button4 && ev->button != Button5))
|
||||
focus(c);
|
||||
XAllowEvents(dpy, ReplayPointer, CurrentTime);
|
||||
click = ClkClientWin;
|
||||
}
|
||||
for (i = 0; i < LENGTH(buttons); i++)
|
||||
if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
|
||||
&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
|
||||
buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
|
||||
}
|
||||
|
||||
void configborder(const Arg *const arg)
|
||||
{
|
||||
if (arg == NULL) return;
|
||||
|
|
@ -648,85 +601,6 @@ cleanupmon(Monitor *mon)
|
|||
free(mon);
|
||||
}
|
||||
|
||||
void
|
||||
clientmessage(XEvent *e)
|
||||
{
|
||||
XWindowAttributes wa;
|
||||
XSetWindowAttributes swa;
|
||||
XClientMessageEvent *cme = &e->xclient;
|
||||
Client *c = wintoclient(cme->window);
|
||||
|
||||
if (showsystray && cme->window == systray->win && cme->message_type == atoms->netatom[NetSystemTrayOP]) {
|
||||
/* add systray icons */
|
||||
if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
|
||||
if (!(c = (Client *)calloc(1, sizeof(Client))))
|
||||
die("fatal: could not malloc() %u bytes\n", sizeof(Client));
|
||||
if (!(c->win = cme->data.l[2])) {
|
||||
free(c);
|
||||
return;
|
||||
}
|
||||
c->mon = selmon;
|
||||
c->next = systray->icons;
|
||||
systray->icons = c;
|
||||
if (!XGetWindowAttributes(dpy, c->win, &wa)) {
|
||||
/* use sane defaults */
|
||||
wa.width = bh;
|
||||
wa.height = bh;
|
||||
wa.border_width = 0;
|
||||
}
|
||||
c->x = c->oldx = c->y = c->oldy = 0;
|
||||
c->w = c->oldw = wa.width;
|
||||
c->h = c->oldh = wa.height;
|
||||
c->oldbw = wa.border_width;
|
||||
c->bw = 0;
|
||||
c->isfloating = True;
|
||||
/* reuse tags field as mapped status */
|
||||
c->tags = 1;
|
||||
updatesizehints(c);
|
||||
updatesystrayicongeom(c, wa.width, wa.height);
|
||||
XAddToSaveSet(dpy, c->win);
|
||||
XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
|
||||
XReparentWindow(dpy, c->win, systray->win, 0, 0);
|
||||
/* use parents background color */
|
||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||
XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
|
||||
sendevent(c->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
/* FIXME not sure if I have to send these events, too */
|
||||
sendevent(c->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
sendevent(c->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
sendevent(c->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
XSync(dpy, False);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
setclientstate(c, NormalState);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!c) return;
|
||||
|
||||
if (cme->message_type == atoms->netatom[NetWMState]) {
|
||||
if (
|
||||
cme->data.l[1] == atoms->netatom[NetWMFullscreen]
|
||||
||
|
||||
cme->data.l[2] == atoms->netatom[NetWMFullscreen]
|
||||
) {
|
||||
setfullscreen(
|
||||
c,
|
||||
(
|
||||
cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
|
||||
||
|
||||
cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */
|
||||
)
|
||||
);
|
||||
}
|
||||
} else if (cme->message_type == atoms->netatom[NetActiveWindow]) {
|
||||
if (c != selmon->sel && !c->isurgent) {
|
||||
seturgent(c, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
configure(Client *c)
|
||||
{
|
||||
|
|
@ -746,82 +620,6 @@ configure(Client *c)
|
|||
XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
|
||||
}
|
||||
|
||||
void
|
||||
configurenotify(XEvent *e)
|
||||
{
|
||||
Monitor *m;
|
||||
XConfigureEvent *ev = &e->xconfigure;
|
||||
int dirty;
|
||||
|
||||
/* TODO: updategeom handling sucks, needs to be simplified */
|
||||
if (ev->window == root) {
|
||||
dirty = (sw != ev->width || sh != ev->height);
|
||||
sw = ev->width;
|
||||
sh = ev->height;
|
||||
if (updategeom() || dirty) {
|
||||
drw_resize(drw, sw, bh);
|
||||
updatebars();
|
||||
for (m = mons; m; m = m->next) {
|
||||
resizebarwin(m);
|
||||
}
|
||||
focus(NULL);
|
||||
arrange(NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
configurerequest(XEvent *e)
|
||||
{
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
XConfigureRequestEvent *ev = &e->xconfigurerequest;
|
||||
XWindowChanges wc;
|
||||
|
||||
if ((c = wintoclient(ev->window))) {
|
||||
if (ev->value_mask & CWBorderWidth)
|
||||
c->bw = ev->border_width;
|
||||
else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
|
||||
m = c->mon;
|
||||
if (ev->value_mask & CWX) {
|
||||
c->oldx = c->x;
|
||||
c->x = m->mx + ev->x;
|
||||
}
|
||||
if (ev->value_mask & CWY) {
|
||||
c->oldy = c->y;
|
||||
c->y = m->my + ev->y;
|
||||
}
|
||||
if (ev->value_mask & CWWidth) {
|
||||
c->oldw = c->w;
|
||||
c->w = ev->width;
|
||||
}
|
||||
if (ev->value_mask & CWHeight) {
|
||||
c->oldh = c->h;
|
||||
c->h = ev->height;
|
||||
}
|
||||
if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
|
||||
c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
|
||||
if ((c->y + c->h) > m->my + m->mh && c->isfloating)
|
||||
c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
|
||||
if ((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
|
||||
configure(c);
|
||||
if (ISVISIBLE(c))
|
||||
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
|
||||
} else
|
||||
configure(c);
|
||||
} else {
|
||||
wc.x = ev->x;
|
||||
wc.y = ev->y;
|
||||
wc.width = ev->width;
|
||||
wc.height = ev->height;
|
||||
wc.border_width = ev->border_width;
|
||||
wc.sibling = ev->above;
|
||||
wc.stack_mode = ev->detail;
|
||||
XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
|
||||
}
|
||||
XSync(dpy, False);
|
||||
}
|
||||
|
||||
Monitor *
|
||||
createmon(void)
|
||||
{
|
||||
|
|
@ -862,24 +660,6 @@ createmon(void)
|
|||
return m;
|
||||
}
|
||||
|
||||
void
|
||||
destroynotify(XEvent *e)
|
||||
{
|
||||
XDestroyWindowEvent *const ev = &e->xdestroywindow;
|
||||
|
||||
Client *c;
|
||||
|
||||
if ((c = wintoclient(ev->window))) {
|
||||
unmanage(c, 1);
|
||||
} else if ((c = wintosystrayicon(ev->window))) {
|
||||
removesystrayicon(c);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
} else if ((c = swallowingclient(ev->window))) {
|
||||
unmanage(c->swallowing, 1);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
detach(Client *c)
|
||||
{
|
||||
|
|
@ -979,19 +759,6 @@ drawbars(void)
|
|||
drawbar(m);
|
||||
}
|
||||
|
||||
void
|
||||
expose(XEvent *e)
|
||||
{
|
||||
Monitor *m;
|
||||
XExposeEvent *ev = &e->xexpose;
|
||||
|
||||
if (ev->count == 0 && (m = wintomon(ev->window))) {
|
||||
drawbar(m);
|
||||
if (m == selmon)
|
||||
updatesystray();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
focus(Client *c)
|
||||
{
|
||||
|
|
@ -1017,16 +784,6 @@ focus(Client *c)
|
|||
drawbars();
|
||||
}
|
||||
|
||||
/* there are some broken focus acquiring clients needing extra handling */
|
||||
void
|
||||
focusin(XEvent *e)
|
||||
{
|
||||
XFocusChangeEvent *ev = &e->xfocus;
|
||||
|
||||
if (selmon->sel && ev->window != selmon->sel->win)
|
||||
setfocus(selmon->sel);
|
||||
}
|
||||
|
||||
void
|
||||
focusmon(const Arg *arg)
|
||||
{
|
||||
|
|
@ -1232,22 +989,6 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info)
|
|||
}
|
||||
#endif /* XINERAMA */
|
||||
|
||||
void
|
||||
keypress(XEvent *e)
|
||||
{
|
||||
unsigned int i;
|
||||
KeySym keysym;
|
||||
XKeyEvent *ev;
|
||||
|
||||
ev = &e->xkey;
|
||||
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
|
||||
for (i = 0; i < LENGTH(keys); i++)
|
||||
if (keysym == keys[i].keysym
|
||||
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
|
||||
&& keys[i].func)
|
||||
keys[i].func(&(keys[i].arg));
|
||||
}
|
||||
|
||||
void
|
||||
killclient(const Arg *arg)
|
||||
{
|
||||
|
|
@ -1388,36 +1129,6 @@ manage(Window w, XWindowAttributes *wa)
|
|||
focus(NULL);
|
||||
}
|
||||
|
||||
void
|
||||
mappingnotify(XEvent *e)
|
||||
{
|
||||
XMappingEvent *ev = &e->xmapping;
|
||||
|
||||
XRefreshKeyboardMapping(ev);
|
||||
if (ev->request == MappingKeyboard)
|
||||
grabkeys();
|
||||
}
|
||||
|
||||
void
|
||||
maprequest(XEvent *e)
|
||||
{
|
||||
static XWindowAttributes wa;
|
||||
XMapRequestEvent *ev = &e->xmaprequest;
|
||||
Client *i;
|
||||
if ((i = wintosystrayicon(ev->window))) {
|
||||
sendevent(i->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
}
|
||||
|
||||
if (!XGetWindowAttributes(dpy, ev->window, &wa))
|
||||
return;
|
||||
if (wa.override_redirect)
|
||||
return;
|
||||
if (!wintoclient(ev->window))
|
||||
manage(ev->window, &wa);
|
||||
}
|
||||
|
||||
void
|
||||
movemouse(const Arg *arg)
|
||||
{
|
||||
|
|
@ -1594,53 +1305,6 @@ pop(Client *c)
|
|||
arrange(c->mon);
|
||||
}
|
||||
|
||||
void
|
||||
propertynotify(XEvent *e)
|
||||
{
|
||||
Client *c;
|
||||
Window trans;
|
||||
XPropertyEvent *ev = &e->xproperty;
|
||||
|
||||
if ((c = wintosystrayicon(ev->window))) {
|
||||
if (ev->atom == XA_WM_NORMAL_HINTS) {
|
||||
updatesizehints(c);
|
||||
updatesystrayicongeom(c, c->w, c->h);
|
||||
}
|
||||
else
|
||||
updatesystrayiconstate(c, ev);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
}
|
||||
if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
||||
updatestatus();
|
||||
else if (ev->state == PropertyDelete)
|
||||
return; /* ignore */
|
||||
else if ((c = wintoclient(ev->window))) {
|
||||
switch(ev->atom) {
|
||||
default: break;
|
||||
case XA_WM_TRANSIENT_FOR:
|
||||
if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
|
||||
(c->isfloating = (wintoclient(trans)) != NULL))
|
||||
arrange(c->mon);
|
||||
break;
|
||||
case XA_WM_NORMAL_HINTS:
|
||||
updatesizehints(c);
|
||||
break;
|
||||
case XA_WM_HINTS:
|
||||
updatewmhints(c);
|
||||
drawbars();
|
||||
break;
|
||||
}
|
||||
if (ev->atom == XA_WM_NAME || ev->atom == atoms->netatom[NetWMName]) {
|
||||
updatetitle(c);
|
||||
if (c == c->mon->sel)
|
||||
drawbar(c->mon);
|
||||
}
|
||||
if (ev->atom == atoms->netatom[NetWMWindowType])
|
||||
updatewindowtype(c);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
quit(const Arg *arg)
|
||||
{
|
||||
|
|
@ -1783,19 +1447,6 @@ resizemouse(const Arg *arg)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
resizerequest(XEvent *e)
|
||||
{
|
||||
XResizeRequestEvent *ev = &e->xresizerequest;
|
||||
Client *i;
|
||||
|
||||
if ((i = wintosystrayicon(ev->window))) {
|
||||
updatesystrayicongeom(i, ev->width, ev->height);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
restack(Monitor *m)
|
||||
{
|
||||
|
|
@ -2316,26 +1967,6 @@ unmanage(Client *c, int destroyed)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
unmapnotify(XEvent *e)
|
||||
{
|
||||
Client *c;
|
||||
XUnmapEvent *ev = &e->xunmap;
|
||||
|
||||
if ((c = wintoclient(ev->window))) {
|
||||
if (ev->send_event)
|
||||
setclientstate(c, WithdrawnState);
|
||||
else
|
||||
unmanage(c, 0);
|
||||
}
|
||||
else if ((c = wintosystrayicon(ev->window))) {
|
||||
/* KLUDGE! sometimes icons occasionally unmap their windows, but do
|
||||
* _not_ destroy them. We map those windows back */
|
||||
XMapRaised(dpy, c->win);
|
||||
updatesystray();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
updatebars(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,369 @@
|
|||
void
|
||||
buttonpress(XEvent *e)
|
||||
{
|
||||
unsigned int i, x, click, occ = 0;
|
||||
Arg arg = {0};
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
XButtonPressedEvent *ev = &e->xbutton;
|
||||
|
||||
click = ClkRootWin;
|
||||
/* focus monitor if necessary */
|
||||
if ((m = wintomon(ev->window)) && m != selmon
|
||||
&& (settings_get_focus_on_wheel() || (ev->button != Button4 && ev->button != Button5))) {
|
||||
unfocus(selmon->sel, 1);
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
if (ev->window == selmon->barwin) {
|
||||
i = x = 0;
|
||||
for (c = m->clients; c; c = c->next)
|
||||
occ |= c->tags == 255 ? 0 : c->tags;
|
||||
do {
|
||||
/* do not reserve space for vacant tags */
|
||||
if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i || tags_get(i)->has_custom_name))
|
||||
continue;
|
||||
x += TEXTW(tags_get(i)->name.cstr);
|
||||
} while (ev->x >= x && ++i < TAGS_COUNT);
|
||||
if (i < TAGS_COUNT) {
|
||||
click = ClkTagBar;
|
||||
arg.ui = 1 << i;
|
||||
} else if (ev->x < x + blw)
|
||||
click = ClkLtSymbol;
|
||||
else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth())
|
||||
click = ClkStatusText;
|
||||
else
|
||||
click = ClkWinTitle;
|
||||
} else if ((c = wintoclient(ev->window))) {
|
||||
if (settings_get_focus_on_wheel() || (ev->button != Button4 && ev->button != Button5))
|
||||
focus(c);
|
||||
XAllowEvents(dpy, ReplayPointer, CurrentTime);
|
||||
click = ClkClientWin;
|
||||
}
|
||||
for (i = 0; i < LENGTH(buttons); i++)
|
||||
if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
|
||||
&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
|
||||
buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
|
||||
}
|
||||
|
||||
void
|
||||
clientmessage(XEvent *e)
|
||||
{
|
||||
XWindowAttributes wa;
|
||||
XSetWindowAttributes swa;
|
||||
XClientMessageEvent *cme = &e->xclient;
|
||||
Client *c = wintoclient(cme->window);
|
||||
|
||||
if (showsystray && cme->window == systray->win && cme->message_type == atoms->netatom[NetSystemTrayOP]) {
|
||||
/* add systray icons */
|
||||
if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
|
||||
if (!(c = (Client *)calloc(1, sizeof(Client))))
|
||||
die("fatal: could not malloc() %u bytes\n", sizeof(Client));
|
||||
if (!(c->win = cme->data.l[2])) {
|
||||
free(c);
|
||||
return;
|
||||
}
|
||||
c->mon = selmon;
|
||||
c->next = systray->icons;
|
||||
systray->icons = c;
|
||||
if (!XGetWindowAttributes(dpy, c->win, &wa)) {
|
||||
/* use sane defaults */
|
||||
wa.width = bh;
|
||||
wa.height = bh;
|
||||
wa.border_width = 0;
|
||||
}
|
||||
c->x = c->oldx = c->y = c->oldy = 0;
|
||||
c->w = c->oldw = wa.width;
|
||||
c->h = c->oldh = wa.height;
|
||||
c->oldbw = wa.border_width;
|
||||
c->bw = 0;
|
||||
c->isfloating = True;
|
||||
/* reuse tags field as mapped status */
|
||||
c->tags = 1;
|
||||
updatesizehints(c);
|
||||
updatesystrayicongeom(c, wa.width, wa.height);
|
||||
XAddToSaveSet(dpy, c->win);
|
||||
XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
|
||||
XReparentWindow(dpy, c->win, systray->win, 0, 0);
|
||||
/* use parents background color */
|
||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||
XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
|
||||
sendevent(c->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
/* FIXME not sure if I have to send these events, too */
|
||||
sendevent(c->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
sendevent(c->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
sendevent(c->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
XSync(dpy, False);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
setclientstate(c, NormalState);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!c) return;
|
||||
|
||||
if (cme->message_type == atoms->netatom[NetWMState]) {
|
||||
if (
|
||||
cme->data.l[1] == atoms->netatom[NetWMFullscreen]
|
||||
||
|
||||
cme->data.l[2] == atoms->netatom[NetWMFullscreen]
|
||||
) {
|
||||
setfullscreen(
|
||||
c,
|
||||
(
|
||||
cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
|
||||
||
|
||||
cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */
|
||||
)
|
||||
);
|
||||
}
|
||||
} else if (cme->message_type == atoms->netatom[NetActiveWindow]) {
|
||||
if (c != selmon->sel && !c->isurgent) {
|
||||
seturgent(c, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
configurerequest(XEvent *e)
|
||||
{
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
XConfigureRequestEvent *ev = &e->xconfigurerequest;
|
||||
XWindowChanges wc;
|
||||
|
||||
if ((c = wintoclient(ev->window))) {
|
||||
if (ev->value_mask & CWBorderWidth)
|
||||
c->bw = ev->border_width;
|
||||
else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
|
||||
m = c->mon;
|
||||
if (ev->value_mask & CWX) {
|
||||
c->oldx = c->x;
|
||||
c->x = m->mx + ev->x;
|
||||
}
|
||||
if (ev->value_mask & CWY) {
|
||||
c->oldy = c->y;
|
||||
c->y = m->my + ev->y;
|
||||
}
|
||||
if (ev->value_mask & CWWidth) {
|
||||
c->oldw = c->w;
|
||||
c->w = ev->width;
|
||||
}
|
||||
if (ev->value_mask & CWHeight) {
|
||||
c->oldh = c->h;
|
||||
c->h = ev->height;
|
||||
}
|
||||
if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
|
||||
c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
|
||||
if ((c->y + c->h) > m->my + m->mh && c->isfloating)
|
||||
c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
|
||||
if ((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
|
||||
configure(c);
|
||||
if (ISVISIBLE(c))
|
||||
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
|
||||
} else
|
||||
configure(c);
|
||||
} else {
|
||||
wc.x = ev->x;
|
||||
wc.y = ev->y;
|
||||
wc.width = ev->width;
|
||||
wc.height = ev->height;
|
||||
wc.border_width = ev->border_width;
|
||||
wc.sibling = ev->above;
|
||||
wc.stack_mode = ev->detail;
|
||||
XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
|
||||
}
|
||||
XSync(dpy, False);
|
||||
}
|
||||
|
||||
void
|
||||
configurenotify(XEvent *e)
|
||||
{
|
||||
Monitor *m;
|
||||
XConfigureEvent *ev = &e->xconfigure;
|
||||
int dirty;
|
||||
|
||||
/* TODO: updategeom handling sucks, needs to be simplified */
|
||||
if (ev->window == root) {
|
||||
dirty = (sw != ev->width || sh != ev->height);
|
||||
sw = ev->width;
|
||||
sh = ev->height;
|
||||
if (updategeom() || dirty) {
|
||||
drw_resize(drw, sw, bh);
|
||||
updatebars();
|
||||
for (m = mons; m; m = m->next) {
|
||||
resizebarwin(m);
|
||||
}
|
||||
focus(NULL);
|
||||
arrange(NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
destroynotify(XEvent *e)
|
||||
{
|
||||
XDestroyWindowEvent *const ev = &e->xdestroywindow;
|
||||
|
||||
Client *c;
|
||||
|
||||
if ((c = wintoclient(ev->window))) {
|
||||
unmanage(c, 1);
|
||||
} else if ((c = wintosystrayicon(ev->window))) {
|
||||
removesystrayicon(c);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
} else if ((c = swallowingclient(ev->window))) {
|
||||
unmanage(c->swallowing, 1);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
expose(XEvent *e)
|
||||
{
|
||||
Monitor *m;
|
||||
XExposeEvent *ev = &e->xexpose;
|
||||
|
||||
if (ev->count == 0 && (m = wintomon(ev->window))) {
|
||||
drawbar(m);
|
||||
if (m == selmon)
|
||||
updatesystray();
|
||||
}
|
||||
}
|
||||
|
||||
/* there are some broken focus acquiring clients needing extra handling */
|
||||
void
|
||||
focusin(XEvent *e)
|
||||
{
|
||||
XFocusChangeEvent *ev = &e->xfocus;
|
||||
|
||||
if (selmon->sel && ev->window != selmon->sel->win)
|
||||
setfocus(selmon->sel);
|
||||
}
|
||||
|
||||
void
|
||||
keypress(XEvent *e)
|
||||
{
|
||||
unsigned int i;
|
||||
KeySym keysym;
|
||||
XKeyEvent *ev;
|
||||
|
||||
ev = &e->xkey;
|
||||
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
|
||||
for (i = 0; i < LENGTH(keys); i++)
|
||||
if (keysym == keys[i].keysym
|
||||
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
|
||||
&& keys[i].func)
|
||||
keys[i].func(&(keys[i].arg));
|
||||
}
|
||||
|
||||
void
|
||||
mappingnotify(XEvent *e)
|
||||
{
|
||||
XMappingEvent *ev = &e->xmapping;
|
||||
|
||||
XRefreshKeyboardMapping(ev);
|
||||
if (ev->request == MappingKeyboard)
|
||||
grabkeys();
|
||||
}
|
||||
|
||||
void
|
||||
maprequest(XEvent *e)
|
||||
{
|
||||
static XWindowAttributes wa;
|
||||
XMapRequestEvent *ev = &e->xmaprequest;
|
||||
Client *i;
|
||||
if ((i = wintosystrayicon(ev->window))) {
|
||||
sendevent(i->win, atoms->netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
}
|
||||
|
||||
if (!XGetWindowAttributes(dpy, ev->window, &wa))
|
||||
return;
|
||||
if (wa.override_redirect)
|
||||
return;
|
||||
if (!wintoclient(ev->window))
|
||||
manage(ev->window, &wa);
|
||||
}
|
||||
|
||||
void
|
||||
propertynotify(XEvent *e)
|
||||
{
|
||||
Client *c;
|
||||
Window trans;
|
||||
XPropertyEvent *ev = &e->xproperty;
|
||||
|
||||
if ((c = wintosystrayicon(ev->window))) {
|
||||
if (ev->atom == XA_WM_NORMAL_HINTS) {
|
||||
updatesizehints(c);
|
||||
updatesystrayicongeom(c, c->w, c->h);
|
||||
}
|
||||
else
|
||||
updatesystrayiconstate(c, ev);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
}
|
||||
if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
||||
updatestatus();
|
||||
else if (ev->state == PropertyDelete)
|
||||
return; /* ignore */
|
||||
else if ((c = wintoclient(ev->window))) {
|
||||
switch(ev->atom) {
|
||||
default: break;
|
||||
case XA_WM_TRANSIENT_FOR:
|
||||
if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
|
||||
(c->isfloating = (wintoclient(trans)) != NULL))
|
||||
arrange(c->mon);
|
||||
break;
|
||||
case XA_WM_NORMAL_HINTS:
|
||||
updatesizehints(c);
|
||||
break;
|
||||
case XA_WM_HINTS:
|
||||
updatewmhints(c);
|
||||
drawbars();
|
||||
break;
|
||||
}
|
||||
if (ev->atom == XA_WM_NAME || ev->atom == atoms->netatom[NetWMName]) {
|
||||
updatetitle(c);
|
||||
if (c == c->mon->sel)
|
||||
drawbar(c->mon);
|
||||
}
|
||||
if (ev->atom == atoms->netatom[NetWMWindowType])
|
||||
updatewindowtype(c);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
resizerequest(XEvent *e)
|
||||
{
|
||||
XResizeRequestEvent *ev = &e->xresizerequest;
|
||||
Client *i;
|
||||
|
||||
if ((i = wintosystrayicon(ev->window))) {
|
||||
updatesystrayicongeom(i, ev->width, ev->height);
|
||||
resizebarwin(selmon);
|
||||
updatesystray();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
unmapnotify(XEvent *e)
|
||||
{
|
||||
Client *c;
|
||||
XUnmapEvent *ev = &e->xunmap;
|
||||
|
||||
if ((c = wintoclient(ev->window))) {
|
||||
if (ev->send_event)
|
||||
setclientstate(c, WithdrawnState);
|
||||
else
|
||||
unmanage(c, 0);
|
||||
}
|
||||
else if ((c = wintosystrayicon(ev->window))) {
|
||||
/* KLUDGE! sometimes icons occasionally unmap their windows, but do
|
||||
* _not_ destroy them. We map those windows back */
|
||||
XMapRaised(dpy, c->win);
|
||||
updatesystray();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue