|
|
@ -237,6 +237,7 @@ static void updatetitle(Client *c); |
|
|
|
static void updatewindowtype(Client *c); |
|
|
|
static void updatewindowtype(Client *c); |
|
|
|
static void updatewmhints(Client *c); |
|
|
|
static void updatewmhints(Client *c); |
|
|
|
static void view(const Arg *arg); |
|
|
|
static void view(const Arg *arg); |
|
|
|
|
|
|
|
static void warp(const Client *c); |
|
|
|
static Client *wintoclient(Window w); |
|
|
|
static Client *wintoclient(Window w); |
|
|
|
static Monitor *wintomon(Window w); |
|
|
|
static Monitor *wintomon(Window w); |
|
|
|
static int xerror(Display *dpy, XErrorEvent *ee); |
|
|
|
static int xerror(Display *dpy, XErrorEvent *ee); |
|
|
@ -908,6 +909,7 @@ focusmon(const Arg *arg) |
|
|
|
unfocus(selmon->sel, 0); |
|
|
|
unfocus(selmon->sel, 0); |
|
|
|
selmon = m; |
|
|
|
selmon = m; |
|
|
|
focus(NULL); |
|
|
|
focus(NULL); |
|
|
|
|
|
|
|
warp(selmon->sel); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void |
|
|
|
void |
|
|
@ -1475,6 +1477,8 @@ restack(Monitor *m) |
|
|
|
} |
|
|
|
} |
|
|
|
XSync(dpy, False); |
|
|
|
XSync(dpy, False); |
|
|
|
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev)); |
|
|
|
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 |
|
|
|
void |
|
|
@ -2258,6 +2262,28 @@ swallowingclient(Window w) |
|
|
|
return NULL; |
|
|
|
return NULL; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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 * |
|
|
|
Client * |
|
|
|
wintoclient(Window w) |
|
|
|
wintoclient(Window w) |
|
|
|
{ |
|
|
|
{ |
|
|
|