Skip to content
Commits on Source (44)
......@@ -33,3 +33,5 @@ lint:
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \
done
endif LINT
EXTRA_DIST = README.md
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
https://www.x.org/releases/current/doc/libX11/libX11/libX11.html
https://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
https://www.archive.org/details/xlibretmanver1102nyemiss
- X Series Volume 2: Xlib Reference Manual, 2nd Edition (1990, covers X11R4)
http://www.archive.org/details/xlibrefmanv115ed02nyemiss
https://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
https://lists.x.org/mailman/listinfo/xorg
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/lib/libX11
https://gitlab.freedesktop.org/xorg/lib/libX11
http://cgit.freedesktop.org/xorg/lib/libX11
Please submit bug reports and requests to merge patches there.
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
https://www.x.org/wiki/Development/Documentation/SubmittingPatches
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([libX11], [1.6.7],
AC_INIT([libX11], [1.6.8],
[https://gitlab.freedesktop.org/xorg/lib/libx11/issues], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
......@@ -19,6 +19,8 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Initialize libtool
AC_PROG_LIBTOOL
AC_SYS_LARGEFILE
# Require xorg-macros minimum of 1.15 for fop minimum version
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.15 or later before running autoconf/autogen])])
......@@ -65,6 +67,14 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then
fi
AC_SUBST(LDFLAGS_FOR_BUILD)
if test x"$EXEEXT_FOR_BUILD" = x; then
if test x"$cross_compiling" = xno; then
EXEEXT_FOR_BUILD=${EXEEXT}
fi
# If cross-compiling and not provided, assume EXEEXT_FOR_BUILD is empty
fi
AC_SUBST([EXEEXT_FOR_BUILD])
# Checks for pkg-config packages
# Always required
......@@ -139,12 +149,13 @@ fi
AC_MSG_RESULT($XLIB_LOADABLE_XCURSOR)
# Checks for header files.
AC_CHECK_HEADERS([sys/select.h])
AC_CHECK_HEADERS([sys/filio.h sys/select.h sys/ioctl.h sys/socket.h])
# Checks for typedefs, structures, and compiler characteristics.
# Checks for library functions.
AC_CHECK_FUNCS([strtol seteuid])
AC_REPLACE_FUNCS([reallocarray])
# Used in lcFile.c (see also --enable-xlocaledir settings below)
XLOCALEDIR_IS_SAFE="no"
AC_CHECK_DECL([issetugid])
......
......@@ -112,7 +112,7 @@ Keysyms are specified without the \fBXK_\fP prefix.
Strings may be direct text encoded in the locale for which the compose file is
to be used, or an escaped octal or hexadecimal character code. Octal codes
are specified as \fB\*q\\123\*q\fP and hexadecimal codes as
\fB\*q\\0x123a\*q\fP.
\fB\*q\\x3a\*q\fP.
It is not necessary to specify in the right part of a rule a locale encoded
string in addition to the keysym name. If the string is omitted, Xlib
figures it out from the keysym according to the current locale.
......
......@@ -100,7 +100,7 @@ XrmDatabase XrmGetFileDatabase\^(\^char *\fIfilename\fP\^);
void XrmPutFileDatabase\^(\^XrmDatabase \fIdatabase\fP\^, char
*\fIstored_db\fP\^);
.HP
XrmDatabase XrmGetStringDatabase\^(\^char *\fIdata\fP\^,
XrmDatabase XrmGetStringDatabase\^(\^char *\fIdata\fP\^);
.HP
char *XrmLocaleOfDatabase\^(\^XrmDatabase \fIdatabase\fP\^);
.HP
......
......@@ -26,7 +26,7 @@ libman_PRE = \
XkbAllocGeomKeyAliases.man \
XkbAllocGeomKeys.man \
XkbAllocGeomOutlines.man \
XkbAllocGeomOverlayKey.man \
XkbAllocGeomOverlayKeys.man \
XkbAllocGeomOverlayRows.man \
XkbAllocGeomOverlays.man \
XkbAllocGeomPoints.man \
......
......@@ -278,7 +278,7 @@ However, you can call
.I XkbSelectEventDetails
using XkbBellNotify as the
.I event_type
and specifying XkbAllBellNotifyMask in
and specifying XkbAllBellEventsMask in
.I bits_to_change
and
.I values_for_bits.
......
......@@ -278,7 +278,7 @@ However, you can call
.I XkbSelectEventDetails
using XkbBellNotify as the
.I event_type
and specifying XkbAllBellNotifyMask in
and specifying XkbAllBellEventsMask in
.I bits_to_change
and
.I values_for_bits.
......
......@@ -247,7 +247,7 @@ However, you can call
.I XkbSelectEventDetails
using XkbBellNotify as the
.I event_type
and specifying XkbAllBellNotifyMask in
and specifying XkbAllBellEventsMask in
.I bits_to_change
and
.I values_for_bits.
......
......@@ -274,7 +274,7 @@ However, you can call
.I XkbSelectEventDetails
using XkbBellNotify as the
.I event_type
and specifying XkbAllBellNotifyMask in
and specifying XkbAllBellEventsMask in
.I bits_to_change
and
.I values_for_bits.
......
......@@ -272,7 +272,7 @@ However, you can call
.I XkbSelectEventDetails
using XkbBellNotify as the
.I event_type
and specifying XkbAllBellNotifyMask in
and specifying XkbAllBellEventsMask in
.I bits_to_change
and
.I values_for_bits.
......
......@@ -251,7 +251,7 @@ However, you can call
.I XkbSelectEventDetails
using XkbBellNotify as the
.I event_type
and specifying XkbAllBellNotifyMask in
and specifying XkbAllBellEventsMask in
.I bits_to_change
and
.I values_for_bits.
......
......@@ -330,9 +330,7 @@ _XimPreConnectionIM(
else
goto Error;
}
if( (locale_name[3] = Xmalloc(llen+1)) != NULL )
strcpy( locale_name[3], language );
else
if( (locale_name[3] = strdup(language)) == NULL )
goto Error;
if((locales = XInternAtom(display, XIM_LOCALES, True)) == (Atom)None)
goto Error;
......@@ -1299,8 +1297,6 @@ _XimProtoSetIMValues(
if ((name = _XimEncodeIMATTRIBUTE(im, im->core.im_resources,
im->core.im_num_resources, arg, &arg_ret, data, data_len,
&ret_len, (XPointer)&im_values, XIM_SETIMVALUES))) {
if (buf != tmp_buf)
Xfree(buf);
break;
}
......
......@@ -71,6 +71,7 @@ _XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
keysym = XK_braille_blank | ic->private.local.brl_committing;
ev->type = KeyPress;
braille = True;
ic->private.local.brl_committing = 0;
} else {
return(True);
}
......
......@@ -267,6 +267,7 @@ zh_TW/Compose: zh_TW.eucTW
iso8859-1/Compose: zu_ZA.ISO8859-1
XCOMM
XCOMM
en_US.UTF-8/Compose: C.UTF-8
en_US.UTF-8/Compose: af_ZA.UTF-8
am_ET.UTF-8/Compose: am_ET.UTF-8
en_US.UTF-8/Compose: ar_AA.UTF-8
......@@ -288,6 +289,7 @@ en_US.UTF-8/Compose: ar_SD.UTF-8
en_US.UTF-8/Compose: ar_SY.UTF-8
en_US.UTF-8/Compose: ar_TN.UTF-8
en_US.UTF-8/Compose: ar_YE.UTF-8
en_US.UTF-8/Compose: ast_ES.UTF-8
en_US.UTF-8/Compose: as_IN.UTF-8
en_US.UTF-8/Compose: az_AZ.UTF-8
en_US.UTF-8/Compose: be_BY.UTF-8
......@@ -308,6 +310,7 @@ en_US.UTF-8/Compose: de_AT.UTF-8
en_US.UTF-8/Compose: de_BE.UTF-8
en_US.UTF-8/Compose: de_CH.UTF-8
en_US.UTF-8/Compose: de_DE.UTF-8
en_US.UTF-8/Compose: de_IT.UTF-8
en_US.UTF-8/Compose: de_LI.UTF-8
en_US.UTF-8/Compose: de_LU.UTF-8
el_GR.UTF-8/Compose: el_CY.UTF-8
......
......@@ -190,6 +190,14 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN
<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
......
......@@ -270,6 +270,16 @@ de_DE.8859-15@euro: de_DE.ISO8859-15
de_DE.ISO-8859-15@euro: de_DE.ISO8859-15
de_DE.UTF-8@euro: de_DE.UTF-8
de_DE.utf8: de_DE.UTF-8
de_IT: de_IT.UTF-8
de_IT.utf8: de_IT.UTF-8
de_LI: de_LI.ISO8859-1
de_LI.iso88591: de_LI.ISO8859-1
de_LI.ISO_8859-1: de_LI.ISO8859-1
de_LI.ISO-8859-1: de_LI.ISO8859-1
de_LI.iso885915: de_LI.ISO8859-15
de_LI.ISO_8859-15: de_LI.ISO8859-15
de_LI.ISO-8859-15: de_LI.ISO8859-15
de_LI.utf8: de_LI.UTF-8
de_LU: de_LU.ISO8859-1
de_LU@euro: de_LU.ISO8859-15
de_LU.iso88591: de_LU.ISO8859-1
......
......@@ -59,7 +59,7 @@ iso8859-15/XLC_LOCALE: de_CH.ISO8859-15
iso8859-1/XLC_LOCALE: de_DE.ISO8859-1
iso8859-15/XLC_LOCALE: de_DE.ISO8859-15
iso8859-1/XLC_LOCALE: de_LI.ISO8859-1
iso8859-1/XLC_LOCALE: de_LI.ISO8859-15
iso8859-15/XLC_LOCALE: de_LI.ISO8859-15
iso8859-1/XLC_LOCALE: de_LU.ISO8859-1
iso8859-15/XLC_LOCALE: de_LU.ISO8859-15
iso8859-7/XLC_LOCALE: el_GR.ISO8859-7
......@@ -290,6 +290,7 @@ en_US.UTF-8/XLC_LOCALE: ar_SY.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_TN.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_YE.UTF-8
en_US.UTF-8/XLC_LOCALE: as_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: ast_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: az_AZ.UTF-8
en_US.UTF-8/XLC_LOCALE: be_BY.UTF-8
en_US.UTF-8/XLC_LOCALE: be_BY.UTF-8@latin
......@@ -309,6 +310,7 @@ en_US.UTF-8/XLC_LOCALE: de_AT.UTF-8
en_US.UTF-8/XLC_LOCALE: de_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: de_CH.UTF-8
en_US.UTF-8/XLC_LOCALE: de_DE.UTF-8
en_US.UTF-8/XLC_LOCALE: de_IT.UTF-8
en_US.UTF-8/XLC_LOCALE: de_LI.UTF-8
en_US.UTF-8/XLC_LOCALE: de_LU.UTF-8
en_US.UTF-8/XLC_LOCALE: el_CY.UTF-8
......
......@@ -3667,7 +3667,7 @@ To allocate overlays in a section, use
</variablelist>
<para>
<function>XkbAllocGeomRows</function>
<function>XkbAllocGeomOverlays</function>
allocates num_needed overlays and adds them to the section. No initialization
of the overlays is done.
</para>
......@@ -3763,7 +3763,7 @@ To allocate rows in a overlay, use
<parameter>num_needed</parameter>
) -->
<paramdef>XkbSectionPtr <parameter>overlay</parameter></paramdef>
<paramdef>XkbOverlayPtr <parameter>overlay</parameter></paramdef>
<paramdef>int <parameter>num_needed</parameter></paramdef>
</funcprototype>
</funcsynopsis>
......@@ -3774,7 +3774,7 @@ To allocate rows in a overlay, use
</term>
<listitem>
<para>
section for which rows should be allocated
overlay for which rows should be allocated
</para>
</listitem>
</varlistentry>
......@@ -3887,7 +3887,7 @@ To allocate keys in an overlay row, use
<parameter>num_needed</parameter>
) -->
<paramdef>XkbRowPtr <parameter>row</parameter></paramdef>
<paramdef>XkbOverlayRowPtr <parameter>row</parameter></paramdef>
<paramdef>int <parameter>num_needed</parameter></paramdef>
</funcprototype>
</funcsynopsis>
......@@ -3898,7 +3898,7 @@ To allocate keys in an overlay row, use
</term>
<listitem>
<para>
section for which rows should be allocated
row for which keys should be allocated
</para>
</listitem>
</varlistentry>
......@@ -3938,7 +3938,7 @@ To free keys in an overlay row, use
<parameter>free_all</parameter>
) -->
<paramdef>XkbRowPtr <parameter>row</parameter></paramdef>
<paramdef>XkbOverlayRowPtr <parameter>row</parameter></paramdef>
<paramdef>int <parameter>first</parameter></paramdef>
<paramdef>int <parameter>count</parameter></paramdef>
<paramdef>Bool <parameter>free_all</parameter></paramdef>
......