1 files changed, 31 insertions, 9 deletions

diff --git a/os/connection.c b/os/connection.c
index 0df439189..4da01a641 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -124,15 +124,18 @@ static int lastfdesc;           /* maximum file descriptor */
 fd_set WellKnownConnections;    /* Listener mask */
 fd_set EnabledDevices;          /* mask for input devices that are on */
 fd_set NotifyReadFds;           /* mask for other file descriptors */
+fd_set NotifyWriteFds;          /* mask for other write file descriptors */
 fd_set AllSockets;              /* select on this */
 fd_set AllClients;              /* available clients */
 fd_set LastSelectMask;          /* mask returned from last select call */
+fd_set LastSelectWriteMask;     /* mask returned from last select call */
 fd_set ClientsWithInput;        /* clients with FULL requests in buffer */
 fd_set ClientsWriteBlocked;     /* clients who cannot receive output */
 fd_set OutputPending;           /* clients with reply/event data ready to go */
 int MaxClients = 0;
+int NumNotifyWriteFd;           /* Number of NotifyFd members with write set */
 Bool NewOutputPending;          /* not yet attempted to write some new output */
-Bool AnyClientsWriteBlocked;    /* true if some client blocked on write */
+Bool AnyWritesPending;          /* true if some client blocked on write or NotifyFd with write */
 Bool NoListenAll;               /* Don't establish any listening sockets */
 
 static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
@@ -969,8 +972,8 @@ CloseDownFileDescriptor(OsCommPtr oc)
         FD_CLR(connection, &SavedClientsWithInput);
     }
     FD_CLR(connection, &ClientsWriteBlocked);
-    if (!XFD_ANYSET(&ClientsWriteBlocked))
-        AnyClientsWriteBlocked = FALSE;
+    if (!XFD_ANYSET(&ClientsWriteBlocked) && NumNotifyWriteFd == 0)
+        AnyWritesPending = FALSE;
     FD_CLR(connection, &OutputPending);
 }
 
@@ -1112,6 +1115,7 @@ InitNotifyFds(void)
             RemoveNotifyFd(s->fd);
 
     xorg_list_init(&notify_fds);
+    NumNotifyWriteFd = 0;
     been_here = 1;
 }
 
@@ -1153,6 +1157,20 @@ SetNotifyFd(int fd, NotifyFdProcPtr notify, int mask, void *data)
             FD_CLR(fd, &NotifyReadFds);
         }
     }
+
+    if (changes & X_NOTIFY_WRITE) {
+        if (mask & X_NOTIFY_WRITE) {
+            FD_SET(fd, &NotifyWriteFds);
+            if (!NumNotifyWriteFd++)
+                AnyWritesPending = TRUE;
+        } else {
+            FD_CLR(fd, &NotifyWriteFds);
+            if (!--NumNotifyWriteFd)
+                if (!XFD_ANYSET(&ClientsWriteBlocked))
+                    AnyWritesPending = FALSE;
+        }
+    }
+
     if (mask == 0) {
         xorg_list_del(&n->list);
         free(n);
@@ -1174,12 +1192,16 @@ SetNotifyFd(int fd, NotifyFdProcPtr notify, int mask, void *data)
 void
 HandleNotifyFds(void)
 {
-    struct notify_fd *s, *next;
-
-    xorg_list_for_each_entry_safe(s, next, &notify_fds, list) {
-        if (FD_ISSET(s->fd, &LastSelectMask)) {
-            s->notify(s->fd, X_NOTIFY_READ, s->data);
-        }
+    struct notify_fd *n, *next;
+
+    xorg_list_for_each_entry_safe(n, next, &notify_fds, list) {
+        int ready = 0;
+        if ((n->mask & X_NOTIFY_READ) && FD_ISSET(n->fd, &LastSelectMask))
+            ready |= X_NOTIFY_READ;
+        if ((n->mask & X_NOTIFY_WRITE) & FD_ISSET(n->fd, &LastSelectWriteMask))
+            ready |= X_NOTIFY_WRITE;
+        if (ready != 0)
+            n->notify(n->fd, ready, n->data);
     }
 }