Merge branch '3.6.x'

1 files changed, 69 insertions, 0 deletions

diff --git a/nx-X11/lib/src/Pending.c b/nx-X11/lib/src/Pending.c
new file mode 100644
index 000000000..d3804c629
--- /dev/null
+++ b/nx-X11/lib/src/Pending.c
@@ -0,0 +1,69 @@
+/*
+
+Copyright 1986, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_TEST)
+#include <stdio.h>
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+
+/* Read in pending events if needed and return the number of queued events. */
+
+int XEventsQueued (
+    register Display *dpy,
+    int mode)
+{
+    int ret_val;
+#if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_TEST)
+    fprintf(stderr, "\nXEventsQueued: Called with a display at [%p].\n", (void *)dpy);
+#endif
+
+    LockDisplay(dpy);
+    if (dpy->qlen || (mode == QueuedAlready))
+	ret_val = dpy->qlen;
+    else
+	ret_val = _XEventsQueued (dpy, mode);
+#if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_TEST)
+    fprintf(stderr, "\nXEventsQueued: Going to unlock the display at [%p].\n", (void *)dpy);
+#endif
+    UnlockDisplay(dpy);
+    return ret_val;
+}
+
+int XPending (register Display *dpy)
+{
+    int ret_val;
+    LockDisplay(dpy);
+    if (dpy->qlen)
+	ret_val = dpy->qlen;
+    else
+	ret_val = _XEventsQueued (dpy, QueuedAfterFlush);
+    UnlockDisplay(dpy);
+    return ret_val;
+}