|
|
|
@ -229,6 +229,7 @@ static void updatetitle(Client *c);
|
|
|
|
|
static void updatewindowtype(Client *c);
|
|
|
|
|
static void updatewmhints(Client *c);
|
|
|
|
|
static void view(const Arg *arg);
|
|
|
|
|
static void warp(const Client *c);
|
|
|
|
|
static Client *wintoclient(Window w);
|
|
|
|
|
static Monitor *wintomon(Window w);
|
|
|
|
|
static int xerror(Display *dpy, XErrorEvent *ee);
|
|
|
|
@ -829,6 +830,7 @@ focusmon(const Arg *arg)
|
|
|
|
|
unfocus(selmon->sel, 0);
|
|
|
|
|
selmon = m;
|
|
|
|
|
focus(NULL);
|
|
|
|
|
warp(selmon->sel);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
@ -1434,6 +1436,8 @@ restack(Monitor *m)
|
|
|
|
|
}
|
|
|
|
|
XSync(dpy, False);
|
|
|
|
|
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
|
|
|
|
if (m == selmon && (m->tagset[m->seltags] & m->sel->tags) && selmon->lt[selmon->sellt] != &layouts[2])
|
|
|
|
|
warp(m->sel);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
@ -2113,6 +2117,28 @@ view(const Arg *arg)
|
|
|
|
|
arrange(selmon);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
warp(const Client *c)
|
|
|
|
|
{
|
|
|
|
|
int x, y;
|
|
|
|
|
|
|
|
|
|
if (!c) {
|
|
|
|
|
XWarpPointer(dpy, None, root, 0, 0, 0, 0, selmon->wx + selmon->ww/2, selmon->wy + selmon->wh/2);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!getrootptr(&x, &y) ||
|
|
|
|
|
(x > c->x - c->bw &&
|
|
|
|
|
y > c->y - c->bw &&
|
|
|
|
|
x < c->x + c->w + c->bw*2 &&
|
|
|
|
|
y < c->y + c->h + c->bw*2) ||
|
|
|
|
|
(y > c->mon->by && y < c->mon->by + bh) ||
|
|
|
|
|
(c->mon->topbar && !y))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Client *
|
|
|
|
|
wintoclient(Window w)
|
|
|
|
|
{
|
|
|
|
|