Commit graph

1150 commits

Author SHA1 Message Date
Ryan Pavlik
bf15ccb682 Add XWindows.h include to Xxcbint.h
This avoids some conflicting type re-definition errors which occur if
we attempt to include Windows headers after Xmd.h

Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2012-01-23 14:21:07 +00:00
Matt Dew
cadcbd376f informaltable & table cleanup
On certain tables, add top and bottom borders to table header
and a bottom border to the table. This matches what those
tables in the old pdfs looked like.

the <?dbfo keep-together='always'> prevents tables from
splitting across pages. Useful for tiny tables.

Converting the colwidth to a floating point, IE, 1* -> 1.0*
cleans up these build errors:
WARNING: table-layout="fixed" and column-width unspecified =>
falling back to proportional-column-width(1)

Signed-off-by: Matt Dew <marcoz@osource.org>
2012-01-21 17:59:51 -07:00
Alan Coopersmith
bb551f654d Add more Xkb man pages to the See Also lists for core keyboard functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-01-06 15:46:00 -08:00
Gaetan Nadon
b7bb23fe7c docbook.am: embed css styles inside the HTML HEAD element
Rather than referring to the external xorg.css stylesheet, embed the content
of the file in the html output produced. This is accomplished by using
version 1.10 of xorg-xhtml.xsl.

This makes the whole html docs tree much more relocatable.
In addition, it eliminates xorg.css as a runtime file which makes
xorg-sgml-doctools a build time only package.

Signed-off-by: Gaetan Nadon <nadon@memsize.(none)>
2011-12-30 17:08:14 -05:00
Alan Coopersmith
70505468b7 makekeys: move buf declaration from global to main to silence gcc -Wshadow
The global was only referenced in the main() function, which passes it
as an argument of the same name to the parse_line() function, leading
to gcc -Wshadow warnings:

