Commit graph

984 commits

Author SHA1 Message Date
Alan Coopersmith
0dc93f7e43 XCreate{Pix,Bit}map...Data: Free pixmap in error path if XCreateGC fails
Fixes leaks in error paths found by Parfait 1.0.0:

Error: X Resource Leak
   Leaked X Resource pix
        at line 62 of CrBFData.c in function 'XCreateBitmapFromData'.
          pix initialized at line 60 with XCreatePixmap
Error: X Resource Leak
   Leaked X Resource pix
        at line 70 of CrPFBData.c in function 'XCreatePixmapFromBitmapData'.
          pix initialized at line 66 with XCreatePixmap

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
2012-07-08 09:17:22 -07:00
Alan Coopersmith
dce84b8c39 libX11 spec: Correct prototype for XConvertSelection
selection & target parameters were accidentally run together

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-06-06 13:31:19 -07:00
Alan Coopersmith
6c5cb2a90a libX11 1.5.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-06-01 23:37:09 -07:00
Alan Coopersmith
05c587ec3b libX11 1.4.99.902 (1.5 RC2)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-05-26 14:37:28 -07:00
Pander
d817834d97 Compose: Reassigned squences with minus and a or o
Reassigned squences with minus and a or o (vice versa and lower and
upper case) to conform existing series and not resulting in tilde.
Also added noe missing underscore sequence.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-05-25 23:28:04 -07:00
Pander
6bfd1dca6e Compose: Removed <slash> <U> and vice versa
Combination with lower case u suffices

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-05-25 23:26:48 -07:00
Pander
3a8b163713 Compose: Removed <n> <minus> for n with tilde, also vice versa & for upper case
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-05-25 23:25:39 -07:00
Pander
fd514d7a35 Compose: Removed <S> in combination with a numeral for superscript
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-05-25 23:24:40 -07:00
Pander
1b5cad3ca5 Compose: Reassigned <o> <apostrophe> to oacute, also for upper case.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-05-25 23:24:23 -07:00
James Cloos
0bbc0d5e60
Remove duplicate compose sequences from commit e51e37c118.
The compose-check script only handles compiled Compose files, not
the Compose.pre files.  One must remember to use:

    ./autogen.sh; make; make check

when reviewing patches to the Compose.pre files....

Signed-off-by: James Cloos <cloos@jhcloos.com>
2012-05-10 12:27:28 -04:00
Geoff Streeter
e51e37c118 Add APL support to compose
Signed-off-by: Geoff Streeter <geoff@dyalog.com>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2012-05-08 15:48:41 -04:00
Julien Cristau
dac90324ce configure: make previous change work with older autoconf
autoconf 2.63 doesn't seem to like the nested AC_CHECK_DECL/FUNC.  So do
the tests separately.

Reported-by: Dave Airlie
Signed-off-by: Julien Cristau <jcristau@debian.org>
2012-05-05 16:05:07 +02:00
Julien Cristau
f5b50af432 configure: check if issetugid is declared
GNU/kFreeBSD has issetugid in libc (for legacy apps?), but doesn't
declare it anywhere, causing gcc to error out with
-Werror=implicit-function-declaration.  Use AC_CHECK_DECL in addition to
AC_CHECK_FUNC so we disable this code instead of failing to build it.

Debian bug#669670 <http://bugs.debian.org/669670>

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-05-04 20:20:07 -07:00
Peter Hutterer
52e1b5cc3b Typo fix
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-04-30 16:37:01 +10:00
Alan Coopersmith
b64969f0e5 Add X11R7 sections to the libX11 & XKBlib credits to cover Docbook conversion
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-04-17 18:17:53 -07:00
Alan Coopersmith
9ea611696f Add olinks from libX11 & localedb specs to ICCCM spec
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-04-17 18:01:36 -07:00
Alan Coopersmith
b3c1b8cdab Add olinks from libX11 spec to ICCCM spec
Also convert ICCCM title mentions from <emphasis> to <citetitle>

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-04-17 17:49:50 -07:00
Alan Coopersmith
ebebb65e75 libX11 AppC: Fix section headers that didn't translate from nroff properly
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-04-17 09:20:13 -07:00
Alan Coopersmith
d5ab4ae0e7 Add olinks from libX11 spec to x11protocol spec
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-04-17 09:20:06 -07:00
Alan Coopersmith
83878a0e34 libX11 spec: Remove .br nroff macro left behind in XGetWindowProperty prototype
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-04-14 22:28:53 -07:00
Alan Coopersmith
abc523fce3 libX11 1.4.99.901 (1.5 RC1)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-03-15 22:14:45 -07:00
Alan Coopersmith
b2cc5905a4 Remove "register" qualifier that annoys Solaris Studio compiler
Fixes warning:
"Xrm.c", line 1094: warning: storage class after type is obsolescent

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-03-15 22:03:21 -07:00
James Cloos
62d4295389
Fix the gtk+ additions
(Some of) the Dstroke and dstroke entries already were present as U011[01],
even though XK_Dstroke and XK_dstroke are part of the latin2 set in keysymdef.h.

