add 'general socket' handler, port ACPI to use it

Add a general socket (not input device, but still need to be woken for it)
handler to both the DIX and XFree86, and make XFree86's ACPI handling use
it.  This stops DPMS waking up every time an ACPI notification comes in.

1 files changed, 17 insertions, 5 deletions

diff --git a/os/connection.c b/os/connection.c
index 6ca4010e2..daad2ac8a 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1048,21 +1048,33 @@ CloseDownConnection(ClientPtr client)
 }
 
 _X_EXPORT void
+AddGeneralSocket(int fd)
+{
+    FD_SET(fd, &AllSockets);
+    if (GrabInProgress)
+        FD_SET(fd, &SavedAllSockets);
+}
+
+_X_EXPORT void
 AddEnabledDevice(int fd)
 {
     FD_SET(fd, &EnabledDevices);
-    FD_SET(fd, &AllSockets);
+    AddGeneralSocket(fd);
+}
+
+_X_EXPORT void
+RemoveGeneralSocket(int fd)
+{
+    FD_CLR(fd, &AllSockets);
     if (GrabInProgress)
-	FD_SET(fd, &SavedAllSockets);
+        FD_CLR(fd, &SavedAllSockets);
 }
 
 _X_EXPORT void
 RemoveEnabledDevice(int fd)
 {
     FD_CLR(fd, &EnabledDevices);
-    FD_CLR(fd, &AllSockets);
-    if (GrabInProgress)
-	FD_CLR(fd, &SavedAllSockets);
+    RemoveGeneralSocket(fd);
 }
 
 /*****************