sravan/dwm-flexipatch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor refactoring of warp and fullscreen patches, getting rid of MONOCLE_LAYOUT_POS setting

Browse Source
This commit is contained in:
bakkeby
2020-08-27 06:26:48 +02:00
parent f45acf8795
commit e952cc9a81
5 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patch/fullscreen.c
View File

@@ -3,9 +3,11 @@ Layout *last_layout;
void
fullscreen(const Arg *arg)
{
int monocle_pos;
if (selmon->showbar || last_layout == NULL) {
for (monocle_pos = 0, last_layout = (Layout *)layouts; !last_layout->arrange || last_layout->arrange != &monocle; monocle_pos++, last_layout++ );
for (last_layout = (Layout *)layouts; last_layout != selmon->lt[selmon->sellt]; last_layout++);
setlayout(&((Arg) { .v = &layouts[MONOCLE_LAYOUT_POS] }));
setlayout(&((Arg) { .v = &layouts[monocle_pos] }));
} else {
setlayout(&((Arg) { .v = last_layout }));
}

20
patch/warp.c
View File

@@ -4,21 +4,21 @@ warp(const Client *c)
int x, y;
if (!c) {
XWarpPointer(dpy, None, root, 0, 0, 0, 0, selmon->wx + selmon->ww/2, selmon->wy + selmon->wh/2);
XWarpPointer(dpy, None, root, 0, 0, 0, 0, selmon->wx + selmon->ww / 2, selmon->wy + selmon->wh / 2);
return;
}
if (!getrootptr(&x, &y) ||
(x > c->x - c->bw &&
y > c->y - c->bw &&
x < c->x + c->w + c->bw*2 &&
y < c->y + c->h + c->bw*2) ||
x < c->mon->wx ||
x > c->mon->wx + c->mon->ww ||
y < c->mon->wy ||
y > c->mon->wy + c->mon->wh
(x > c->x - c->bw &&
y > c->y - c->bw &&
x < c->x + c->w + c->bw*2 &&
y < c->y + c->h + c->bw*2) ||
x < c->mon->wx ||
x > c->mon->wx + c->mon->ww ||
y < c->mon->wy ||
y > c->mon->wy + c->mon->wh
)
return;
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
}
}