The addition of <Multi_key> <o> <apostrophe> as a postfix version of
<Multi_key> <apostrophe> <o> blocks the existing entries for ǻ and Ǻ.
That prevents its and <Multi_key> <O> <apostrophe>’s addition.

Signed-off-by: James Cloos <cloos@jhcloos.com>
2012-03-14 17:25:46 -04:00
Pander
91bcce48d9 Complete compose key sequences for musical symbols
Signed-off-by: Pander <pander@users.sourceforge.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2012-03-14 14:54:39 -04:00
Pander
cf040016d4 Add compose sequences from gtk+ to X.Org
Signed-off-by: Pander <pander@users.sourceforge.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2012-03-14 14:54:39 -04:00
Keith Packard
a4c591ced5 Block for other threads in _XUserLockDisplay
Wait for all other threads to release the user-level lock when
acquiring it. This ensures that only one thread at a time holds the
user-level lock, necessary as it is a nesting lock and a single
variable is used to determine when the lock is nesting and when it is
contended.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
2012-03-13 23:34:18 -07:00
Jon TURNEY
ed00b460ac Don't use caddr_t casts
(caddr_t) isn't used anywhere else in xcb or libX11.
Cast to (char *) for consistency.

Removing this cast allows building for MinGW without patching.

v2: Cast to (char *) rather than just dropping the cast

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-03-11 17:44:23 +00:00
Julien Cristau
20adca02c2 Revert "xcb: Add TCP fallback"
This reverts commit f09c5299a3.

The TCP fallback ended up falling back to UNIX socket connection if
$DISPLAY was set to e.g. some.host:0 and the initial attempt failed.

Debian bug#659558 <http://bugs.debian.org/659558>

Signed-off-by: Julien Cristau <jcristau@debian.org>

Conflicts:

	src/OpenDis.c
2012-03-09 19:38:22 +01:00
James Cloos
f437819361
Make the compose sequence for ẞ work.
There is no XK_Ssharp symbol for U+1E9E LATIN CAPITAL LETTER SHARP S,
so use the U1e9e symbol in the Compose sequence.

(Compose sequences do not work when the target symbol is unknown.)

Signed-off-by: James Cloos <cloos@jhcloos.com>
2012-02-22 14:15:13 -05:00
Marko Myllynen
2ca641c3a5 Use ezh/EZH in compose maps
Related: https://bugs.freedesktop.org/show_bug.cgi?id=19687

Signed-off-by: Marko Myllynen <myllynen@redhat.com>
Reviewed-by: Matt Dew <marcoz@osource.org>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2012-02-21 09:17:55 -05:00
Marko Myllynen
61725822f2 Provide translation from XK_permille (ad5) to Unicode (U2030)
https://bugs.freedesktop.org/show_bug.cgi?id=19687

Signed-off-by: Marko Myllynen <myllynen@redhat.com>
Reviewed-by: Matt Dew <marcoz@osource.org>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2012-02-21 09:17:49 -05:00
Jeremy Huddleston
d2cce0abba nls: Use LC_CTYPE=C for sed magic
Stricter versions of sed can trip up if the input does not match
LC_CTYPE

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-02-12 19:14:37 -08:00
Frédéric Boiteux
f180e043f5 Compositions with the dead greek symbol
FreeDesktop Bug 21475 <https://bugs.freedesktop.org/show_bug.cgi?id=21475>

Signed-off-by: Frédéric Boiteux <fboiteux@calistel.com>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2012-02-08 17:58:26 -05:00
Ryan Pavlik
d58e8f8e27 Use pthreads on MinGW also
Use pthreads (provided by the pthreads-win32 compatability library which implements
them using native Win32 threading) on MinGW

Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2012-01-23 14:21:17 +00:00
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