there can only be one window in the event

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index ad539dc..700acfb 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -31,8 +31,6 @@ enum {
        NUMCOLS
 };
 
        NUMCOLS
 };
 

-#include "config.h"
-

 struct lock {
        int screen;
        Window root, win;
 struct lock {
        int screen;
        Window root, win;


@@ -46,6 +44,8 @@ struct xrandr {
        int errbase;
 };
 
        int errbase;
 };
 

+#include "config.h"
+

 static void
 die(const char *errstr, ...)
 {
 static void
 die(const char *errstr, ...)
 {


@@ -201,9 +201,15 @@ 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) {
                        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);
                                        XClearWindow(dpy, locks[screen]->win);

+                                       break;

                                }
                        }
                } else for (screen = 0; screen < nscreens; screen++)
                                }
                        }
                } else for (screen = 0; screen < nscreens; screen++)