mirror of https://github.com/bakkeby/patches
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
98 lines
3.6 KiB
Diff
98 lines
3.6 KiB
Diff
From 3ddd6032fb60b780cb628d0a1866f1f2d5febf0b Mon Sep 17 00:00:00 2001
|
|
From: Bakkeby <bakkeby@gmail.com>
|
|
Date: Mon, 10 Jan 2022 13:31:54 +0100
|
|
Subject: [PATCH] resizepoint - Like resizecorners, but does not warp mouse
|
|
pointer
|
|
|
|
---
|
|
dwm.c | 30 +++++++++++++++++++++---------
|
|
1 file changed, 21 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/dwm.c b/dwm.c
|
|
index a96f33c..6f5d833 100644
|
|
--- a/dwm.c
|
|
+++ b/dwm.c
|
|
@@ -58,7 +58,7 @@
|
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
|
|
/* enums */
|
|
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
|
+enum { CurResizeBR, CurResizeBL, CurResizeTR, CurResizeTL, CurNormal, CurMove, CurLast }; /* cursor */
|
|
enum { SchemeNorm, SchemeSel }; /* color schemes */
|
|
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
|
@@ -1294,10 +1294,13 @@ resizeclient(Client *c, int x, int y, int w, int h)
|
|
void
|
|
resizemouse(const Arg *arg)
|
|
{
|
|
- int ocx, ocy, nw, nh;
|
|
+ int opx, opy, ocx, ocy, och, ocw, nx, ny, nw, nh;
|
|
Client *c;
|
|
Monitor *m;
|
|
XEvent ev;
|
|
+ int horizcorner, vertcorner;
|
|
+ unsigned int dui;
|
|
+ Window dummy;
|
|
Time lasttime = 0;
|
|
|
|
if (!(c = selmon->sel))
|
|
@@ -1307,10 +1310,15 @@ resizemouse(const Arg *arg)
|
|
restack(selmon);
|
|
ocx = c->x;
|
|
ocy = c->y;
|
|
+ och = c->h;
|
|
+ ocw = c->w;
|
|
+ if (!XQueryPointer(dpy, c->win, &dummy, &dummy, &opx, &opy, &nx, &ny, &dui))
|
|
+ return;
|
|
+ horizcorner = nx < c->w / 2;
|
|
+ vertcorner = ny < c->h / 2;
|
|
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
|
- None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
|
|
+ None, cursor[horizcorner | (vertcorner << 1)]->cursor, CurrentTime) != GrabSuccess)
|
|
return;
|
|
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
|
do {
|
|
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
|
|
switch(ev.type) {
|
|
@@ -1324,8 +1332,10 @@ resizemouse(const Arg *arg)
|
|
continue;
|
|
lasttime = ev.xmotion.time;
|
|
|
|
- nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
|
|
- nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
|
|
+ nx = horizcorner ? (ocx + ev.xmotion.x - opx) : c->x;
|
|
+ ny = vertcorner ? (ocy + ev.xmotion.y - opy) : c->y;
|
|
+ nw = MAX(horizcorner ? (ocx + ocw - nx) : (ocw + (ev.xmotion.x - opx)), 1);
|
|
+ nh = MAX(vertcorner ? (ocy + och - ny) : (och + (ev.xmotion.y - opy)), 1);
|
|
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)
|
|
{
|
|
@@ -1334,11 +1344,10 @@ resizemouse(const Arg *arg)
|
|
togglefloating(NULL);
|
|
}
|
|
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
|
|
- resize(c, c->x, c->y, nw, nh, 1);
|
|
+ resizeclient(c, nx, ny, nw, nh);
|
|
break;
|
|
}
|
|
} while (ev.type != ButtonRelease);
|
|
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
|
XUngrabPointer(dpy, CurrentTime);
|
|
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
|
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
|
@@ -1568,7 +1577,10 @@ setup(void)
|
|
netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
|
|
/* init cursors */
|
|
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
|
|
- cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
|
+ cursor[CurResizeBR] = drw_cur_create(drw, XC_bottom_right_corner);
|
|
+ cursor[CurResizeBL] = drw_cur_create(drw, XC_bottom_left_corner);
|
|
+ cursor[CurResizeTR] = drw_cur_create(drw, XC_top_right_corner);
|
|
+ cursor[CurResizeTL] = drw_cur_create(drw, XC_top_left_corner);
|
|
cursor[CurMove] = drw_cur_create(drw, XC_fleur);
|
|
/* init appearance */
|
|
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
|
--
|
|
2.19.1
|
|
|