summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-10-11Use /usr/spool/sockets/X11/ on HP-UX for UNIX sockets (#69118).Daphne Pfister1-0/+4
2013-09-08Fix poll() if POLLIN == ROLLRDNORM|POLLRDBANDDaphne Pfister1-2/+2
It seems like POLLIN is specified as equivalent to POLLRDNORM | POLLRDBAND. Some systems (e.g. QNX and HP-UX) take this literaly and have POLLIN defined as the above bit combination. Other systems (e.g. Linux) have POLLIN as just a single bit. This means that if no out-of-band data is available (which should never be the case), the result of poll() will not fulfil (fd.revents & POLLIN) == POLLIN on QNX, because the POLLRDBAND bit is not set. In other words, even though poll() signaled that the fd is readable, xcb would not read from the file descriptor. Fix this by checking if any bits from POLLIN are set in the result of poll(), instead of all of them. (This change was independently done by seanb@qnx.com as well) Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=38001 Acked-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Uli Schlachter <psychon@znc.in>
2013-09-08Fix documentation of xcb_poll_for_event()Uli Schlachter1-1/+0
In commit 8eba8690adac2, the API documentation for xcb_poll_for_event() was fixed to remove an argument that was previously removed in commit 34168ab549. However, that commit only removed the first line of the documentation, leaving behind a spurious half-sentence. That commit happened seven years ago and now finally someone noticed... Thanks to Benjamin Herr for reporting this on IRC. v2: Thanks again to Benjamin Herr for noticing that my commit message blamed the wrong commit. Signed-off-by: Uli Schlachter <psychon@znc.in>
2013-08-15tests: Add files to .gitignoreDaniel Martin1-0/+3
Add check_all.log, check_all.trs and test-suite.log to tests/.gitignore. Signed-off-by: Daniel Martin <consume.noise@gmail.com>
2013-08-15Sort gitignore, adjust pattern for config.hDaniel Martin1-17/+16
Don't ignore the files config.h and config.h.in, adjust the pattern to ignore config.h*. This matches an additional config.h.in~ too. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Uli Schlachter <psychon@znc.in> Tested-By: Ran Benita <ran234@gmail.com>
2013-08-15Use m4 directoryDaniel Martin4-0/+4
- Follow the suggestion by libtoolize: "Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and rerunning libtoolize, to keep the correct libtool macros in-tree. Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am." and add the macro and define. - Create the m4 directory and move acinclude.m4 as xcb.m4 there. - Ignore the m4 files libtoolize copies into the m4 directory (m4/l*.m4). Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Uli Schlachter <psychon@znc.in> Tested-By: Ran Benita <ran234@gmail.com>
2013-08-15Use build-aux as autom4te cache directoryDaniel Martin2-1/+3
Remove the generated directory ./autom4te.cache by reusing ./build-aux as cache directory. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Uli Schlachter <psychon@znc.in> Tested-By: Ran Benita <ran234@gmail.com>
2013-08-15Set AC_CONFIG_AUX_DIR to build-auxDaniel Martin2-7/+2
Do not clutter the project directory with generated/copied auxiliary files, save them in ./build-aux. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Uli Schlachter <psychon@znc.in> Tested-By: Ran Benita <ran234@gmail.com>
2013-08-15Remove second AC_PREREQ, require version 2.60Daniel Martin1-8/+1
Remove a second AC_PREREQ and bump the required autoconf version to 2.60. Version 2.59c was a testing release, published in April 2006. Version 2.60 was the stable release afterwards, released in June 2006. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Uli Schlachter <psychon@znc.in> Tested-By: Ran Benita <ran234@gmail.com>
2013-08-15Initialize automake earlier (bugfix for #66413)Daniel Martin1-4/+5
This fixes: https://bugs.freedesktop.org/show_bug.cgi?id=66413 Bug 66413 - libxcb 1.9.1: Fails to build on Arch Linux: \ /home/<user>/install-sh: No such file or directory Without that patch the search path for `install-sh` will become $HOME and the `install` target will fail, when DESTDIR doesn't exist in advance. (occured with automake 1.14 and autoconf 2.69) Initial patch by: Alain Kalker <a.c.kalker@gmail.com> Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Uli Schlachter <psychon@znc.in> Tested-By: Ran Benita <ran234@gmail.com>
2013-08-15Make xsltproc optionalDaniel Martin2-8/+6
Fix Bug 23863 - xcb still checks for xsltproc: https://bugs.freedesktop.org/show_bug.cgi?id=23863 xsltproc is used to generate the optional html page for `check` results, only. So, it's not a hard build dependency. Additionally, use yes/no instead of true/false in the HTML_CHECK_RESULT variable for consistent output after a configure run. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-15c_client.py: Do not create pointers in unionsDaniel Martin1-2/+2
Do not create pointers in unions for fields of variadic length. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com>
2013-08-15c_client.py: Always initialize xcb_align_toDaniel Martin1-4/+4
to get rid of: warning: 'xcb_align_to' may be used uninitialized in this function Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Peter Harris <pharris@opentext.com>
2013-08-06Define _xcb_map_new with explicit void arg list instead of empty oneAlan Coopersmith1-1/+1
Fixes Solaris Studio compiler warning: "xcb_list.c", line 50: warning: old style function definition and gcc warning: xcb_list.c: In function '_xcb_map_new': xcb_list.c:50:11: warning: old-style function definition [-Wold-style-definition] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-06Enable warnings for pre-C89 style definitions for gcc & Solaris StudioAlan Coopersmith1-2/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-06Build xcb-xkb by defaultMichael Stapelberg1-1/+1
There have not been any big issues with xcb-xkb recently. Also, Wayland is using xcb-xkb actively, making distributions compile libxcb with xkb support anyway, so let’s reflect reality :). Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Daniel Martin <consume.noise@gmail.com>
2013-07-12c_client.py: Inject full_sequence into GE eventsDaniel Martin1-0/+17
The generic event structure xcb_ge_event_t has the full_sequence field at the 32byte boundary. That's why we've to inject this field into GE events while generating the structure for them. Otherwise we would read garbage (the internal full_sequence) when accessing normal event fields there. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Harris <pharris@opentext.com>
2013-07-08Fix "indention" typos in xcb-examples.3 man pageAlan Coopersmith1-2/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-03Update Makefile.am for newer automakeMarc Deslauriers1-3/+0
Debian Bug #710344 Reviewed-by: Daniel Martin <consume.noise@gmail.com>
2013-06-01fix deadlock with xcb_take_socket/return_socket v3Christian König3-21/+25
To prevent different threads from stealing the socket from each other the caller of "xcb_take_socket" must hold a lock that is also acquired in "return_socket". Unfortunately xcb tries to prevent calling return_socket from multiple threads and this can lead to a deadlock situation. A simple example: - X11 has taken the socket - Thread A has locked the display. - Thread B does xcb_no_operation() and thus ends up in libX11's return_socket(), waiting for the display lock. - Thread A calls e.g. xcb_no_operation(), too, ends up in return_socket() and because socket_moving == 1, ends up waiting for thread B => Deadlock This patch allows calling return_socket from different threads at the same time an so resolves the deadlock situation. Partially fixes: https://bugs.freedesktop.org/show_bug.cgi?id=20708 v2: fixes additional pthread_cond_wait dependencies, rework comments and patch description v3: separate pthread_cond_wait dependencies and unrelated whitespace change into their own patch, use unsigned for socket_seq Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Uli Schlachter <psychon@znc.in>
2013-05-23integer overflow in read_packet() [CVE-2013-2064]Alan Coopersmith1-4/+9
Ensure that when calculating the size of the incoming response from the Xserver, we don't overflow the integer used in the calculations when we multiply the int32_t length by 4 and add it to the default response size. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-05-23c_client.py: Handle multiple expr. in a bitcaseDaniel Martin1-4/+14
Adopt a change from xcbgen. With that modification the expression in a bitcase became a list of expressions to support multiple <enumref> in a <bitcase>. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Signed-off-by: Peter Harris <pharris@opentext.com>
2013-05-15whitespace fix in xcb_take_socketChristian König1-1/+1
Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Jamey Sharp <jamey@minilop.net>
2013-01-16autogen.sh: Implement GNOME Build APIColin Walters1-1/+3
http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson <ajax@redhat.com>
2012-11-10c_client.py: Fix python-3 invalid except statementChí-Thanh Christopher Nguyễn1-1/+1
Replace except statement with a PEP-3110 compliant one. This fixes a regression introduced by c3deeaf714630531d693a6a902b8dabf791858b1 https://bugs.freedesktop.org/show_bug.cgi?id=55690 Reviewed-by: Peter Harris <pharris@opentext.com> Signed-off-by: Uli Schlachter <psychon@znc.in>
2012-11-10c-client.py: Fix python-3 AttributeError: 'dict' object has no attribute ↵Chí-Thanh Christopher Nguyễn1-3/+3
'iteritems' This fixes a regression introduced by ea71d7d7e3f5d8189b80747678e9ca9a417b1d37 https://bugs.freedesktop.org/show_bug.cgi?id=55690 Reviewed-by: Peter Harris <pharris@opentext.com> Signed-off-by: Uli Schlachter <psychon@znc.in>
2012-10-05Release libxcb 1.9Uli Schlachter2-1/+14
Signed-off-by: Uli Schlachter <psychon@znc.in>
2012-10-05Include static man pages in "make dist"Uli Schlachter1-1/+2
This was found by distcheck. It tried to install src/man/xcb-examples.3 and src/man/xcb-requests.3, but those files weren't in the distribution. Fix this by explicitly telling automake to distribute those files. Signed-off-by: Uli Schlachter <psychon@znc.in>
2012-09-30Fix a multi-thread deadlockUli Schlachter1-2/+12
This fixes a deadlock which was seen in-the-wild with wine. It could happen that two threads tried to read from the socket at the same time and one of the thread got stuck inside of poll()/select(). The fix works by making sure that the writing thread doesn't steal the reading thread's reply. Debugged-by: Erich Hoover <ehoover@mines.edu> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54671 Signed-off-by: Uli Schlachter <psychon@znc.in>
2012-09-25Add a .gitignore for src/man/Uli Schlachter1-0/+3
Signed-off-by: Uli Schlachter <psychon@znc.in>
2012-09-18Allow xcb_send_request with >MAX_IOV iovecsPeter Harris2-1/+13
This allows an application to do a scatter/gather operation on a large image buffer to avoid the extra memcpy. Use autoconf to use UIO_MAXIOV where IOV_MAX is not available (and the POSIX minimum of 16 where neither are available). Reviewed-by: Uli Schlachter <psychon@znc.in> Signed-off-by: Peter Harris <pharris@opentext.com>
2012-08-29Return connection failure if display string specifies non-existent screenAlan Coopersmith3-0/+19
Matches the behaviour of Xlib - if you set DISPLAY to :0.1 but only have one screen, closes connection and returns error. This introduces a new connection error code: XCB_CONN_CLOSED_INVALID_SCREEN Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2012-08-25Add AC_USE_SYSTEM_EXTENSIONS to allow use of more system functionalityAlan Coopersmith1-0/+7
Copied from libX11 configure.ac Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-08-25Always include "config.h" at the start of all C source files.Alan Coopersmith8-1/+31
Allows configure to set defines such as _POSIX_SOURCE in config.h that affect functions exposed by system headers and get consistent results across all the source files. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-08-25Fix "sppported" typo in doxygen comment for XCB_CONN_CLOSED_EXT_NOTSUPPORTEDAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-08-14c_client: Fix parallel-make issue creating 'man' directoryColin Walters1-1/+5
With make -j, it was possible to hit a race condition in the code to make the 'man' directory. Signed-off-by: Julien Danjou <julien@danjou.info>
2012-04-21xcb_connect: launchd: Don't fall back on tcp if $DISPLAY is a path to a ↵Jeremy Huddleston1-1/+1
launchd socket Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-27Move static man to manJulien Danjou3-1/+1
Signed-off-by: Julien Danjou <julien@danjou.info>
2012-03-27Do not list manpages, use a wildcardJulien Danjou2-5/+4
Signed-off-by: Julien Danjou <julien@danjou.info>
2012-03-27Split manpage list in two (static/built)Julien Danjou2-3/+5
Signed-off-by: Julien Danjou <julien@danjou.info>
2012-03-26Allow undocumented code to be builtJulien Danjou1-20/+20
Signed-off-by: Julien Danjou <julien@danjou.info>
2012-03-26c_client.py: generate manpagesMichael Stapelberg5-6/+827
Signed-off-by: Julien Danjou <julien@danjou.info>
2012-03-09Release libxcb 1.8.1Julien Danjou2-2/+12
Signed-off-by: Julien Danjou <julien@danjou.info>
2012-03-08Fix a busy loop on BSD and Mac OSUli Schlachter1-15/+2
On FreeBSD MSG_WAITALL on a non-blocking socket fails immediately if less bytes than were asked for are available. This is different than the behavior on linux where as many bytes as are available are returned in this case. Other OS apparently follow the FreeBSD behavior. _xcb_in_read() is used to fill xcb's read buffer, thus this function will call recv() with a big length argument (xcb's read buffer is by default 16 KiB large). That many bytes are highly unlikely to be available in the kernel buffer. This means that _xcb_in_read() always failed on FreeBSD. Since the socket was still signaled as readable by poll(), this bug even resulted in a busy loop. The same issue is present in read_block(), but here it is slightly different. read_block() is called when we read the first few bytes of an event or a reply, so that we already know its length. This means that we should be able to use MSG_WAITALL here, because we know how many bytes there have to be. However, that function could busy loop, too, when only the first few bytes of the packet were sent while the rest is stuck somewhere on the way to us. Thus, MSG_WAITALL should be removed here, too. Thanks to Christoph Egger from Debian for noticing the problem, doing all the necessary debugging and figuring out what the problem was! This patch is 99% from debian. Thanks for all the work. This bug was introduced in commit 2dcf8b025be88a25d4333abdc28d425b88238d96. This commit also reverts commit 9061ee45b8dbe5431c23e3f628089d703ccad0b1. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=45776 Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2012-03-08darwin: Use read(2) rather than recv(2)Jeremy Huddleston1-0/+8
2dcf8b025be88a25d4333abdc28d425b88238d96 was causing some regressions on darwin, so go back to using read(2) there until I have time to investigate further. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-02-19Fallback to TCP if no protocol is specified and the UNIX connection failsJulien Cristau1-0/+5
Signed-off-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Jamey Sharp <jamey@minilop.net>
2012-02-10Add xkb_internals and xkb_issues to EXTRA_DIST.Arnaud Fontaine1-1/+3
2012-02-09Update use of error_connection under WIN32 to _xcb_conn_ret_error()Jon TURNEY1-1/+1
Unfortunately, commit 31b57676 adding WSACleanup/WSAShutdown on Win32 adds a new use of error_connection, which was removed in commit 769acff0, applied 5 minutes earlier. src/xcb_util.c: In function 'xcb_connect_to_display_with_auth_info': src/xcb_util.c:433:39: error: 'error_connection' undeclared (first use in this function) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Arvind Umrao <arvind.umrao@oracle.com> Signed-off-by: Uli Schlachter <psychon@znc.in>
2012-01-28Fix build of xcb_auth.c with XDMCP on WIN32Jon TURNEY1-0/+9
Fix a redefinition problem which shows up when building for _WIN32 and libXdmcp is installed, so HASXDMAUTH is enabled It seems this is a special place in xcb as it uses other X11 library headers here If HASXDMAUTH is defined, include the wrapped windows.h before any header which includes it unwrapped, to avoid conflicts with types defined in X headers We need to include config.h and check HASXDMAUTH to avoid an unconditional dependency on x11proto headers In file included from install/include/X11/Xdmcp.h:19:0, from git/xcb/libxcb/src/xcb_auth.c:52: install/include/X11/Xmd.h:120:14: error: conflicting types for 'INT32' /usr/i686-pc-mingw32/sys-root/mingw/include/basetsd.h:54:13: note: previous declaration of 'INT32' was here install/include/X11/Xmd.h:143:15: error: conflicting types for 'BOOL' /usr/i686-pc-mingw32/sys-root/mingw/include/windef.h:234:17: note: previous declaration of 'BOOL' was here Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-01-28Revert "Fix include order with Xdmcp on WIN32"Jeremy Huddleston1-4/+3
This reverts commit 0e9246def562be97cc816f824f702233a826ec56. This change caused build failures because <X11/Xdmcp.h> was never included under any circumstance. This is because the check for HASXDMAUTH was moved before the inclusion of config.h (via xcbint.h) which defined it. Found-by: Tinderbox Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>