Commit graph

782 commits

Author SHA1 Message Date
Alan Coopersmith
d2714d65e8 Revert "Mark atom names argument to XInternAtoms as const"
This reverts commit c870111546.

The constification of a pointer to a pointer caused unexpected issues,
and xorg-devel was unable to come up with a clean, safe, reasonable way
to handle them, so we're chalking this up for now as yet another mistake
in the Xlib API definition we'll be living with.

See https://bugs.freedesktop.org/show_bug.cgi?id=32098 for details.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-12-21 18:51:17 -08:00
Alan Coopersmith
6459f9a48a specs/XKB: make acknowlegement section <preface> instead of <chapter>
Fixes numbering of actual chapters to match their filenames and to
make the table/figure numbering match the references in the text.

Reported-by: jelmd on freenode irc
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-12-21 13:57:10 -08:00
Alan Coopersmith
42c653d541 Add XKBlib spec images to dist_spec_DATA for distribution & installation
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-21 13:56:14 -08:00
Matt Dew
8f8a3c8c42 specs: convert XKBlib spec from Framemaker to DocBook.xml
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-11-30 10:52:55 -05:00
Alan Coopersmith
c870111546 Mark atom names argument to XInternAtoms as const
Updates code & docs for XInternAtoms.

The single atom name argument to XInternAtom was already const char *
in the code, but not the docs, so updated it in the docs too.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-11-24 15:23:27 -08:00
Alan Coopersmith
24db5b5ff0 libX11 1.4.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-11-21 14:04:32 -08:00
Dan Nicholson
18d3c3e9de config: Check host string when deciding architecture to build for
When checking for the OS/2 platform, $target_os is used. However, unless
building a cross compiler, the $host* strings contain the platform
details for the build system. See:

http://www.gnu.org/software/automake/manual/automake.html#Cross_002dCompilation

$host_os is already being used to determine the transport and threading
options.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-11-10 20:35:31 -08:00
Dan Nicholson
affc2488a7 config: Fix architecture check for OS/2 to skip nios2 cpu
The OS/2 platform requires some utility functions as well as having a
non-32 bit wchar_t. Fix the configure check so that it doesn't also
affect the nios2 cpu, which wouldn't influence these operating system
issues.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-11-10 20:33:59 -08:00
Gaetan Nadon
8cbca8a107 config: HTML file generation: use the installed copy of xorg.css
Currenlty the xorg.css file is copied in each location
where a DocBook/XML file resides. This produces about
70 copies in the $(docdir) install tree.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-11-09 13:04:44 -05:00
Alan Coopersmith
3e8907305e libX11 1.3.99.903 (1.4.0 RC3)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-10-29 22:02:10 -07:00
Alan Coopersmith
5d245d8013 Require xorg-macros 1.11 now that it is released
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-10-29 22:01:39 -07:00
Dan Nicholson
1ec89689fc docs: Disable fop documentation by default
fop is used to generate the pdf and ps formats of the documentation.
This can significantly slow down the build, especially when creating all
the compose key charts. Since few people probably want the full set of
doc formats, set the default to 'no'.

The default parameter for XORG_WITH_FOP is only available in recent
macros. Users generating configure from older macros will just get
'auto' as the default.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-10-29 00:21:13 -07:00
Jon TURNEY
03877bda91 Add C.UTF-8 and C.ASCII locale aliases
Add C.UTF-8 locale as an alias for en_US.UTF-8
Add C.ASCII locale as an alias for C

(C.UTF-8 is the default locale for cygwin.  It also exists in debian,
although I don't think it's intended for use by humans.)

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Acked-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: James Cloos <cloos@jhcloos.com>
2010-10-28 19:50:54 +01:00
Dan Nicholson
81d1d9a6bd docs: Remove directory prerequisites from make rules
Make expects prerequisites to be files with valid timestamps, and
directories are treated as always being out of date. Thus, any targets
depending on directories will always be rebuilt.

