1 files changed, 12 insertions, 0 deletions

diff --git a/dwm.c b/dwm.c
index 53af7c9..1afb953 100644
--- a/dwm.c
+++ b/dwm.c
@@ -220,6 +220,7 @@ static void updatestatus(void);
 static void updatetitle(Client *c);
 static void updatewmhints(Client *c);
 static void view(const Arg *arg);
+static void warptomon(Monitor *m);
 static Client *wintoclient(Window w);
 static Monitor *wintomon(Window w);
 static int xerror(Display *dpy, XErrorEvent *ee);
@@ -882,6 +883,7 @@ focusmon(const Arg *arg) {
                 return;
         unfocus(selmon->sel, True);
         selmon = m;
+        warptomon(selmon);
         focus(NULL);
 }
 
@@ -2078,6 +2080,16 @@ view(const Arg *arg) {
         arrange(selmon);
 }
 
+void
+warptomon(Monitor *m) {
+        if(!m)
+                return;
+        if(m->sel) /* focus previously focused client */
+                XWarpPointer(dpy, None, selmon->sel->win, 0, 0, 0, 0, 0, 0);
+        else /* upper left corner */
+                XWarpPointer(dpy, None, root, 0, 0, 0, 0, selmon->wx, selmon->wy);
+}
+
 Client *
 wintoclient(Window w) {
         Client *c;