mirror of
https://github.com/mintycube/dwm.git
synced 2024-10-22 14:05:45 +02:00
Adding dragcfact patch, ref. #19
This commit is contained in:
parent
d17a306a94
commit
32d3d2b7c3
@ -15,6 +15,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
|
|||||||
|
|
||||||
### Changelog:
|
### Changelog:
|
||||||
|
|
||||||
|
2020-03-25 - Added dragcfact patch
|
||||||
|
|
||||||
2020-03-23 - Added stacker patch
|
2020-03-23 - Added stacker patch
|
||||||
|
|
||||||
2020-03-21 - Reworked a series of layouts to re-allocate remaining pixels following an even (or cfacts) split with the aim of presenting a pixel perfect layout. This affects the following layouts: tile, bstack, bstackhoriz, centered master, centered floating master, columns, deck, and corresponding flextile-deluxe layouts
|
2020-03-21 - Reworked a series of layouts to re-allocate remaining pixels following an even (or cfacts) split with the aim of presenting a pixel perfect layout. This affects the following layouts: tile, bstack, bstackhoriz, centered master, centered floating master, columns, deck, and corresponding flextile-deluxe layouts
|
||||||
@ -146,6 +148,9 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
|
|||||||
- updates the position of dmenu to match that of the bar
|
- updates the position of dmenu to match that of the bar
|
||||||
- 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
|
||||||
|
- lets you resize clients' size (i.e. modify cfact) by holding modkey + shift 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 the tile layout (i.e. modify mfact) by holding the modkey and dragging the mouse
|
||||||
|
|
||||||
|
@ -720,7 +720,7 @@ static Key keys[] = {
|
|||||||
#if CFACTS_PATCH
|
#if CFACTS_PATCH
|
||||||
{ MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} },
|
{ MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} },
|
||||||
{ MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} },
|
{ MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} },
|
||||||
{ MODKEY|ShiftMask, XK_o, setcfact, {.f = 0.00} },
|
{ MODKEY|ShiftMask, XK_o, setcfact, {0} },
|
||||||
#endif // CFACTS_PATCH
|
#endif // CFACTS_PATCH
|
||||||
#if MOVESTACK_PATCH
|
#if MOVESTACK_PATCH
|
||||||
{ MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } },
|
{ MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } },
|
||||||
@ -951,6 +951,9 @@ static Button buttons[] = {
|
|||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||||
|
#if DRAGCFACT_PATCH && CFACTS_PATCH
|
||||||
|
{ ClkClientWin, MODKEY|ShiftMask, Button3, dragcfact, {0} },
|
||||||
|
#endif // DRAGCFACT_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} },
|
||||||
|
@ -8,11 +8,14 @@ setcfact(const Arg *arg)
|
|||||||
|
|
||||||
if (!arg || !c || !selmon->lt[selmon->sellt]->arrange)
|
if (!arg || !c || !selmon->lt[selmon->sellt]->arrange)
|
||||||
return;
|
return;
|
||||||
f = arg->f + c->cfact;
|
if (!arg->f)
|
||||||
if (arg->f == 0.0)
|
|
||||||
f = 1.0;
|
f = 1.0;
|
||||||
else if (f < 0.25 || f > 4.0)
|
else
|
||||||
return;
|
f = arg->f + c->cfact;
|
||||||
|
if (f < 0.25)
|
||||||
|
f = 0.25;
|
||||||
|
else if (f > 4.0)
|
||||||
|
f = 4.0;
|
||||||
c->cfact = f;
|
c->cfact = f;
|
||||||
arrange(selmon);
|
arrange(selmon);
|
||||||
}
|
}
|
71
patch/dragcfact.c
Normal file
71
patch/dragcfact.c
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
void
|
||||||
|
dragcfact(const Arg *arg)
|
||||||
|
{
|
||||||
|
int prev_x, prev_y, dist_x, dist_y;
|
||||||
|
float fact;
|
||||||
|
Client *c;
|
||||||
|
XEvent ev;
|
||||||
|
Time lasttime = 0;
|
||||||
|
|
||||||
|
if (!(c = selmon->sel))
|
||||||
|
return;
|
||||||
|
if (c->isfloating) /* no support rezising floating windows */
|
||||||
|
return;
|
||||||
|
#if !FAKEFULLSCREEN_PATCH
|
||||||
|
#if FAKEFULLSCREEN_CLIENT_PATCH
|
||||||
|
if (c->isfullscreen && !c->fakefullscreen) /* no support resizing fullscreen windows by mouse */
|
||||||
|
return;
|
||||||
|
#else
|
||||||
|
if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
|
||||||
|
return;
|
||||||
|
#endif // FAKEFULLSCREEN_CLIENT_PATCH
|
||||||
|
#endif // !FAKEFULLSCREEN_PATCH
|
||||||
|
restack(selmon);
|
||||||
|
|
||||||
|
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
||||||
|
None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
|
||||||
|
return;
|
||||||
|
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
|
||||||
|
|
||||||
|
prev_x = prev_y = -999999;
|
||||||
|
|
||||||
|
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 / 60))
|
||||||
|
continue;
|
||||||
|
lasttime = ev.xmotion.time;
|
||||||
|
if (prev_x == -999999) {
|
||||||
|
prev_x = ev.xmotion.x_root;
|
||||||
|
prev_y = ev.xmotion.y_root;
|
||||||
|
}
|
||||||
|
|
||||||
|
dist_x = ev.xmotion.x - prev_x;
|
||||||
|
dist_y = ev.xmotion.y - prev_y;
|
||||||
|
|
||||||
|
if (abs(dist_x) > abs(dist_y)) {
|
||||||
|
fact = (float) 4.0 * dist_x / c->mon->ww;
|
||||||
|
} else {
|
||||||
|
fact = (float) -4.0 * dist_y / c->mon->wh;
|
||||||
|
}
|
||||||
|
|
||||||
|
setcfact(&((Arg) { .f = fact }));
|
||||||
|
|
||||||
|
prev_x = ev.xmotion.x;
|
||||||
|
prev_y = ev.xmotion.y;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} while (ev.type != ButtonRelease);
|
||||||
|
|
||||||
|
|
||||||
|
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
|
||||||
|
|
||||||
|
XUngrabPointer(dpy, CurrentTime);
|
||||||
|
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
||||||
|
}
|
1
patch/dragcfact.h
Normal file
1
patch/dragcfact.h
Normal file
@ -0,0 +1 @@
|
|||||||
|
static void dragcfact(const Arg *arg);
|
@ -26,6 +26,9 @@
|
|||||||
#if CYCLELAYOUTS_PATCH
|
#if CYCLELAYOUTS_PATCH
|
||||||
#include "cyclelayouts.c"
|
#include "cyclelayouts.c"
|
||||||
#endif
|
#endif
|
||||||
|
#if DRAGCFACT_PATCH && CFACTS_PATCH
|
||||||
|
#include "dragcfact.c"
|
||||||
|
#endif
|
||||||
#if DWMC_PATCH
|
#if DWMC_PATCH
|
||||||
#include "dwmc.c"
|
#include "dwmc.c"
|
||||||
#elif FSIGNAL_PATCH
|
#elif FSIGNAL_PATCH
|
||||||
|
@ -26,6 +26,9 @@
|
|||||||
#if CYCLELAYOUTS_PATCH
|
#if CYCLELAYOUTS_PATCH
|
||||||
#include "cyclelayouts.h"
|
#include "cyclelayouts.h"
|
||||||
#endif
|
#endif
|
||||||
|
#if DRAGCFACT_PATCH && CFACTS_PATCH
|
||||||
|
#include "dragcfact.h"
|
||||||
|
#endif
|
||||||
#if DWMC_PATCH
|
#if DWMC_PATCH
|
||||||
#include "dwmc.h"
|
#include "dwmc.h"
|
||||||
#elif FSIGNAL_PATCH
|
#elif FSIGNAL_PATCH
|
||||||
|
@ -126,6 +126,11 @@
|
|||||||
*/
|
*/
|
||||||
#define DMENUMATCHTOP_PATCH 0
|
#define DMENUMATCHTOP_PATCH 0
|
||||||
|
|
||||||
|
/* Similarly to the dragmfact patch this allows you to click and drag clients to change the
|
||||||
|
* cfact to adjust the client's size in the stack. This patch depends on the cfacts patch.
|
||||||
|
*/
|
||||||
|
#define DRAGCFACT_PATCH 0
|
||||||
|
|
||||||
/* This patch lets you resize the split in the tile layout (i.e. modify mfact) by holding
|
/* This patch lets you resize the split in the tile layout (i.e. modify mfact) by holding
|
||||||
* the modkey and dragging the mouse.
|
* the modkey and dragging the mouse.
|
||||||
* This patch can be a bit wonky with other layouts, but generally works.
|
* This patch can be a bit wonky with other layouts, but generally works.
|
||||||
|
Loading…
Reference in New Issue
Block a user