Fix floor control issues and make it work again.

Some braindead errors, guess I was running low on caffeine when I introduced
them.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/FloorControl.cpp b/src/FloorControl.cpp
index 42511fb..382ef32 100644
--- a/src/FloorControl.cpp
+++ b/src/FloorControl.cpp
@@ -236,8 +236,8 @@ void FloorControl::handleButtonPress(XDeviceButtonEvent* ev, PointerDevice* dev)
 
     if (node)
     {
-        XID *permdevs, 
-             *denydevs;
+        XID *permdevs = NULL, 
+             *denydevs = NULL;
         int nperm, ndeny, rule;
 
         XQueryWindowAccess(x11->dpy, client->getClientWindow(), &rule, 
@@ -254,8 +254,8 @@ void FloorControl::handleButtonPress(XDeviceButtonEvent* ev, PointerDevice* dev)
 
             if (i >= nperm)
             {
-                permdevs = (XID*)realloc(permdevs, (ndeny + 1) * sizeof(XID));
-                denydevs[ndeny++] = (char)id;
+                permdevs = (XID*)realloc(permdevs, (nperm + 1) * sizeof(XID));
+                permdevs[nperm++] = (char)id;
                 XPermitDevices(x11->dpy, client->getClientWindow(), permdevs, nperm);
             }
         }
@@ -274,6 +274,10 @@ void FloorControl::handleButtonPress(XDeviceButtonEvent* ev, PointerDevice* dev)
             }
         }
 
+        if (nperm > 0)
+            XChangeAccessRule(x11->dpy, node->win, WindowAccessDenyAll);
+        else
+            XWindowClearAccess(x11->dpy, node->win, WindowAccessClearRule);
 
         free(permdevs);
         free(denydevs);