diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
commit | d14cc5361f7db7016b7cbb1cc59d8500101d9f27 (patch) | |
tree | 28bb620b5a39a9f649393e5ad113b07089fafe2b /doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_ChkIfEv.c.X.original | |
parent | 74a52dd354cc638c9f5fdedb0606b3b69e2b488a (diff) | |
download | nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.gz nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.bz2 nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.zip |
doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_ChkIfEv.c.X.original')
-rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_ChkIfEv.c.X.original | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_ChkIfEv.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_ChkIfEv.c.X.original deleted file mode 100644 index 333838d51..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_ChkIfEv.c.X.original +++ /dev/null @@ -1,59 +0,0 @@ ---- ./nx-X11/lib/X11/ChkIfEv.c.X.original 2015-02-13 14:03:44.620443950 +0100 -+++ ./nx-X11/lib/X11/ChkIfEv.c 2015-02-10 19:13:13.120711494 +0100 -@@ -83,3 +83,56 @@ - UnlockDisplay(dpy); - return False; - } -+ -+#ifdef NX_TRANS_SOCKET -+ -+/* -+ * This is just like XCheckIfEvent() but doesn't -+ * flush the output buffer if it can't read new -+ * events. -+ */ -+ -+Bool XCheckIfEventNoFlush (dpy, event, predicate, arg) -+ register Display *dpy; -+ Bool (*predicate)( -+ Display* /* display */, -+ XEvent* /* event */, -+ char* /* arg */ -+ ); /* function to call */ -+ register XEvent *event; /* XEvent to be filled in. */ -+ char *arg; -+{ -+ register _XQEvent *prev, *qelt; -+ unsigned long qe_serial = 0; -+ int n; /* time through count */ -+ -+ LockDisplay(dpy); -+ prev = NULL; -+ for (n = 2; --n >= 0;) { -+ for (qelt = prev ? prev->next : dpy->head; -+ qelt; -+ prev = qelt, qelt = qelt->next) { -+ if(qelt->qserial_num > qe_serial -+ && (*predicate)(dpy, &qelt->event, arg)) { -+ *event = qelt->event; -+ _XDeq(dpy, prev, qelt); -+ UnlockDisplay(dpy); -+ return True; -+ } -+ } -+ if (prev) -+ qe_serial = prev->qserial_num; -+ switch (n) { -+ case 1: -+ _XEventsQueued(dpy, QueuedAfterReading); -+ break; -+ } -+ if (prev && prev->qserial_num != qe_serial) -+ /* another thread has snatched this event */ -+ prev = NULL; -+ } -+ UnlockDisplay(dpy); -+ return False; -+} -+ -+#endif |