Module Name: xsrc
Committed By: mrg
Date: Fri Dec 28 22:16:48 UTC 2018
Modified Files:
xsrc/external/mit/libXScrnSaver/dist/src: XScrnSaver.c
xsrc/external/mit/libXinerama/dist/src: Xinerama.c
xsrc/external/mit/libxcb/dist/src: xcb_in.c
xsrc/external/mit/libxcb/include: config.h
Log Message:
merge libxcb 1.13.1, libXinerama 1.1.4, and libXScrnSaver 1.2.3.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXinerama/dist/src/Xinerama.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libxcb/dist/src/xcb_in.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libxcb/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c
diff -u xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.3 xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.4
--- xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.3 Mon Jun 3 04:37:59 2013
+++ xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c Fri Dec 28 22:16:48 2018
@@ -102,7 +102,7 @@ static Bool wire_to_event (
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;
Index: xsrc/external/mit/libXinerama/dist/src/Xinerama.c
diff -u xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.4 xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.5
--- xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.4 Wed Jul 22 02:23:01 2015
+++ xsrc/external/mit/libXinerama/dist/src/Xinerama.c Fri Dec 28 22:16:48 2018
@@ -35,20 +35,6 @@ Equipment Corporation.
#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 @@ XineramaQueryScreens(
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay (dpy);
SyncHandle ();
+ *number = 0;
return NULL;
}
Index: xsrc/external/mit/libxcb/dist/src/xcb_in.c
diff -u xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.6 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.7
--- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.6 Wed Mar 14 06:43:45 2018
+++ xsrc/external/mit/libxcb/dist/src/xcb_in.c Fri Dec 28 22:16:48 2018
@@ -958,8 +958,20 @@ void _xcb_in_replies_done(xcb_connection
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);
+ }
}
}
}
Index: xsrc/external/mit/libxcb/include/config.h
diff -u xsrc/external/mit/libxcb/include/config.h:1.8 xsrc/external/mit/libxcb/include/config.h:1.9
--- xsrc/external/mit/libxcb/include/config.h:1.8 Wed Mar 14 06:43:45 2018
+++ xsrc/external/mit/libxcb/include/config.h Fri Dec 28 22:16:48 2018
@@ -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
