[xsrc/trunk]: xsrc/external/mit merge libxcb 1.13.1, libXinerama 1.1.4, and l...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/5666ca3905cb
branches:  trunk
changeset: 10011:5666ca3905cb
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Dec 28 22:16:48 2018 +0000

description:
merge libxcb 1.13.1, libXinerama 1.1.4, and libXScrnSaver 1.2.3.

diffstat:

 external/mit/libXScrnSaver/dist/src/XScrnSaver.c |   2 +-
 external/mit/libXinerama/dist/src/Xinerama.c     |  15 +--------------
 external/mit/libxcb/dist/src/xcb_in.c            |  16 ++++++++++++++--
 external/mit/libxcb/include/config.h             |   8 ++++----
 4 files changed, 20 insertions(+), 21 deletions(-)

diffs (109 lines):

diff -r 6b9a5f3f3df8 -r 5666ca3905cb external/mit/libXScrnSaver/dist/src/XScrnSaver.c
--- a/external/mit/libXScrnSaver/dist/src/XScrnSaver.c  Fri Dec 28 22:14:51 2018 +0000
+++ b/external/mit/libXScrnSaver/dist/src/XScrnSaver.c  Fri Dec 28 22:16:48 2018 +0000
@@ -102,7 +102,7 @@
        se->send_event = (sevent->type & 0x80) != 0;
        se->display = dpy;
        se->window = sevent->window;
-       se->window = sevent->root;
+       se->root = sevent->root;
        se->state = sevent->state;
        se->kind = sevent->kind;
        se->forced = True;
diff -r 6b9a5f3f3df8 -r 5666ca3905cb external/mit/libXinerama/dist/src/Xinerama.c
--- a/external/mit/libXinerama/dist/src/Xinerama.c      Fri Dec 28 22:14:51 2018 +0000
+++ b/external/mit/libXinerama/dist/src/Xinerama.c      Fri Dec 28 22:16:48 2018 +0000
@@ -35,20 +35,6 @@
 #include <X11/extensions/panoramiXproto.h>
 #include <X11/extensions/Xinerama.h>
 
-#ifndef HAVE__XEATDATAWORDS
-#include <X11/Xmd.h>  /* for LONG64 on 64-bit platforms */
-#include <limits.h>
-
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
-    if (n >= (ULONG_MAX >> 2))
-        _XIOError(dpy);
-# endif
-    _XEatData (dpy, n << 2);
-}
-#endif
-
 static XExtensionInfo _panoramiX_ext_info_data;
 static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
 static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
@@ -300,6 +286,7 @@
     if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
        UnlockDisplay (dpy);
        SyncHandle ();
+       *number = 0;
        return NULL;
     }
 
diff -r 6b9a5f3f3df8 -r 5666ca3905cb external/mit/libxcb/dist/src/xcb_in.c
--- a/external/mit/libxcb/dist/src/xcb_in.c     Fri Dec 28 22:14:51 2018 +0000
+++ b/external/mit/libxcb/dist/src/xcb_in.c     Fri Dec 28 22:16:48 2018 +0000
@@ -958,8 +958,20 @@
         pend = container_of(c->in.pending_replies_tail, struct pending_reply, next);
         if(pend->workaround == WORKAROUND_EXTERNAL_SOCKET_OWNER)
         {
-            pend->last_request = c->out.request;
-            pend->workaround = WORKAROUND_NONE;
+            if (XCB_SEQUENCE_COMPARE(pend->first_request, <=, c->out.request)) {
+                pend->last_request = c->out.request;
+                pend->workaround = WORKAROUND_NONE;
+            } else {
+                /* The socket was taken, but no requests were actually sent
+                 * so just discard the pending_reply that was created.
+                 */
+                struct pending_reply **prev_next = &c->in.pending_replies;
+                while (*prev_next != pend)
+                    prev_next = &(*prev_next)->next;
+                *prev_next = NULL;
+                c->in.pending_replies_tail = prev_next;
+                free(pend);
+            }
         }
     }
 }
diff -r 6b9a5f3f3df8 -r 5666ca3905cb external/mit/libxcb/include/config.h
--- a/external/mit/libxcb/include/config.h      Fri Dec 28 22:14:51 2018 +0000
+++ b/external/mit/libxcb/include/config.h      Fri Dec 28 22:16:48 2018 +0000
@@ -75,7 +75,7 @@
 #define PACKAGE_NAME "libxcb"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxcb 1.13"
+#define PACKAGE_STRING "libxcb 1.13.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxcb"
@@ -84,7 +84,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.13"
+#define PACKAGE_VERSION "1.13.1"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -93,7 +93,7 @@
 #define PACKAGE_VERSION_MINOR 13
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 0
+#define PACKAGE_VERSION_PATCHLEVEL 1
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -124,7 +124,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.13"
+#define VERSION "1.13.1"
 
 /* XCB buffer queue size */
 #define XCB_QUEUE_BUFFER_SIZE 16384