Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge libX11 1.6.8 and libXi 1.7.10.
details: https://anonhg.NetBSD.org/xsrc/rev/142f6939f11d
branches: trunk
changeset: 10321:142f6939f11d
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Jul 08 22:59:16 2019 +0000
description:
merge libX11 1.6.8 and libXi 1.7.10.
diffstat:
external/mit/libX11/dist/README | 40 ----
external/mit/libX11/dist/man/xkb/XkbAllocGeomOverlayKey.man | 64 -------
external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre | 8 +
external/mit/libX11/dist/src/Font.c | 16 +-
external/mit/libX11/dist/src/FontNames.c | 3 +-
external/mit/libX11/dist/src/GetFPath.c | 3 +-
external/mit/libX11/dist/src/ListExt.c | 3 +-
external/mit/libX11/dist/src/ModMap.c | 3 +-
external/mit/libX11/dist/src/XlibInt.c | 81 +++++++--
external/mit/libX11/dist/src/xkb/XKBMAlloc.c | 104 ++---------
external/mit/libX11/dist/src/xlibi18n/XlcDL.c | 8 +-
external/mit/libXi/dist/README | 25 --
external/mit/libXi/dist/src/XIPassiveGrab.c | 14 +-
13 files changed, 126 insertions(+), 246 deletions(-)
diffs (truncated from 753 to 300 lines):
diff -r 11afb95ec0d4 -r 142f6939f11d external/mit/libX11/dist/README
--- a/external/mit/libX11/dist/README Mon Jul 08 22:58:35 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-libX11 - Core X11 protocol client library
-
-Documentation for this library can be found in the included man pages,
-and in the Xlib spec from the specs subdirectory, also available at:
-
- http://www.x.org/releases/current/doc/libX11/libX11/libX11.html
- http://www.x.org/releases/current/doc/libX11/libX11/libX11.pdf
-
-and the O'Reilly Xlib books, which they have made freely available online,
-though only for older versions of X11:
-
- - X Series Volume 2: Xlib Reference Manual (1989, covers X11R3)
- http://www.archive.org/details/xlibretmanver1102nyemiss
-
- - X Series Volume 2: Xlib Reference Manual, 2nd Edition (1990, covers X11R4)
- http://www.archive.org/details/xlibrefmanv115ed02nyemiss
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/lib/libX11
-
- http://cgit.freedesktop.org/xorg/lib/libX11
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff -r 11afb95ec0d4 -r 142f6939f11d external/mit/libX11/dist/man/xkb/XkbAllocGeomOverlayKey.man
--- a/external/mit/libX11/dist/man/xkb/XkbAllocGeomOverlayKey.man Mon Jul 08 22:58:35 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-'\" t
-.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved.
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"),
-.\" to deal in the Software without restriction, including without limitation
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-.\" and/or sell copies of the Software, and to permit persons to whom the
-.\" Software is furnished to do so, subject to the following conditions:
-.\"
-.\" The above copyright notice and this permission notice (including the next
-.\" paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-.\"
-.TH XkbAllocGeomOverlayKeys __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
-.SH NAME
-XkbAllocGeomOverlayKeys \- Allocate keys in an overlay row
-.SH SYNOPSIS
-.HP
-.B Status XkbAllocGeomOverlayKeys
-.BI "(\^XkbOverlayRowPtr " "row" "\^,"
-.BI "int " "num_needed" "\^);"
-.if n .ti +5n
-.if t .ti +.5i
-.SH ARGUMENTS
-.TP
-.I \- row
-section for which rows should be allocated
-.TP
-.I \- num_needed
-number of new rows required
-.SH DESCRIPTION
-.LP
-Xkb provides a number of functions to allocate and free subcomponents of a keyboard geometry. Use these functions to create or modify keyboard geometries. Note that these functions merely allocate
space for the new element(s), and it is up to you to fill in the values explicitly in your code. These allocation functions increase
-.I sz_*
-but never touch
-.I num_*
-(unless there is an allocation failure, in which case they reset both
-.I sz_*
-and
-.I num_*
-to zero). These functions return Success if they succeed, BadAlloc if they are not able to allocate space, or BadValue if a parameter is not as expected.
-
-.I XkbAllocGeomOverlayKeys
-allocates
-.I num_needed
-keys and adds them to the
-.I row.
-No initialization of the keys is done.
-.SH DIAGNOSTICS
-.TP 15
-.B BadAlloc
-Unable to allocate storage
-.TP 15
-.B BadValue
-An argument is out of range
diff -r 11afb95ec0d4 -r 142f6939f11d external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
--- a/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Mon Jul 08 22:58:35 2019 +0000
+++ b/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Mon Jul 08 22:59:16 2019 +0000
@@ -190,6 +190,14 @@
<Multi_key> <equal> <Cyrillic_ES> : "â?¬" EuroSign # EURO SIGN
<Multi_key> <Cyrillic_IE> <equal> : "â?¬" EuroSign # EURO SIGN
<Multi_key> <equal> <Cyrillic_IE> : "â?¬" EuroSign # EURO SIGN
+<Multi_key> <P> <equal> : "â?½" U20bd # ROUBLE SIGN
+<Multi_key> <p> <equal> : "â?½" U20bd # ROUBLE SIGN
+<Multi_key> <equal> <P> : "â?½" U20bd # ROUBLE SIGN
+<Multi_key> <equal> <p> : "â?½" U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_ZE> <equal> : "â?½" U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_ze> <equal> : "â?½" U20bd # ROUBLE SIGN
+<Multi_key> <equal> <Cyrillic_ZE> : "â?½" U20bd # ROUBLE SIGN
+<Multi_key> <equal> <Cyrillic_ze> : "â?½" U20bd # ROUBLE SIGN
XCOMM "â?" U20ad KIP SIGN
XCOMM "â?®" U20ae TUGRIK SIGN
XCOMM "â?¯" U20af DRACHMA SIGN
diff -r 11afb95ec0d4 -r 142f6939f11d external/mit/libX11/dist/src/Font.c
--- a/external/mit/libX11/dist/src/Font.c Mon Jul 08 22:58:35 2019 +0000
+++ b/external/mit/libX11/dist/src/Font.c Mon Jul 08 22:59:16 2019 +0000
@@ -31,6 +31,7 @@
#include <config.h>
#endif
#include "Xlibint.h"
+#include "reallocarray.h"
#include <limits.h>
#if defined(XF86BIGFONT)
@@ -245,8 +246,8 @@
/* nFontProps is a CARD16 */
nbytes = reply.nFontProps * SIZEOF(xFontProp);
if ((nbytes >> 2) <= reply_left) {
- size_t pbytes = reply.nFontProps * sizeof(XFontProp);
- fs->properties = Xmalloc (pbytes);
+ fs->properties = Xmallocarray (reply.nFontProps,
+ sizeof(XFontProp));
}
if (! fs->properties) {
Xfree(fs);
@@ -266,8 +267,8 @@
if (reply.nCharInfos < (INT_MAX / sizeof(XCharStruct))) {
nbytes = reply.nCharInfos * SIZEOF(xCharInfo);
if ((nbytes >> 2) <= reply_left) {
- size_t cibytes = reply.nCharInfos * sizeof(XCharStruct);
- fs->per_char = Xmalloc (cibytes);
+ fs->per_char = Xmallocarray (reply.nCharInfos,
+ sizeof(XCharStruct));
}
}
if (! fs->per_char) {
@@ -489,8 +490,8 @@
/* nFontProps is a CARD16 */
nbytes = reply.nFontProps * SIZEOF(xFontProp);
if ((nbytes >> 2) <= reply_left) {
- size_t pbytes = reply.nFontProps * sizeof(XFontProp);
- fs->properties = Xmalloc (pbytes);
+ fs->properties = Xmallocarray (reply.nFontProps,
+ sizeof(XFontProp));
}
if (! fs->properties) {
Xfree(fs);
@@ -529,7 +530,8 @@
_XEatDataWords(dpy, reply_left);
return (XFontStruct *)NULL;
}
- if (! (fs->per_char = Xmalloc (reply.nCharInfos * sizeof(XCharStruct)))) {
+ if (! (fs->per_char = Xmallocarray (reply.nCharInfos,
+ sizeof(XCharStruct)))) {
Xfree(pUniqCI);
Xfree(fs->properties);
Xfree(fs);
diff -r 11afb95ec0d4 -r 142f6939f11d external/mit/libX11/dist/src/FontNames.c
--- a/external/mit/libX11/dist/src/FontNames.c Mon Jul 08 22:58:35 2019 +0000
+++ b/external/mit/libX11/dist/src/FontNames.c Mon Jul 08 22:59:16 2019 +0000
@@ -29,6 +29,7 @@
#include <config.h>
#endif
#include "Xlibint.h"
+#include "reallocarray.h"
#include <limits.h>
char **
@@ -66,7 +67,7 @@
}
if (rep.nFonts) {
- flist = Xmalloc (rep.nFonts * sizeof(char *));
+ flist = Xmallocarray (rep.nFonts, sizeof(char *));
if (rep.length > 0 && rep.length < (INT_MAX >> 2)) {
rlen = rep.length << 2;
ch = Xmalloc(rlen + 1);
diff -r 11afb95ec0d4 -r 142f6939f11d external/mit/libX11/dist/src/GetFPath.c
--- a/external/mit/libX11/dist/src/GetFPath.c Mon Jul 08 22:58:35 2019 +0000
+++ b/external/mit/libX11/dist/src/GetFPath.c Mon Jul 08 22:59:16 2019 +0000
@@ -28,6 +28,7 @@
#include <config.h>
#endif
#include "Xlibint.h"
+#include "reallocarray.h"
#include <limits.h>
char **XGetFontPath(
@@ -49,7 +50,7 @@
(void) _XReply (dpy, (xReply *) &rep, 0, xFalse);
if (rep.nPaths) {
- flist = Xmalloc(rep.nPaths * sizeof (char *));
+ flist = Xmallocarray(rep.nPaths, sizeof (char *));
if (rep.length < (INT_MAX >> 2)) {
nbytes = (unsigned long) rep.length << 2;
ch = Xmalloc (nbytes + 1);
diff -r 11afb95ec0d4 -r 142f6939f11d external/mit/libX11/dist/src/ListExt.c
--- a/external/mit/libX11/dist/src/ListExt.c Mon Jul 08 22:58:35 2019 +0000
+++ b/external/mit/libX11/dist/src/ListExt.c Mon Jul 08 22:59:16 2019 +0000
@@ -28,6 +28,7 @@
#include <config.h>
#endif
#include "Xlibint.h"
+#include "reallocarray.h"
#include <limits.h>
char **XListExtensions(
@@ -54,7 +55,7 @@
}
if (rep.nExtensions) {
- list = Xmalloc (rep.nExtensions * sizeof (char *));
+ list = Xmallocarray (rep.nExtensions, sizeof (char *));
if (rep.length > 0 && rep.length < (INT_MAX >> 2)) {
rlen = rep.length << 2;
ch = Xmalloc (rlen + 1);
diff -r 11afb95ec0d4 -r 142f6939f11d external/mit/libX11/dist/src/ModMap.c
--- a/external/mit/libX11/dist/src/ModMap.c Mon Jul 08 22:58:35 2019 +0000
+++ b/external/mit/libX11/dist/src/ModMap.c Mon Jul 08 22:59:16 2019 +0000
@@ -28,6 +28,7 @@
#include <config.h>
#endif
#include "Xlibint.h"
+#include "reallocarray.h"
#include <limits.h>
XModifierKeymap *
@@ -100,7 +101,7 @@
if (res) {
res->max_keypermod = keyspermodifier;
res->modifiermap = (keyspermodifier > 0 ?
- Xmalloc(8 * keyspermodifier)
+ Xmallocarray(keyspermodifier, 8)
: (KeyCode *) NULL);
if (keyspermodifier && (res->modifiermap == NULL)) {
Xfree(res);
diff -r 11afb95ec0d4 -r 142f6939f11d external/mit/libX11/dist/src/XlibInt.c
--- a/external/mit/libX11/dist/src/XlibInt.c Mon Jul 08 22:58:35 2019 +0000
+++ b/external/mit/libX11/dist/src/XlibInt.c Mon Jul 08 22:59:16 2019 +0000
@@ -39,6 +39,7 @@
#endif
#include "Xlibint.h"
#include "Xprivate.h"
+#include "reallocarray.h"
#include <X11/Xpoll.h>
#include <assert.h>
#include <stdio.h>
@@ -46,9 +47,28 @@
#include <direct.h>
#endif
+/* Needed for FIONREAD on Solaris */
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
+
+/* Needed for FIONREAD on Cygwin */
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+/* Needed for ioctl() on Solaris */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#ifdef XTHREADS
#include "locking.h"
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
Home |
Main Index |
Thread Index |
Old Index