victor/dwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: victor:358147ececd73dd066f5a4d96aa027f831e19747
Branches Tags
victor:master
..
compare: victor:63d726ceee10bc247cb604cfda294e7603c826ff
Branches Tags
victor:master

No commits in common. "358147ececd73dd066f5a4d96aa027f831e19747" and "63d726ceee10bc247cb604cfda294e7603c826ff" have entirely different histories.
358147ecec ... 63d726ceee

4 changed files with 12 additions and 72 deletions
Show Stats Expand all files Collapse all files

12
config.def.h
View File

@ -72,12 +72,12 @@ static const char *termcmd[] = { "st", NULL };
ResourcePref resources[] = { ResourcePref resources[] = {
{ "font", STRING, &font }, { "font", STRING, &font },
{ "dmenufont", STRING, &dmenufont }, { "dmenufont", STRING, &dmenufont },
{ "color0", STRING, &normbordercolor }, { "normbgcolor", STRING, &normbgcolor },
{ "color8", STRING, &selbordercolor }, { "normbordercolor", STRING, &normbordercolor },
{ "color0", STRING, &normbgcolor }, { "normfgcolor", STRING, &normfgcolor },
{ "color4", STRING, &normfgcolor }, { "selbgcolor", STRING, &selbgcolor },
{ "color0", STRING, &selfgcolor }, { "selbordercolor", STRING, &selbordercolor },
{ "color4", STRING, &selbgcolor }, { "selfgcolor", STRING, &selfgcolor },
{ "borderpx", INTEGER, &borderpx }, { "borderpx", INTEGER, &borderpx },
{ "snap", INTEGER, &snap }, { "snap", INTEGER, &snap },
{ "showbar", INTEGER, &showbar }, { "showbar", INTEGER, &showbar },

12
config.h
View File

@ -84,12 +84,12 @@ static const char *termcmd[] = { TERMINAL, NULL };
ResourcePref resources[] = { ResourcePref resources[] = {
{ "font", STRING, &font }, { "font", STRING, &font },
{ "dmenufont", STRING, &dmenufont }, { "dmenufont", STRING, &dmenufont },
{ "color0", STRING, &normbordercolor }, { "normbgcolor", STRING, &normbgcolor },
{ "color8", STRING, &selbordercolor }, { "normbordercolor", STRING, &normbordercolor },
{ "color0", STRING, &normbgcolor }, { "normfgcolor", STRING, &normfgcolor },
{ "color4", STRING, &normfgcolor }, { "selbgcolor", STRING, &selbgcolor },
{ "color0", STRING, &selfgcolor }, { "selbordercolor", STRING, &selbordercolor },
{ "color4", STRING, &selbgcolor }, { "selfgcolor", STRING, &selfgcolor },
{ "borderpx", INTEGER, &borderpx }, { "borderpx", INTEGER, &borderpx },
{ "snap", INTEGER, &snap }, { "snap", INTEGER, &snap },
{ "showbar", INTEGER, &showbar }, { "showbar", INTEGER, &showbar },

8
dwm.c
View File

@ -926,8 +926,6 @@ focusmon(const Arg *arg)
unfocus(selmon->sel, 0); unfocus(selmon->sel, 0);
selmon = m; selmon = m;
focus(NULL); focus(NULL);
if (selmon->sel)
XWarpPointer(dpy, None, selmon->sel->win, 0, 0, 0, 0, selmon->sel->w/2, selmon->sel->h/2);
} }
void void
@ -953,7 +951,6 @@ focusstack(const Arg *arg)
if (c) { if (c) {
focus(c); focus(c);
restack(selmon); restack(selmon);
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
} }
} }
@ -1184,8 +1181,6 @@ manage(Window w, XWindowAttributes *wa)
c->mon->sel = c; c->mon->sel = c;
arrange(c->mon); arrange(c->mon);
XMapWindow(dpy, c->win); XMapWindow(dpy, c->win);
if (c && c->mon == selmon)
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
if (term) if (term)
swallow(term, c); swallow(term, c);
focus(NULL); focus(NULL);
@ -1936,9 +1931,6 @@ unmanage(Client *c, int destroyed)
arrange(m); arrange(m);
focus(NULL); focus(NULL);
updateclientlist(); updateclientlist();
if (m == selmon && m->sel)
XWarpPointer(dpy, None, m->sel->win, 0, 0, 0, 0,
m->sel->w/2, m->sel->h/2);
} }
} }

52
patches/dwm-cursorwarp-6.3.diff
View File

@ -1,52 +0,0 @@
From 94362c75d92a77d11dfbfecce89394b2e0078cd0 Mon Sep 17 00:00:00 2001
From: Finn Rayment <finn@rayment.fr>
Date: Sun, 21 Aug 2022 13:56:50 +1000
Subject: [PATCH] Added cursor warp for refocus and window spawn/death
---
dwm.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/dwm.c b/dwm.c
index a96f33c..f0e8a39 100644
--- a/dwm.c
+++ b/dwm.c
@@ -831,6 +831,8 @@ focusmon(const Arg *arg)
unfocus(selmon->sel, 0);
selmon = m;
focus(NULL);
+ if (selmon->sel)
+ XWarpPointer(dpy, None, selmon->sel->win, 0, 0, 0, 0, selmon->sel->w/2, selmon->sel->h/2);
}
void
@@ -856,6 +858,7 @@ focusstack(const Arg *arg)
if (c) {
focus(c);
restack(selmon);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
}
}
@@ -1077,6 +1080,8 @@ manage(Window w, XWindowAttributes *wa)
c->mon->sel = c;
arrange(c->mon);
XMapWindow(dpy, c->win);
+ if (c && c->mon == selmon)
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
focus(NULL);
}
@@ -1788,6 +1793,9 @@ unmanage(Client *c, int destroyed)
focus(NULL);
updateclientlist();
arrange(m);
+ if (m == selmon && m->sel)
+ XWarpPointer(dpy, None, m->sel->win, 0, 0, 0, 0,
+ m->sel->w/2, m->sel->h/2);
}
void
--
2.35.1