makekeys.c: In function ‘parse_line’:
makekeys.c:58:24: warning: declaration of ‘buf’ shadows a global declaration
makekeys.c:54:13: warning: shadowed declaration is here

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-12-23 17:52:07 -08:00
Kusanagi Kouichi
87e10a7b9a XQueryColors: Split a request into multiple requests if necessary
https://bugs.freedesktop.org/show_bug.cgi?id=9160

Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2011-12-14 12:19:27 -05:00
Andreas Wettstein
d3b3570592 XIM: Allow modifier releases in compose sequences (#26705)
Currently, only non-modifier keys (actually, keysyms) can be part of a compose
sequence, and they are matched against the defined compose sequences at the
time the key is pressed.  The patch allows to use modifier keys an well, but
matches them on key release, and only if no other key has been pressed after
the modifier.

Releasing a non-matched modifier during an ongoing compose sequence only aborts
the sequence if any modifier release would have matched.  In particular, if no
compose sequences with modifiers are specified, the compose mechanism works
exactly as without this patch.

Even if modifiers are part of a compose sequence, they are not filtered.  This
is because modifiers affect the keyboard state no matter what we do here and,
therefore, filtering them only could confuse clients.

The purpose is this extension to the compose mechanism is to allow to make
better use of keys in convenient reach for touch typing.

Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2011-12-11 16:56:06 -05:00
Alan Coopersmith
56448a626f Reject negative string counts in copy_string_list
Silences parfait warning of a potential memory leak:
   Memory leak of pointer 'dst' allocated with malloc(length)
        at line 160 of FSWrap.c in function 'copy_string_list'.
          'dst' allocated at line 145 with malloc(length).
          dst leaks when count <= 0 at line 154.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-11-29 23:56:57 -08:00
Peter Hutterer
bf2d7c8c6d libX11 1.4.99.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-11-11 14:56:36 +10:00
Derek Buitenhuis
24283d40b1 makekeys: Fix build/target word size mismatch when cross-compiling
Since makekeys is built using build environment's gcc and
runs natively, we have to make sure that the size of the
Signature type is the same on both the native environment
and the target, otherwise we get mismatches upon running X,
and some LSB test failures (xts5).

Use an unsigned 32-bit integer on all platforms. Also,
eliminate the redundant multiple typedefs for the
Signature type.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-11-11 00:36:57 +00:00
Alan Coopersmith
1c41f3b9b8 XlcSL.c: convert old-style function definitions to ANSI C89 style
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-11-09 21:00:36 -08:00
Peter Hutterer
f6dad6aaa3 Use GetReqSized for GetReq and GetReqExtra
GetEmptyReq and GetResReq cannot do this due to the final typecast -
typically requests that need either of those do not have their own typedef
in the protocol headers.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-11-08 07:24:07 +10:00
Peter Hutterer
c9c99058b9 include: Add GetReqSized() for request buffers of specific size
Some XI2 requests change in size over different versions and libXi would
need to hack around GetReq and GetReqExtra. Add a new GetReqSized so the
library can explicitly specify the size of the request in 4-byte units.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-11-08 07:24:07 +10:00
Peter Hutterer
ba8a7a1916 Switch GetEmptyReq and GetResReq to call _XGetRequest
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-11-08 07:24:07 +10:00
Peter Hutterer
4a060f993b Add _XGetRequest as substitute for GetReq/GetReqExtra
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-11-08 07:24:07 +10:00
Alan Coopersmith
d8956520de Fix "nomal" -> "normal" typo in several comments
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-10-14 17:53:00 -07:00
Xue Wei
002b36e308 mbtocs should not truncate input
Fixes pasting more than 1024 bytes into xterm, as described in
https://bugs.freedesktop.org/show_bug.cgi?id=25209

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-10-14 17:42:45 -07:00
Marko Myllynen
9b8d8c9e5b Add new compose sequences
This patch adds few new compose sequences to the en_US map, ligatures
common in typesetting and sequences already in use in the fi_FI map.

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

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-14 17:20:44 -07:00
Choe Hwanjin
738f7b8673 XIM: Make Xim handle NEED_SYNC_REPLY flag
NEED_SYNC_REPLY flag should be in Xim not in Xic.
Because the focused Xic can be changed before sending sync reply.
After focused Xic changed, the new Xic doesn't have NEED_SYNC_REPLY
flag enabled, so libX11 doesn't send XIM_SYNC_REPLY packet.

This patch adds sync reply flag to Xim and removes sync reply
from Xic.

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

Signed-off-by: Choe Hwanjin <choe.hwanjin@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-14 17:19:15 -07:00
Bodo Graumann
50e1537933 libX11: Fixing modifier key range in Xutil.h (Bug #21910)
IsModifierKey, defined in include/X11/Xutil.h, is a macro determining,
which keys are regarded as modifiers. The constants ISO_Level5_Shift,
ISO_Level5_Latch and ISO_Level5_Lock where excluded previously, leaving
some Neo2 modifiers functionless in combination with compose.
This patch adjusts the range to include the correct, full range of
modifier constants.

Neo2 Bug 277 <http://wiki.neo-layout.org/ticket/277>

X.Org Bug 21910 <http://bugs.freedesktop.org/show_bug.cgi?id=21910>

Signed-off-by: Bodo Graumann <mail@bodograumann.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-10-11 19:06:38 +01:00
Yann Droneaud
b5a1086243 Return name instead of False in XSetICValues()
In case of error, XSetICValues() must return the first argument
that failed to be set.

But in some error paths, it returns False, which is converted to NULL,
so the function returns OK in case of error.

Signed-off-by: Yann Droneaud <yann@droneaud.fr>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-11 09:58:35 -07:00
Yann Droneaud
10992cb8dc Return name instead of value in XGetIMValues() and XSetIMValues()
As stated in man page (XOpenIM) and Xlib documentation (chapter 13.5.3),
XGetIMValues() and XSetImValues() "returns the name of the first argument
that could not be obtained."

But currently,

  err = XGetIMValues(im, "invalid", &arg, NULL);

returns &arg instead of "invalid".

This patch fixes https://bugs.freedesktop.org/show_bug.cgi?id=12897

Signed-off-by: Yann Droneaud <yann@droneaud.fr>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-11 09:56:54 -07:00
Jeremy Huddleston
f2651e03f3 Mark XKeycodeToKeysym as _X_DEPRECATED
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-10 14:09:17 -07:00
Jeremy Huddleston
25d7bb9c70 Fix nobreakspace for pt_BR.UTF-8
https://bugs.freedesktop.org/show_bug.cgi?id=31334

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-09 02:38:28 -07:00
Jeremy Huddleston
913603660c Fix potential uninitialized variable access in _XimMakeICAttrIDList
Found by clang static analysis

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-09 02:27:59 -07:00
Jeremy Huddleston
566ceaf5a9 Remove self-resolving aliases
https://bugs.freedesktop.org/show_bug.cgi?id=30112

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-09 02:27:44 -07:00
Matt Dew
22ba43d198 Cleanup IDs and links in doc
1 - fix the capitalization of the ID attributes to match either the
     <title> or <funcdef> string it goes with.
2 - fix any <linkend>'s that were affected by 1.
3 - any <function> in the docs that has an actual funcdef,
will become an olink.

Signed-off-by: Matt Dew <marcoz@osource.org>
2011-10-07 22:52:30 -06:00
James Cloos
f858f3326a [nls] Fix typo/synco.
The iso8859-1 Compose table includes an optional section which uses
Ctrl<T> as a substitute for <Multi_key>.  In that section the sequence
to generate an @ (at) either was incorrectly copied from the Multi_key
section or was not kept in sync with the Multi_key section.

Fixing this eliminates the warning from compose-check.pl:

┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
┃ Clash with existing sequence in iso8859-1/Compose.pre
┃  on line 661: Ctrl<T> <A> <A>
┃    line #661: Ctrl<T> <A> <A>		: "\305"	Aring
┃    line #480: Ctrl<T> <A> <A>		: "@"	at
┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

Signed-off-by: James Cloos <cloos@jhcloos.com>
2011-10-04 17:11:11 -04:00
Jeremy Huddleston
7f35f7efc2 Remove conflicting compose sequences for cent and colon
Regression from 4d78ad4bf6
Found by tinderbox

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-26 11:32:56 -07:00
Jeremy Huddleston
4d78ad4bf6 Add additional compose sequences for pound sterling, yen, and cent (mixed case)
https://bugs.freedesktop.org/show_bug.cgi?id=1013

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-26 00:37:38 -07:00
Jeremy Huddleston
0ca4153a37 Use a configure check for seteuid
HP-UX doesn't have seteuid

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

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-24 16:50:27 -07:00
Gaetan Nadon
79594b4d66 localedb specs: use <copyright> for first holder of multi license
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-20 16:08:21 -04:00
Gaetan Nadon
154430268c libX11 specs: use <copyright> for first holder of multi license
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-20 16:08:21 -04:00
Tollef Fog Heen
66e621f58d NLS: Add more vulgar fractions
Add 1/7, 1/9, 1/10 and 0/3 vulgar fractions.

Signed-off-by: Tollef Fog Heen <tfheen@err.no>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2011-09-20 13:10:03 -04:00
Alexander Polakov
e37a6da814 XGrabKey manual page: change XAllowAccess to XAllowEvents in See Also
There is no XAllowAccess man page to see.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-09-19 15:11:56 -07:00
Gaetan Nadon
a23f3323f2 XKB: provide adequate quotes for the license text
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 15:27:44 -04:00
Gaetan Nadon
a9c7a5cad9 XIM: refactor the multi licensing legal text
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 15:18:53 -04:00
Gaetan Nadon
c46f934ed8 xim trans: restore Fujitsu copyright legal text
Somehow lost during docbook conversion. text from x.org ftp R7.5.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 10:33:30 -04:00
Gaetan Nadon
3d75f99338 xtrans: restore X Consortium original legal text
Asking X Consortium permission to use The Open Group name makes no sense.
Even more so in 1994 before X Window System was passed on to the Open Group.

Using original text from xorg-docs/general/License

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 10:11:46 -04:00
Gaetan Nadon
136a381585 Framework: restore X Consortium copyright
Somewhat dammaged during docbook conversion.
Also restore pasrt of the original license text

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 10:03:21 -04:00
Gaetan Nadon
33f3468784 localedb: restore X Consortium original legal text
Asking X Consortium permission to use The Open Group name makes no sense.
Even more so in 1994 before X Window System was passed on to the Open Group.

Using original text from xorg-docs/general/License

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 09:50:00 -04:00
Gaetan Nadon
e99c9338e4 specs: support multi licensed copyright notice and license text
For documentation having multiple licenses, the copyright and legalnotice
elements sequence cannot instantiated multiple times.
The copyright notice and license text are therefore coded inside a
legalnotice element. The role attribute on the paragraph is used to allow
styling of the copyright notice text which should not be italicized.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 08:27:33 -04:00
Gaetan Nadon
b9dedc757e localedb: add release info to spec
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 08:26:20 -04:00
Gaetan Nadon
4519c89a87 specs: fix The Open Group license text
The warranty referred to the X Consortium

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 08:05:32 -04:00
Gaetan Nadon
08ac378423 specs: The strandard name is still "X Consortium Standard"
This spec, and fsproto spec, are the only two docs with a different
standard name.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 08:03:39 -04:00
Gaetan Nadon
8dfbeb1b1b specs: support multi licensed copyright notice and license text
For documentation having multiple licenses, the copyright and legalnotice
elements sequence cannot instantiated multiple times.
The copyright notice and license text are therefore coded inside a legalnotice
element. The role attribute on the paragraph is used to allow styling of the
copyright notice text which should not be italicized.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-18 13:22:34 -04:00
Gaetan Nadon
278ca8947c docs: merge copyright holder under the same copyright notice
As per the docbook markup dtd.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-17 09:44:46 -04:00
Gaetan Nadon
7ff012bb43 specs: handle multiple sets of copyright notice/license/warranty
Docbook groups all the <copyright> elements together and all the
<legalnotice> elements together.

We cannot have a sequence:
<copyright> <legalnotice> <copyright> <legalnotice> [...]

A workaround, which was done in some documents, is to put the copyright
notice inside the legalnotice in plain text without the <copyright> element.
A formal paragraph title is added here which makes the copyright notice bold,
and makes it much easier to locate.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-17 09:44:01 -04:00
Gaetan Nadon
4a550c71b8 specs: remove orphan affiliation.
Authors affiliation are correct.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-14 15:55:42 -04:00
Gaetan Nadon
0cc02a6df6 specs: use appropriate markup for Copyright statements
Also move <releaseinfo> to match order of appearance

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-13 17:39:02 -04:00