updategeom fix for same geom screens

diff --git a/config.mk b/config.mk
index 086424d..11a16f7 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
 # dwm version

-VERSION = 5.7
+VERSION = 5.6.1

 
 # Customize below to fit your system
 
 
 # Customize below to fit your system
 

diff --git a/dwm.c b/dwm.c
index e22ea7a..43f0fd5 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -1683,7 +1683,7 @@ updatebarpos(Monitor *m) {
 
 void
 updategeom(void) {
 
 void
 updategeom(void) {

-       int i, n = 1;
+       int i, n = 1, nn;

        Client *c;
        Monitor *newmons = NULL, *m = NULL, *tm;
 
        Client *c;
        Monitor *newmons = NULL, *m = NULL, *tm;
 


@@ -1692,6 +1692,11 @@ updategeom(void) {
 
        if(XineramaIsActive(dpy))
                info = XineramaQueryScreens(dpy, &n);
 
        if(XineramaIsActive(dpy))
                info = XineramaQueryScreens(dpy, &n);

+       for(i = 1, nn = n; i < n; i++)
+               if(info[i - 1].x_org == info[i].x_org && info[i - 1].y_org == info[i].y_org
+               && info[i - 1].width == info[i].width && info[i - 1].height == info[i].height)
+                       --nn;
+       n = nn; /* we only consider unique geometrys as separate screens */

 #endif /* XINERAMA */
        /* allocate monitor(s) for the new geometry setup */
        for(i = 0; i < n; i++) {
 #endif /* XINERAMA */
        /* allocate monitor(s) for the new geometry setup */
        for(i = 0; i < n; i++) {