Instead, the doc rules are changed to always create the target's leading
directory. This should prevent the documentation from being rebuilt when
"make install" is run.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-10-10 09:43:55 -07:00
Jeremy Huddleston
d0cbf38891 Add an "X11_" string to header guards to avoid possible collision
This addresses a build failure which can result from <X11/Xlocale.h> and
<xlocale.h> being included in the same code since they both used the same
_XLOCALE_H_ protection.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-09-26 21:21:16 -07:00
Alan Coopersmith
b51ac675f4 libX11 1.3.99.902 (1.4.0 RC2)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-21 19:53:03 -07:00
Alan Coopersmith
986bb6d1d5 Bug 19379 - Provide docs with overview of all compose key combinations
Adds compose-chart.pl to generate DocBook/XML documents listing compose
keys, and Makefile rules to generate HTML & PDF output from them if xmlto
is present.

https://bugs.freedesktop.org/show_bug.cgi?id=19379

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
2010-09-21 18:22:21 -07:00
Alan Coopersmith
3eb0640716 Make locale data build non-recursive / parallelizable
On a 4 core CPU with gmake -j 16 the nls subdir builds in half the time,
plus this simplifies the next set of changes.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
2010-09-21 18:22:21 -07:00
Gaetan Nadon
a3fc78ac35 config: remove man page suffix from bottom summary
The man page suffix is the same for all libraries on a given
platform and is not configurable. It should have been removed
in commit 09edc6de6.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-09-17 17:38:11 -04:00
Gaetan Nadon
a52b0068f3 config: remove unhelpful comment in .gitignore
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-09-17 17:29:30 -04:00
Adam Jackson
10dd881e78 Zero buffer data in BufAlloc()
Inspired by a pattern in NoMachine's NX.  Consistently zeroed buffers
compress better with ssh and friends.  Note that you'll need to rebuild
all your protocol libraries to take advantage of this.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-14 00:42:07 -07:00
James Cloos
da099f0d20 Revert “Dolt-ify"
Libtool’s is now sufficiently fast that DOLT is no longer
worth the bother, even on those few systems where is works.

This reverts commit 3e9afd501e
and part of commit d31e644c65.

It conflicted with commit f6a4fd0c76
which moved dolt from configure.ac to m4/dolt.m4.

And it addresses: http://bugs.freedesktop.org/show_bug.cgi?id=28188

