aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/osdep.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-02-09 23:33:44 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-17 09:40:37 +0100
commit761d74a6805e1030f2206a50834b36d807e8e107 (patch)
tree4b91038e18db1e3d2ae0a9874291c515a69848ad /nx-X11/programs/Xserver/os/osdep.h
parent6307e6fc72f3cd748c9dc0e601a87171131309ea (diff)
downloadnx-libs-761d74a6805e1030f2206a50834b36d807e8e107.tar.gz
nx-libs-761d74a6805e1030f2206a50834b36d807e8e107.tar.bz2
nx-libs-761d74a6805e1030f2206a50834b36d807e8e107.zip
os: Implement support for NotifyFd X_NOTIFY_WRITE and removal of AddEnabledDevices/RemoveEnabledDevices
Backported from X.org: commit be5a513fee6cbf29ef7570e57eb0436d70fbd88c Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 7 15:12:14 2015 -0800 Remove AddEnabledDevice and AddGeneralSocket APIs All uses of these interfaces should instead be using the NotifyFd API instead. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com> commit 4020aacd1fc5b9c63369f011aeb9120af9c55218 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 11 22:02:03 2015 -0800 os: Implement support for NotifyFd X_NOTIFY_WRITE This adds the ability to be notified when a file descriptor is available for writing. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/os/osdep.h')
-rw-r--r--nx-X11/programs/Xserver/os/osdep.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h
index dce44e612..6ac9d860e 100644
--- a/nx-X11/programs/Xserver/os/osdep.h
+++ b/nx-X11/programs/Xserver/os/osdep.h
@@ -201,9 +201,11 @@ extern ConnectionOutputPtr AllocateOutputBuffer(void);
extern fd_set AllSockets;
extern fd_set AllClients;
extern fd_set LastSelectMask;
+extern fd_set LastSelectWriteMask;
extern fd_set WellKnownConnections;
extern fd_set EnabledDevices;
extern fd_set NotifyReadFds;
+extern fd_set NotifyWriteFds;
extern fd_set ClientsWithInput;
extern fd_set ClientsWriteBlocked;
extern fd_set OutputPending;
@@ -218,7 +220,8 @@ extern void ClearConnectionTranslation();
#endif
extern Bool NewOutputPending;
-extern Bool AnyClientsWriteBlocked;
+extern Bool AnyWritesPending;
+extern Bool NumNotifyWriteFd;
extern Bool CriticalOutputPending;
extern int timesThisConnection;