Commit graph

757 commits

Author SHA1 Message Date
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
Alan Coopersmith
c7b7e59b3b specs/libX11: Convert simpler eqn markup to docbook tags
Mostly "sup" to <superscript>

There's several more complicated equations that will probably need
MathML or SVG to solve.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-16 20:41:33 -07:00
Alan Coopersmith
897486c54c specs/libX11: App. D: convert literallayouts to synopsis or programlisting
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-16 00:51:34 -07:00
Alan Coopersmith
692906c3b3 specs/libX11: Fix section headers in Appendix D
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-16 00:36:43 -07:00
Alan Coopersmith
bcc41baa02 specs/libX11: Explicitly tag document as English
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-14 07:22:26 -07:00
Alan Coopersmith
6783544706 specs/libX11: Appendix C: convert literallayouts to synopsis or programlisting
Fixes display of a bunch of function prototypes and sample code

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-12 22:03:18 -07:00
Alan Coopersmith
8834cd9285 xmlrules.in: Add chunked-html rule to manually generate smaller files
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-12 19:00:45 -07:00
Alan Coopersmith
53f78680c3 specs/libX11: Convert Appendix A tables to real tables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-12 19:00:45 -07:00
Alan Coopersmith
705a1257a8 specs/libX11: Fix out-of-place text in Chapter 1
DTD violation error introduced in 89cc2e02e7

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-12 19:00:45 -07:00
Jeremy Huddleston
a151346a2b launchd: Explicitly search /sbin
Previously, launchd wasn't found if /sbin wasn't in the user's PATH.
https://bugs.freedesktop.org/show_bug.cgi?id=29028

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-07-12 16:52:12 -07:00
Alan Coopersmith
89cc2e02e7 Replace untranslated .hN macros with <filename> tags to show header names
Translation performed by:
 perl -i -p -e 's{\<\!-- .hN (\S+) (\S+)?\s*-->}
	         {&lt;<filename class="headerfile">$1</filename>&gt;$2}' *.xml

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-12 13:45:26 -07:00
Alan Coopersmith
7548044094 specs/libX11: Mass substitution of <function> tags with more specific tags
Matched names from X headers & "nm libX11.so" output to names in spec to
map to more specific tags.   Tags used:

                    <code>   code fragments
                <constant>   enum values
               <errorname>   X protocol errors
                <filename>   filenames
                <function>   functions
                <function>   function-like macros (#define foo(a,b)...)
             <returnvalue>   function return codes
             <structfield>   struct members
              <structname>   struct names (even when typedefed)
                  <symbol>   simple value #defines (#define NAME value)
              <systemitem>   X protocol requests
<systemitem class="event">   X protocol events
                    <type>   non-struct typedefs
                 <varname>   global variables

(Also fixed a couple typos detected by failures of this matching, such as
 XESSetPrintErrorValues -> XESetPrintErrorValues.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-12 13:26:13 -07:00
Alan Coopersmith
26f4f0d508 specs/libX11: Glossary cross-reference links
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-12 13:26:12 -07:00
Alan Coopersmith
930b52d840 specs/libX11: Make whitespace around <function> tags more uniform
Simplifies regular expressions for further mass substitutions.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-12 13:26:12 -07:00
Gaetan Nadon
730ce6b8ac specs: use pattern rules rather than suffix rules
This allows target to rebuild when included .xml files are changed.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-09 20:10:37 -04:00
Alan Coopersmith
5527b4bc8c specs/libX11: Move punctuation outside of the <function> tags
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-08 20:56:41 -07:00
Alan Coopersmith
d66d2134df specs/libX11: Mark a number of <acronym>s
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-08 20:42:50 -07:00
Alan Coopersmith
d5bbb12f55 specs/libX11: Glossary terms should not be marked as functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-08 19:31:36 -07:00
Alan Coopersmith
5decf7bc5d specs/libX11: Clean up author list & acknowledgements a little
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-08 19:28:18 -07:00
Alan Coopersmith
0cd29bdb33 specs/libX11: Convert troff .IN macros to docbook <indexterm> tags
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-08 17:30:34 -07:00
Gaetan Nadon
a67d99ccbe specs: specdir is required to install xml files
The source is installed as well as the targets.
This failed when configuring with --without-xmlto

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-08 17:29:21 -04:00
Matt Dew
e14273f44c specs: replace troff source with docbook-xml source
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-08 14:46:33 -04:00
Daniel Stone
bea0873caf XStringToKeysym: Check strdup() return value
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
2010-07-08 19:29:25 +01:00
Marko Myllynen
cffa71b4a5 Fix two typos in SFS 5966 Annex 3
X.Org bug#28792 <https://bugs.freedesktop.org/show_bug.cgi?id=28792>

Signed-off-by: Julien Cristau <jcristau@debian.org>
2010-07-08 17:45:35 +01:00
Daniel Stone
eb023c0f89 Delete now-redundant XKeysymDB
Since XStringToKeysym now supports all the vendor keysyms, just delete
our XKeysymDB, which was incomplete at best, misleading at worst, and
always an annoyance.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-08 16:30:56 +01:00
Daniel Stone
0017539748 makekeys: Scan vendor keysyms as well as core
Since we can't really live without vendor keysyms, scan them all in to
generate ks_tables.h, rather than only doing the core ones, and leaving
the vendor syms to be manually synchronised with XKeysymDB.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-08 16:30:54 +01:00