Signed-off-by: James Cloos <cloos@jhcloos.com>
2010-09-13 05:27:41 -04:00
Alan Coopersmith
2661fbe6b8 XIM spec title page minor formatting cleanup
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-09 19:24:29 -07:00
Jens Petersen
f99f1380bb Bug 29773: aliases for nb_NO.utf8 and nn_NO.utf8
<https://bugs.freedesktop.org/show_bug.cgi?id=29773>

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-09 19:23:02 -07:00
Alan Coopersmith
b15b8a558e Sun's copyrights are now owned by Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-03 23:11:53 -07:00
Alan Coopersmith
7742bf62b1 libX11 1.3.99.901 (1.4.0 RC1)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-03 18:31:44 -07:00
Jeroen Hoek
5a02d6d74b libX11/nls compose tables, add LATIN CAPITAL LETTER SHARP S
Add LATIN CAPITAL LETTER SHARP S
(See https://bugs.freedesktop.org/show_bug.cgi?id=29448 for rationale)

Signed-off-by: James Cloos <cloos@jhcloos.com>
2010-08-29 14:04:59 -04:00
Gaetan Nadon
09edc6de66 config: remove man-pages configuration option
This option was added in commit 6e752ea120 with no explanation.
The section number is provoded by XORG_MANPAGE_SECTIONS
There is no case where libX11 should be different than other libs
The option was also used to disable building of the man pages,
which build in 14 secs. No indication this is required.

If there is a requirement from system builders to disable building
of man pages, it could be done consistently for all modules.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-27 20:55:43 -04:00
Aaron Plattner
f92e754297 XOpenDisplay: save the correct display_name value
The X Test Suite's XDisplayString test checks the invariant
XDisplayString(XOpenDisplay(str)) == str.  The Xlib XOpenDisplay violates this
invariant by expanding str to the canonical form "host:display.scrn" (unless
HAVE_LAUNCHD is set and it starts with "/tmp/launch").  E.g., this expands ":1"
to ":1.0":

  400|26 1 1 19:26:41|IC Start
  200|26 1 19:26:41|TP Start
  520|26 1 00032625 1 1|VSW5TESTSUITE PURPOSE 1
  520|26 1 00032625 1 2|Assertion XDisplayString-1.(A)
  520|26 1 00032625 1 3|A call to XDisplayString returns the string that was used
  520|26 1 00032625 1 4|as the argument to the XOpenDisplay call that returned the
  520|26 1 00032625 1 5|value used as the display argument.
  520|26 1 00032625 1 6|METH: Open a connection using XOpenDisplay.
  520|26 1 00032625 1 7|METH: Obtain the display string using XDisplayString.
  520|26 1 00032625 1 8|METH: Verify that the value of the string is the parameter used in XOpenDisplay.
  520|26 1 00032625 1 9|METH: Close the display using XCloseDisplay.
  520|26 1 00032625 1 10|REPORT: XDisplayString() returned ":1.0" instead of ":1".
  220|26 1 1 19:26:41|FAIL
  410|26 1 1 19:26:41|IC End

Fix this by deleting all of the code to construct the canonical path and just
stashing a copy of the original display_name in dpy->display_name.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-08-19 06:44:50 -07:00
Gaetan Nadon
1dc401f678 man: xkb: remove unused variable LIB_MAN_DIR_SUFFIX
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-13 14:15:13 -04:00
Gaetan Nadon
cbe9eebd11 man: simplify building of shadow man pages
Store the shadow files in git as any other man page.
Move man pages to man dir and use the common makefile

Local fix in CVS for bug 5628 is not required
as the problem has been fixed in
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-13 13:47:32 -04:00
Gaetan Nadon
bfd899c9af config: reinstate XORG_PROG_RAWCPP erroneoulsy removed
in commit 76e07ef691.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-09 09:39:26 -04:00
Gaetan Nadon
76e07ef691 man: using the C preprocessor is not required for man pages.
There were no special symbols needing cpp.
Everything can be handled by the default MAN_SUBSTS in util-macros.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-06 20:46:48 -04:00
Jamey Sharp
4b8ff7db39 Fix use-after-free in _XReply on X errors.
_XReply would always call dequeue_pending_request on errors.  When it
got an error for the current request, it would call dequeue, then break
out of the loop; then, if it had an error in the event queue, it would
compare it with the sequence number of the now-freed pending request.
_XReply already stored that sequence number in dpy->last_request_read
before freeing it, so look at that instead.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29412

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
2010-08-06 15:51:56 -07:00
Gaetan Nadon
9fa146b300 specs: xsl stylesheet requires abs path to images
Using abs_builddir requires automake 1.10 or later.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-02 15:39:31 -04:00
Gaetan Nadon
a8727d4bc3 specs: update .gitignore now that all groff generated files are gone
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-01 14:13:07 -04:00
Adam Jackson
f70527f056 nls: Switch one of the interrobang sequences to gnaborretni
Since gnaborretni is primarily used in LTR locales, the ? part of the
sequence reflects the position of the bulge in the ?.  When scanning an
inverted interrobang left-to-right, you see the bulge first, so the
compose sequence ?! is used; upright interrobang shows the bulge
last, so it's !?.

This is a change in behaviour, but I was unable to come up with anything
better.  ??!! or !!?? would match the patterns for ¿ and ¡, but they
would delay evaluation of them; "¿Qué?" wouldn't show the ¿ until you hit
Q.  Likewise ?!?! and !?!? would delay showing the interrobang itself.
~!? and ~?! were considered but are arguably less intuitive.

Reviewed-by: James Cloos <cloos@jhcloos.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-07-30 15:29:54 -04:00
Gaetan Nadon
511c4f6d29 specs: move indexterm from glossdef to glossterm
This move fixes a Java class cast exception in the glossary.
The problem was introduced in commit
26f4f0d508

It may not happen on all versions of the doc toolchain.
There is no reason why indexterm cannot appear in glossdef,
this is a workaround to an implementation problem found by
trial and error.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-28 14:06:00 -07:00
Matt Dew
87a108f3aa specs: replace troff source with docbook-xml source
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-25 09:16:16 -04:00
Julien Cristau
8e60341358 Compose.man: default user compose file is .XCompose, not .Xcompose
The path was correct in the DESCRIPTION section, but not in FILES.

Signed-off-by: Julien Cristau <jcristau@debian.org>
2010-07-24 22:13:57 +02:00
Daniel Stone
554da76ece NLS: Add \o/ Compose sequence
Unicode is even more pointlessly awesome! Add a binding for Compose-\o/
to U+1F64C PERSON RAISING BOTH HANDS IN CELEBRATION.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-07-20 12:36:10 +01:00
Daniel Stone
2e7a18b6a6 XStringToKeysym: Cope with 0x1234cafe-style input
If we get input in the style of 0xdeadbeef, just return that exact
keysym.  Introduces a dependency on strtoul, which I'm told is OK on all
the systems we care about.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-07-20 12:36:10 +01:00
Alan Coopersmith
3df45ed0c2 specs/libX11: Fix column count of Gravity Attributes table
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-19 17:58:27 -07:00
Alan Coopersmith
53bcba0d1d specs/libX11: Convert \- to &minus; and \^ to either &hairsp; or removed
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-19 17:58:04 -07:00
Alan Coopersmith
5a0b452756 specs/libX11: Manual cleanup pass over Ch. 1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-19 14:56:37 -07:00
Alan Coopersmith
2156799295 specs/libX11: make sure all files have DOCTYPEs so standard entities work
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-19 14:55:43 -07:00
Alan Coopersmith
c944a8521f specs/libX11: Fix up list of header files in Ch.1 & add index entries
Combination of manual editing and automatic substitution via:

perl -i -p -00 -e 's{<varlistentry>(\s+)<term>&lt;X11/([^&]+)&gt;</term>(\s+)<listitem>(\s+)<para>}{<varlistentry id="Standard_Header_Files:$2">$1<term><filename class="headerfile">&lt;X11/$2&gt;</filename></term>$3<listitem>$4<indexterm type="file"><primary><filename class="headerfile">X11/$2</filename></primary></indexterm>$4<indexterm><primary>Files</primary><secondary>&lt;X11/$2&gt;</secondary></indexterm>$4<indexterm><primary>Headers</primary><secondary>&lt;X11/$2&gt;</secondary></indexterm>$4<para>}g' CH01.xml

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-18 13:47:35 -07:00
Alan Coopersmith
bb66e8f1ce specs/libX11: Add indexterms for headerfiles that .hN used to provide
Automatic substitution performed via:
perl -i -p -e 's{^&lt;<filename class="headerfile">([^<]+)</filename>&gt;(.*)$}{<filename class="headerfile">&lt;$1&gt;</filename>$2\n<indexterm type="file"><primary><filename class="headerfile">$1</filename></primary></indexterm>\n<indexterm><primary>Files</primary><secondary><filename class="headerfile">&lt;$1&gt;</filename></secondary></indexterm>\n<indexterm><primary>Headers</primary><secondary><filename class="headerfile">&lt;$1&gt;</filename></secondary></indexterm>}' *.xml

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-18 13:47:16 -07:00
Alan Coopersmith
d0b0d215cb specs/libX11: convert multicolumn lists from tables to <simplelist>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-16 21:15:13 -07:00
Alan Coopersmith
e679f80c62 specs/libX11: Tag WM_* as <property>
Mass substitution done by:
 perl -i -p -e 'if ($_ !~ m{^\<}) { $_ =~ s{(WM_\w+)}{<property>$1</property>}g; }' *.xml

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-16 20:51:52 -07:00