Fix resize with multiple monitors and portrait mode

When connecting/disconnecting a portrait monitor, the
XRRScreenChangeNotifyEvent height & width are reversed due to the XRandR
rotation; detect this and DTRT.

diff --git a/slock.c b/slock.c
index d2f08862453615c3131332273fbd1d0187f4195c..61fe9ee2c5009d948ffa74fd7ba54cd4399856ba 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -201,8 +201,13 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
                        rre = (XRRScreenChangeNotifyEvent*)&ev;
                        for (screen = 0; screen < nscreens; screen++) {
                                if (locks[screen]->win == rre->window) {
-                                       XResizeWindow(dpy, locks[screen]->win,
-                                                     rre->width, rre->height);
+                                       if (rre->rotation == RR_Rotate_90 ||
+                                           rre->rotation == RR_Rotate_270)
+                                               XResizeWindow(dpy, locks[screen]->win,
+                                                             rre->height, rre->width);
+                                       else
+                                               XResizeWindow(dpy, locks[screen]->win,
+                                                             rre->width, rre->height);
                                        XClearWindow(dpy, locks[screen]->win);
                                }
                        }