|
|
|
@ -742,12 +742,12 @@ applyrules(Client *c)
|
|
|
|
|
#endif // SWALLOW_PATCH
|
|
|
|
|
c->isfloating = r->isfloating;
|
|
|
|
|
c->tags |= r->tags;
|
|
|
|
|
#if SCRATCHPADS_PATCH && !SCRATCHPAD_KEEP_POSITION_AND_SIZE_PATCH
|
|
|
|
|
#if SCRATCHPADS_PATCH
|
|
|
|
|
if ((r->tags & SPTAGMASK) && r->isfloating) {
|
|
|
|
|
c->x = c->mon->wx + (c->mon->ww / 2 - WIDTH(c) / 2);
|
|
|
|
|
c->y = c->mon->wy + (c->mon->wh / 2 - HEIGHT(c) / 2);
|
|
|
|
|
}
|
|
|
|
|
#endif // SCRATCHPADS_PATCH | SCRATCHPAD_KEEP_POSITION_AND_SIZE_PATCH
|
|
|
|
|
#endif // SCRATCHPADS_PATCH
|
|
|
|
|
for (m = mons; m && m->num != r->monitor; m = m->next);
|
|
|
|
|
if (m)
|
|
|
|
|
c->mon = m;
|
|
|
|
@ -2693,6 +2693,9 @@ sendmon(Client *c, Monitor *m)
|
|
|
|
|
arrange(c->mon);
|
|
|
|
|
#endif // SENDMON_KEEPFOCUS_PATCH
|
|
|
|
|
c->mon = m;
|
|
|
|
|
#if SCRATCHPADS_PATCH
|
|
|
|
|
if (!(c->tags & SPTAGMASK))
|
|
|
|
|
#endif // SCRATCHPADS_PATCH
|
|
|
|
|
#if EMPTYVIEW_PATCH
|
|
|
|
|
c->tags = (m->tagset[m->seltags] ? m->tagset[m->seltags] : 1);
|
|
|
|
|
#else
|
|
|
|
@ -3115,12 +3118,26 @@ showhide(Client *c)
|
|
|
|
|
if (!c)
|
|
|
|
|
return;
|
|
|
|
|
if (ISVISIBLE(c)) {
|
|
|
|
|
#if SCRATCHPADS_PATCH && !SCRATCHPAD_KEEP_POSITION_AND_SIZE_PATCH
|
|
|
|
|
#if SCRATCHPADS_KEEP_POSITION_AND_SIZE_PATCH
|
|
|
|
|
if (
|
|
|
|
|
(c->tags & SPTAGMASK) &&
|
|
|
|
|
c->isfloating &&
|
|
|
|
|
(
|
|
|
|
|
c->x < c->mon->mx ||
|
|
|
|
|
c->x > c->mon->mx + c->mon->mw ||
|
|
|
|
|
c->y < c->mon->my ||
|
|
|
|
|
c->y > c->mon->my + c->mon->mh
|
|
|
|
|
)
|
|
|
|
|
) {
|
|
|
|
|
c->x = c->mon->wx + (c->mon->ww / 2 - WIDTH(c) / 2);
|
|
|
|
|
c->y = c->mon->wy + (c->mon->wh / 2 - HEIGHT(c) / 2);
|
|
|
|
|
}
|
|
|
|
|
#elif SCRATCHPADS_PATCH
|
|
|
|
|
if ((c->tags & SPTAGMASK) && c->isfloating) {
|
|
|
|
|
c->x = c->mon->wx + (c->mon->ww / 2 - WIDTH(c) / 2);
|
|
|
|
|
c->y = c->mon->wy + (c->mon->wh / 2 - HEIGHT(c) / 2);
|
|
|
|
|
}
|
|
|
|
|
#endif // SCRATCHPADS_PATCH | SCRATCHPAD_KEEP_POSITION_AND_SIZE_PATCH
|
|
|
|
|
#endif // SCRATCHPADS_KEEP_POSITION_AND_SIZE_PATCH | SCRATCHPADS_PATCH
|
|
|
|
|
/* show clients top down */
|
|
|
|
|
#if SAVEFLOATS_PATCH || EXRESIZE_PATCH
|
|
|
|
|
if (!c->mon->lt[c->mon->sellt]->arrange && c->sfx != -9999 && !c->isfullscreen) {
|
|
|
|
|