Adding revamped dragmfact patch ref. #19
This commit is contained in:
55
dwm.c
55
dwm.c
@@ -2473,32 +2473,9 @@ resizemouse(const Arg *arg)
|
||||
return;
|
||||
horizcorner = nx < c->w / 2;
|
||||
vertcorner = ny < c->h / 2;
|
||||
#if DRAGMFACT_PATCH
|
||||
if (c->isfloating || NULL == c->mon->lt[c->mon->sellt]->arrange) {
|
||||
XWarpPointer (dpy, None, c->win, 0, 0, 0, 0,
|
||||
horizcorner ? (-c->bw) : (c->w + c->bw - 1),
|
||||
vertcorner ? (-c->bw) : (c->h + c->bw - 1)
|
||||
);
|
||||
} else {
|
||||
XWarpPointer(dpy, None, root, 0, 0, 0, 0,
|
||||
selmon->mx + (selmon->ww * selmon->mfact),
|
||||
selmon->my + (selmon->wh / 2)
|
||||
);
|
||||
}
|
||||
#else
|
||||
XWarpPointer (dpy, None, c->win, 0, 0, 0, 0,
|
||||
horizcorner ? (-c->bw) : (c->w + c->bw - 1),
|
||||
vertcorner ? (-c->bw) : (c->h + c->bw - 1));
|
||||
#endif // DRAGMFACT_PATCH
|
||||
#elif DRAGMFACT_PATCH
|
||||
if (c->isfloating || NULL == c->mon->lt[c->mon->sellt]->arrange) {
|
||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||||
} else {
|
||||
XWarpPointer(dpy, None, root, 0, 0, 0, 0,
|
||||
selmon->mx + (selmon->ww * selmon->mfact),
|
||||
selmon->my + (selmon->wh / 2)
|
||||
);
|
||||
}
|
||||
#else
|
||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||||
#endif // RESIZECORNERS_PATCH
|
||||
@@ -2523,7 +2500,6 @@ resizemouse(const Arg *arg)
|
||||
nw = MAX(horizcorner ? (ocx2 - nx) : (ev.xmotion.x - ocx - 2 * c->bw + 1), 1);
|
||||
nh = MAX(vertcorner ? (ocy2 - ny) : (ev.xmotion.y - ocy - 2 * c->bw + 1), 1);
|
||||
#endif // RESIZECORNERS_PATCH
|
||||
#if !DRAGMFACT_PATCH
|
||||
if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
|
||||
&& c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
|
||||
{
|
||||
@@ -2531,7 +2507,6 @@ resizemouse(const Arg *arg)
|
||||
&& (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
|
||||
togglefloating(NULL);
|
||||
}
|
||||
#endif // DRAGMFACT_PATCH
|
||||
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) {
|
||||
#if RESIZECORNERS_PATCH
|
||||
resize(c, nx, ny, nw, nh, 1);
|
||||
@@ -2556,35 +2531,9 @@ resizemouse(const Arg *arg)
|
||||
}
|
||||
} while (ev.type != ButtonRelease);
|
||||
#if RESIZECORNERS_PATCH
|
||||
#if DRAGMFACT_PATCH
|
||||
if (c->isfloating || NULL == c->mon->lt[c->mon->sellt]->arrange) {
|
||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
|
||||
horizcorner ? (-c->bw) : (c->w + c->bw - 1),
|
||||
vertcorner ? (-c->bw) : (c->h + c->bw - 1));
|
||||
} else {
|
||||
selmon->mfact = (double) (ev.xmotion.x_root - selmon->mx) / (double) selmon->ww;
|
||||
arrange(selmon);
|
||||
XWarpPointer(dpy, None, root, 0, 0, 0, 0,
|
||||
selmon->mx + (selmon->ww * selmon->mfact),
|
||||
selmon->my + (selmon->wh / 2)
|
||||
);
|
||||
}
|
||||
#else
|
||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
|
||||
horizcorner ? (-c->bw) : (c->w + c->bw - 1),
|
||||
vertcorner ? (-c->bw) : (c->h + c->bw - 1));
|
||||
#endif // DRAGMFACT_PATCH
|
||||
#elif DRAGMFACT_PATCH
|
||||
if (c->isfloating || NULL == c->mon->lt[c->mon->sellt]->arrange) {
|
||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||||
} else {
|
||||
selmon->mfact = (double) (ev.xmotion.x_root - selmon->mx) / (double) selmon->ww;
|
||||
arrange(selmon);
|
||||
XWarpPointer(dpy, None, root, 0, 0, 0, 0,
|
||||
selmon->mx + (selmon->ww * selmon->mfact),
|
||||
selmon->my + (selmon->wh / 2)
|
||||
);
|
||||
}
|
||||
#else
|
||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||||
#endif // RESIZECORNERS_PATCH
|
||||
@@ -2862,9 +2811,9 @@ setlayout(const Arg *arg)
|
||||
#endif // PERTAG_PATCH
|
||||
|
||||
#if FLEXTILE_DELUXE_LAYOUT
|
||||
if (selmon->lt[selmon->sellt]->preset.nmaster != -1)
|
||||
if (selmon->lt[selmon->sellt]->preset.nmaster && selmon->lt[selmon->sellt]->preset.nmaster != -1)
|
||||
selmon->nmaster = selmon->lt[selmon->sellt]->preset.nmaster;
|
||||
if (selmon->lt[selmon->sellt]->preset.nstack != -1)
|
||||
if (selmon->lt[selmon->sellt]->preset.nstack && selmon->lt[selmon->sellt]->preset.nstack != -1)
|
||||
selmon->nstack = selmon->lt[selmon->sellt]->preset.nstack;
|
||||
|
||||
selmon->ltaxis[LAYOUT] = selmon->lt[selmon->sellt]->preset.layout;
|
||||
|
Reference in New Issue
Block a user