osama/dwm
1
0
Fork 0
mirror of https://github.com/mintycube/dwm.git synced 2024-10-22 12:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding revamped dragmfact patch ref. #19

Browse Source
This commit is contained in:
bakkeby 2020-03-27 20:46:54 +01:00
parent cf2e0c1d70
commit e9e32d28c7
8 changed files with 235 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -15,6 +15,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
### Changelog: ### Changelog:
2020-03-27 - Revamped the dragmfact patch to support both horizontal and vertical layout splits as well as centered master variants
2020-03-25 - Added dragcfact patch 2020-03-25 - Added dragcfact patch
2020-03-23 - Added stacker patch 2020-03-23 - Added stacker patch
@ -149,10 +151,11 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
- i.e. if topbar is 0 then dmenu will appear at the bottom and if 1 then dmenu will appear at the top - i.e. if topbar is 0 then dmenu will appear at the bottom and if 1 then dmenu will appear at the top
- dragcfact - dragcfact
- lets you resize clients' size (i.e. modify cfact) by holding modkey + shift and dragging the mouse - lets you resize clients' size (i.e. modify cfact) by holding modkey + shift + right-click and dragging the mouse
- [dragmfact](https://dwm.suckless.org/patches/dragmfact/) - [dragmfact](https://dwm.suckless.org/patches/dragmfact/)
- lets you resize the split in the tile layout (i.e. modify mfact) by holding the modkey and dragging the mouse - lets you resize the split in layouts (i.e. modify mfact) by holding the modkey + shift + left-click and dragging the mouse
- this is a bespoke patch that supports vertical and horizontal layout splits as well as centered master variants
- [dwmc](http://dwm.suckless.org/patches/dwmc/) - [dwmc](http://dwm.suckless.org/patches/dwmc/)
- a simple dwmc client using a fork of fsignal to communicate with dwm - a simple dwmc client using a fork of fsignal to communicate with dwm

3
config.def.h
View File

@ -954,6 +954,9 @@ static Button buttons[] = {
#if DRAGCFACT_PATCH && CFACTS_PATCH #if DRAGCFACT_PATCH && CFACTS_PATCH
{ ClkClientWin, MODKEY|ShiftMask, Button3, dragcfact, {0} }, { ClkClientWin, MODKEY|ShiftMask, Button3, dragcfact, {0} },
#endif // DRAGCFACT_PATCH #endif // DRAGCFACT_PATCH
#if DRAGMFACT_PATCH
{ ClkClientWin, MODKEY|ShiftMask, Button1, dragmfact, {0} },
#endif // DRAGMFACT_PATCH
{ ClkTagBar, 0, Button1, view, {0} }, { ClkTagBar, 0, Button1, view, {0} },
{ ClkTagBar, 0, Button3, toggleview, {0} }, { ClkTagBar, 0, Button3, toggleview, {0} },
{ ClkTagBar, MODKEY, Button1, tag, {0} }, { ClkTagBar, MODKEY, Button1, tag, {0} },

55
dwm.c
View File

@ -2473,32 +2473,9 @@ resizemouse(const Arg *arg)
return; return;
horizcorner = nx < c->w / 2; horizcorner = nx < c->w / 2;
vertcorner = ny < c->h / 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, XWarpPointer (dpy, None, c->win, 0, 0, 0, 0,
horizcorner ? (-c->bw) : (c->w + c->bw - 1), horizcorner ? (-c->bw) : (c->w + c->bw - 1),
vertcorner ? (-c->bw) : (c->h + 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 #else
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
#endif // RESIZECORNERS_PATCH #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); 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); nh = MAX(vertcorner ? (ocy2 - ny) : (ev.xmotion.y - ocy - 2 * c->bw + 1), 1);
#endif // RESIZECORNERS_PATCH #endif // RESIZECORNERS_PATCH
#if !DRAGMFACT_PATCH
if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww 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) && 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)) && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
togglefloating(NULL); togglefloating(NULL);
} }
#endif // DRAGMFACT_PATCH
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) { if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) {
#if RESIZECORNERS_PATCH #if RESIZECORNERS_PATCH
resize(c, nx, ny, nw, nh, 1); resize(c, nx, ny, nw, nh, 1);
@ -2556,35 +2531,9 @@ resizemouse(const Arg *arg)
} }
} while (ev.type != ButtonRelease); } while (ev.type != ButtonRelease);
#if RESIZECORNERS_PATCH #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, XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
horizcorner ? (-c->bw) : (c->w + c->bw - 1), horizcorner ? (-c->bw) : (c->w + c->bw - 1),
vertcorner ? (-c->bw) : (c->h + 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 #else
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
#endif // RESIZECORNERS_PATCH #endif // RESIZECORNERS_PATCH
@ -2862,9 +2811,9 @@ setlayout(const Arg *arg)
#endif // PERTAG_PATCH #endif // PERTAG_PATCH
#if FLEXTILE_DELUXE_LAYOUT #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; 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->nstack = selmon->lt[selmon->sellt]->preset.nstack;
selmon->ltaxis[LAYOUT] = selmon->lt[selmon->sellt]->preset.layout; selmon->ltaxis[LAYOUT] = selmon->lt[selmon->sellt]->preset.layout;

217
patch/dragmfact.c Normal file
View File

@ -0,0 +1,217 @@
void
dragmfact(const Arg *arg)
{
unsigned int n;
int py, px; // pointer coordinates
int ax, ay, aw, ah; // area position, width and height
int center = 0, horizontal = 0, mirror = 0; // layout configuration
double fact;
Monitor *m;
XEvent ev;
Time lasttime = 0;
m = selmon;
#if VANITYGAPS_PATCH
int oh, ov, ih, iv;
getgaps(m, &oh, &ov, &ih, &iv, &n);
#else
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
#endif // VANITYGAPS_PATCH
ax = m->wx;
ay = m->wy;
ah = m->wh;
aw = m->ww;
/* do not allow mfact to be modified under certain conditions */
if (!m->lt[m->sellt]->arrange // floating
|| (m->nmaster && n <= m->nmaster) // no master
#if MONOCLE_LAYOUT
|| m->lt[m->sellt]->arrange == monocle
#endif // MONOCLE_LAYOUT
#if GRIDMODE_LAYOUT
|| m->lt[m->sellt]->arrange == grid
#endif // GRIDMODE_LAYOUT
#if HORIZGRID_LAYOUT
|| m->lt[m->sellt]->arrange == horizgrid
#endif // HORIZGRID_LAYOUT
#if GAPPLESSGRID_LAYOUT
|| m->lt[m->sellt]->arrange == gaplessgrid
#endif // GAPPLESSGRID_LAYOUT
#if NROWGRID_LAYOUT
|| m->lt[m->sellt]->arrange == nrowgrid
#endif // NROWGRID_LAYOUT
#if FLEXTILE_DELUXE_LAYOUT
|| (m->lt[m->sellt]->arrange == flextile && m->ltaxis[LAYOUT] == NO_SPLIT)
#endif // FLEXTILE_DELUXE_LAYOUT
)
return;
#if FLEXTILE_DELUXE_LAYOUT
if (m->lt[m->sellt]->arrange == flextile) {
int layout = m->ltaxis[LAYOUT];
if (layout < 0) {
mirror = 1;
layout *= -1;
}
if (layout > FLOATING_MASTER)
layout -= FLOATING_MASTER;
if (layout == SPLIT_HORIZONTAL || layout == SPLIT_HORIZONTAL_DUAL_STACK)
horizontal = 1;
else if (layout == SPLIT_CENTERED_VERTICAL)
center = 1;
else if (layout == FLOATING_MASTER) {
center = 1;
if (aw < ah)
horizontal = 1;
}
else if (layout == SPLIT_CENTERED_HORIZONTAL) {
horizontal = 1;
center = 1;
}
}
#endif // FLEXTILE_DELUXE_LAYOUT
#if CENTEREDMASTER_LAYOUT
else if (m->lt[m->sellt]->arrange == centeredmaster)
center = 1;
#endif // CENTEREDMASTER_LAYOUT
#if CENTEREDFLOATINGMASTER_LAYOUT
else if (m->lt[m->sellt]->arrange == centeredfloatingmaster)
center = 1;
#endif // CENTEREDFLOATINGMASTER_LAYOUT
#if BSTACK_LAYOUT
else if (m->lt[m->sellt]->arrange == bstack)
horizontal = 1;
#endif // BSTACK_LAYOUT
#if BSTACKHORIZ_LAYOUT
else if (m->lt[m->sellt]->arrange == bstackhoriz)
horizontal = 1;
#endif // BSTACKHORIZ_LAYOUT
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
return;
#if VANITYGAPS_PATCH
ay += oh;
ax += ov;
aw -= 2*ov;
ah -= 2*oh;
#endif // VANITYGAPS_PATCH
if (center) {
if (horizontal) {
px = ax + aw / 2;
#if VANITYGAPS_PATCH
py = ay + ah / 2 + (ah - 2*ih) * (m->mfact / 2.0) + ih / 2;
#else
py = ay + ah / 2 + ah * m->mfact / 2.0;
#endif // VANITYGAPS_PATCH
} else { // vertical split
#if VANITYGAPS_PATCH
px = ax + aw / 2 + (aw - 2*iv) * m->mfact / 2.0 + iv / 2;
#else
px = ax + aw / 2 + aw * m->mfact / 2.0;
#endif // VANITYGAPS_PATCH
py = ay + ah / 2;
}
} else if (horizontal) {
px = ax + aw / 2;
if (mirror)
#if VANITYGAPS_PATCH
py = ay + (ah - ih) * (1.0 - m->mfact) + ih / 2;
#else
py = ay + (ah * (1.0 - m->mfact));
#endif // VANITYGAPS_PATCH
else
#if VANITYGAPS_PATCH
py = ay + ((ah - ih) * m->mfact) + ih / 2;
#else
py = ay + (ah * m->mfact);
#endif // VANITYGAPS_PATCH
} else { // vertical split
if (mirror)
#if VANITYGAPS_PATCH
px = ax + (aw - iv) * (1.0 - m->mfact) + iv / 2;
#else
px = ax + (aw * m->mfact);
#endif // VANITYGAPS_PATCH
else
#if VANITYGAPS_PATCH
px = ax + ((aw - iv) * m->mfact) + iv / 2;
#else
px = ax + (aw * m->mfact);
#endif // VANITYGAPS_PATCH
py = ay + ah / 2;
}
XWarpPointer(dpy, None, root, 0, 0, 0, 0, px, py);
do {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
switch(ev.type) {
case ConfigureRequest:
case Expose:
case MapRequest:
handler[ev.type](&ev);
break;
case MotionNotify:
if ((ev.xmotion.time - lasttime) <= (1000 / 40))
continue;
if (lasttime != 0) {
px = ev.xmotion.x;
py = ev.xmotion.y;
}
lasttime = ev.xmotion.time;
#if VANITYGAPS_PATCH
if (center)
if (horizontal)
if (py - ay > ah / 2)
fact = (double) 1.0 - (ay + ah - py - ih / 2) * 2 / (double) (ah - 2*ih);
else
fact = (double) 1.0 - (py - ay - ih / 2) * 2 / (double) (ah - 2*ih);
else
if (px - ax > aw / 2)
fact = (double) 1.0 - (ax + aw - px - iv / 2) * 2 / (double) (aw - 2*iv);
else
fact = (double) 1.0 - (px - ax - iv / 2) * 2 / (double) (aw - 2*iv);
else
if (horizontal)
fact = (double) (py - ay - ih / 2) / (double) (ah - ih);
else
fact = (double) (px - ax - iv / 2) / (double) (aw - iv);
#else
if (center)
if (horizontal)
if (py - ay > ah / 2)
fact = (double) 1.0 - (ay + ah - py) * 2 / (double) ah;
else
fact = (double) 1.0 - (py - ay) * 2 / (double) ah;
else
if (px - ax > aw / 2)
fact = (double) 1.0 - (ax + aw - px) * 2 / (double) aw;
else
fact = (double) 1.0 - (px - ax) * 2 / (double) aw;
else
if (horizontal)
fact = (double) (py - ay) / (double) ah;
else
fact = (double) (px - ax) / (double) aw;
#endif // VANITYGAPS_PATCH
if (!center && mirror)
fact = 1.0 - fact;
setmfact(&((Arg) { .f = 1.0 + fact }));
px = ev.xmotion.x;
py = ev.xmotion.y;
break;
}
} while (ev.type != ButtonRelease);
XUngrabPointer(dpy, CurrentTime);
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}

1
patch/dragmfact.h Normal file
View File

@ -0,0 +1 @@
static void dragmfact(const Arg *arg);

3
patch/include.c
View File

@ -167,6 +167,9 @@
#if XRDB_PATCH && !VTCOLORS_PATCH #if XRDB_PATCH && !VTCOLORS_PATCH
#include "xrdb.c" #include "xrdb.c"
#endif #endif
#if DRAGMFACT_PATCH
#include "dragmfact.c"
#endif
/* Layouts */ /* Layouts */
#if BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || CENTEREDMASTER_LAYOUT || CENTEREDFLOATINGMASTER_LAYOUT || COLUMNS_LAYOUT || DECK_LAYOUT || TILE_LAYOUT #if BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || CENTEREDMASTER_LAYOUT || CENTEREDFLOATINGMASTER_LAYOUT || COLUMNS_LAYOUT || DECK_LAYOUT || TILE_LAYOUT
#include "layout_facts.c" #include "layout_facts.c"

3
patch/include.h
View File

@ -29,6 +29,9 @@
#if DRAGCFACT_PATCH && CFACTS_PATCH #if DRAGCFACT_PATCH && CFACTS_PATCH
#include "dragcfact.h" #include "dragcfact.h"
#endif #endif
#if DRAGMFACT_PATCH
#include "dragmfact.h"
#endif
#if DWMC_PATCH #if DWMC_PATCH
#include "dwmc.h" #include "dwmc.h"
#elif FSIGNAL_PATCH #elif FSIGNAL_PATCH

2
patch/vanitygaps.h
View File

@ -10,7 +10,7 @@ static void incrivgaps(const Arg *arg);
static void togglegaps(const Arg *arg); static void togglegaps(const Arg *arg);
/* Internals */ /* Internals */
#if CENTEREDMASTER_LAYOUT || CENTEREDFLOATINGMASTER_LAYOUT || COLUMNS_LAYOUT || DECK_LAYOUT || FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT || GAPPLESSGRID_LAYOUT || NROWGRID_LAYOUT || HORIZGRID_LAYOUT || BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || GRIDMODE_LAYOUT || FLEXTILE_DELUXE_LAYOUT || TILE_LAYOUT || (VANITYGAPS_MONOCLE_PATCH && MONOCLE_LAYOUT) #if DRAGMFACT_PATCH || CENTEREDMASTER_LAYOUT || CENTEREDFLOATINGMASTER_LAYOUT || COLUMNS_LAYOUT || DECK_LAYOUT || FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT || GAPPLESSGRID_LAYOUT || NROWGRID_LAYOUT || HORIZGRID_LAYOUT || BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || GRIDMODE_LAYOUT || FLEXTILE_DELUXE_LAYOUT || TILE_LAYOUT || (VANITYGAPS_MONOCLE_PATCH && MONOCLE_LAYOUT)
static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc); static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc);
#endif #endif
static void setgaps(int oh, int ov, int ih, int iv); static void setgaps(int oh, int ov, int ih, int iv);