Switch over to XIDs instead of chars and ints for device ids.

This patch became necessary with inputproto commit
0e9f8468ba15a55ddba7fb8c263a80091e9decde.

Thanks to packz@autistici.org for the patch.

4 files changed, 10 insertions, 10 deletions

diff --git a/src/FloorControl.cpp b/src/FloorControl.cpp
index 85d1900..42511fb 100644
--- a/src/FloorControl.cpp
+++ b/src/FloorControl.cpp
@@ -236,7 +236,7 @@ void FloorControl::handleButtonPress(XDeviceButtonEvent* ev, PointerDevice* dev)
 
     if (node)
     {
-        char *permdevs, 
+        XID *permdevs, 
              *denydevs;
         int nperm, ndeny, rule;
 
@@ -248,13 +248,13 @@ void FloorControl::handleButtonPress(XDeviceButtonEvent* ev, PointerDevice* dev)
             int i;
             for (i = 0; i < nperm; i++)
             {
-                if (permdevs[i] == (char)id)
+                if (permdevs[i] == (XID)id)
                     break;
             }
 
             if (i >= nperm)
             {
-                permdevs = (char*)realloc(permdevs, (ndeny + 1) * sizeof(char));
+                permdevs = (XID*)realloc(permdevs, (ndeny + 1) * sizeof(XID));
                 denydevs[ndeny++] = (char)id;
                 XPermitDevices(x11->dpy, client->getClientWindow(), permdevs, nperm);
             }
@@ -263,7 +263,7 @@ void FloorControl::handleButtonPress(XDeviceButtonEvent* ev, PointerDevice* dev)
         {
             for (int i = 0; i < nperm; i++)
             {
-                if (permdevs[i] == (char)id)
+                if (permdevs[i] == (XID)id)
                 {
                     if (i + 1 < nperm)
                         memmove(&permdevs[i], &permdevs[i+1], nperm - i - 1);
diff --git a/src/Manager.cpp b/src/Manager.cpp
index 5b3b3d6..53ff1e8 100644
--- a/src/Manager.cpp
+++ b/src/Manager.cpp
@@ -164,7 +164,7 @@ void Manager::initXi()
 void Manager::rescanPairings()
 {
     vector<KeyboardDevice*>::const_iterator it = keyboards.begin();
-    int ptr_id;
+    XID ptr_id;
     while(it != keyboards.end())
     {
         if (XGetPairedPointer(x11->dpy, (*it)->getDevice(), &ptr_id))
diff --git a/src/Overlay.cpp b/src/Overlay.cpp
index 1d34379..f92dfe1 100644
--- a/src/Overlay.cpp
+++ b/src/Overlay.cpp
@@ -74,7 +74,7 @@ void Overlay::initWindows()
  */
 void Overlay::toggle(int id) 
 {
-    char *permdevs, 
+    XID *permdevs, 
          *denydevs;
     int nperm, ndeny, rule;
 
@@ -90,13 +90,13 @@ void Overlay::toggle(int id)
         int i;
         for (i = 0; i < ndeny; i++)
         {
-            if (denydevs[i] == (char)id)
+            if (denydevs[i] == (XID)id)
                 break;
         }
 
         if (i >= ndeny)
         {
-            denydevs = (char*)realloc(denydevs, (ndeny + 1) * sizeof(char));
+            denydevs = (XID*)realloc(denydevs, (ndeny + 1) * sizeof(XID));
             denydevs[ndeny++] = (char)id;
             XDenyDevices(x11->dpy, client->getClientWindow(), denydevs, ndeny);
         }
@@ -109,7 +109,7 @@ void Overlay::toggle(int id)
 
         for (int i = 0; i < ndeny; i++)
         {
-            if (denydevs[i] == (char)id)
+            if (denydevs[i] == (XID)id)
             {
                 if (i + 1 < ndeny)
                     memmove(&denydevs[i], &denydevs[i+1], ndeny - i - 1);
diff --git a/src/WMWindow.cpp b/src/WMWindow.cpp
index 4630794..3a11367 100644
--- a/src/WMWindow.cpp
+++ b/src/WMWindow.cpp
@@ -603,7 +603,7 @@ bool WMWindow::restrictTo(PointerDevice* dev)
 {
     if (restrictedTo != NULL && dev != restrictedTo)
         return false;
-    char id = (char)dev->getID();
+    XID id = (XID)dev->getID();
 
     XChangeAccessRule(x11->dpy, client, WindowAccessDenyAll);
     XPermitDevices(x11->dpy, client, &id, 1);