summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-04-17xcb_connect: allow display name to be absolute pathHEADmasterRay Strode1-6/+31
This commit changes xcb's display parsing/opening functions to allow a direct socket path without a display number. This will be useful for supporting systemd activation, so the display number doesn't have to be known ahead of time.
2014-04-10xcb_open: Minor code cleanup for better readabilityJeremy Huddleston Sequoia1-8/+9
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Uli Schlachter <psychon@znc.in>
2014-03-30Ensure xcb owns socket and no other threads are writing before send_requestKeith Packard1-17/+40
send_request may only write to out.queue if no other thread is busy writing to the network (as that thread may be writing from out.queue). send_request may only allocate request sequence numbers if XCB owns the socket. Therefore, send_request must make sure that both conditions are true when it holds iolock, which can only be done by looping until both conditions are true without having dropped the lock waiting for the second condition. We choose to get the socket back from Xlib first as get_socket_back has a complicated test and checking for other threads writing is a simple in-lined check. This also changes the sequence number checks (64k requests with no reply, 4M request wrapping) to ensure that both conditions are true before queueing the request. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Uli Schlachter <psychon@znc.in>
2014-03-22Update .pc file Requires lines to express full dependenciesKeith Packard3-3/+3
Some xcb libraries depend on others; make these dependencies explicit in the .pc files that are installed. This change was generated automatically by running 'check-pc-requires -fix' Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-03-22Validate .pc file Requires linesKeith Packard2-1/+77
This walks through the .pc.in files and makes sure all of the Requires lines express sufficient dependency information. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-03-22Only #include directly referenced module header filesKeith Packard1-1/+1
This avoids having the nested header files also included at the top level, which is more efficient. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-03-21Add doxygen documentation to functions in xcbext.hUli Schlachter1-4/+103
Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2014-03-21Make xcb_disconnect(NULL) safeUli Schlachter2-2/+2
Code can be simplified if the deallocation functions can always be called in cleanup code. So if you have some code that does several things that can go wrong, one of which is xcb_connect(), after this change, the xcb_connection_t* variable can be initialized to NULL and xcb_disconnect() can always be called on the connection object. References: http://lists.freedesktop.org/archives/xcb/2013-September/008659.html Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Julien Cristau <jcristau@debian.org>
2014-03-21xcb_disconnect(): Fix leak with error connectionsUli Schlachter1-1/+10
There are two kind of error connections in XCB. First, if something goes wrong while the connection is being set up, _xcb_conn_ret_error() is used to return a static connection in an error state. If something goes wrong later, _xcb_conn_shutdown() is used to set c->has_error. This is important, because the static object that _xcb_conn_ret_error() returns must not be freed, while the dynamically allocated objects that go through _xcb_conn_shutdown() must obviously be properly deallocated. This used to work correctly, but in 769acff0da8, xcb_disconnect() was made to ignore all connections in an error state completely. Fix this by only ignoring the few static error connections that we have. This was tested with the following hack: xcb_connection_t *c = xcb_connect(NULL, NULL); close(xcb_get_file_descriptor(c)); xcb_discard_reply(c, xcb_get_input_focus(c).sequence); xcb_flush(c); xcb_disconnect(c); Valgrind confirms that xcb has a memory leak before this patch that this patch indeed fixes. Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Julien Cristau <jcristau@debian.org>
2014-03-21Remove tabs and trailing whitespacesUli Schlachter7-74/+73
Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-02-19Add comments about how _xcb_conn_ret_error() worksRan Benita2-0/+4
If xcb_connect() fails, it doesn't return NULL. Instead, it always returns an xcb_connection_t*, and the user should check for errors with the xcb_connection_has_error() function. What this function does is check if conn->has_error contains a non-zero error code, and returns it. If an error did occur, xcb doesn't actually return a full xcb_connection_t though, it just returns (xcb_connection_t *) error_code. Since the 'has_error' field is the first, it is still possible to check conn->has_error. That last trick was not immediately obvious to me, so add some guiding comments. This also ensures no one obliviously rearranges the struct. Signed-off-by: Ran Benita <ran234@gmail.com> Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-01-30generated man pages: use xorg footer and no hard coded extensionGaetan Nadon3-25/+34
The section number is no longer hard-coded The left footer is now "X Version 11". The center footer is the package name with the version, "libxcb 1.9" The three values above are provided through xorg-macros. They are passed-in to the python c_client code. Example of footer (last line, above dotted line) [...] AUTHOR Generated from xproto.xml. Contact xcb@lists.freedesktop.org for cor‐ rections and improvements. X Version 11 libxcb 1.9 xcb_send_event(3) ------------------------------------------------------------------------------ Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30generated man pages: build without hard coded extensionGaetan Nadon1-5/+6
The automake MAN primary requires a hard coded extension to build man pages. Let's avoid that as the extension number may vary by platform. Take advantage of the fact that the man directory only contains man pages. Wildcards are not supported by Automake but it happens to work sufficiently well here. Normally xorg build man pages by converting a source .man file to a target file with the extension number. That would be too many files in this case. Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30man: build static man pages using xorg patternsGaetan Nadon8-16/+32
The section number is no longer hard-coded, supplied by xorg-macros. The left footer is now "X Version 11". The center footer is the package name with the version, "libxcb 1.9" The man directory is a sibbling to the doc directory. One can build or clean the man pages without disturbing the library code. Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30autoconf: replace all tabs with spacesGaetan Nadon1-55/+55
Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30autoconf: use default xorg configuration for doxygen documentationGaetan Nadon3-92/+12
No content or form changes for the xcb manual or tutorial. Only the configuration user visible bits change. Xcb will now have the same configuration options as the 30 other xorg modules. Xorg classifies documentation as "user", "developer" or "specifications". The xcb manual falls under the "developer" category. Developers docs are never installed under $prefix. A builder can selectively turn on/off any or all of the categories. He can also selectively turn on/off any of the many tools used to generate documentation such as doxygen, xmlto, etc... Each tool has an environment variable defined such as DOXYGEN. Other features are available, the user interface and the functionality is the same on all modules. --with-doxygen=FILE is replaced with DOXYGEN env variable --disable-build-docs is replaced with --disable-devel-docs The new interface displayed with ./configure --help: --enable-devel-docs Enable building the developer documentation (default: yes) --with-doxygen Use doxygen to regenerate documentation (default: auto) DOXYGEN Path to doxygen command DOT Path to the dot graphics utility The dot tool checking has been added to util-macros in version 1.18. Refer to the table of existing docs in xorg. XCB will be added for the doxygen generated API manual. Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30autoconf: fix warning by replacing deprecated AC_HELP_STRINGGaetan Nadon1-1/+1
Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30autoconf: require libtool minimum level 2.2Gaetan Nadon1-2/+2
This is the updated minimum level as referenced in: http://www.x.org/wiki/Building_the_X_Window_System/#index2h3 Libtool version 2 has been used for several years now. There should be no surprises. Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30autoconf: comment and layout the initialization sectionGaetan Nadon1-9/+7
No functional changes. Trying to make it clearer. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30autoconf: AC_INIT: add bug urlGaetan Nadon1-3/+3
Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30autoconf: use the warning variables from xorgGaetan Nadon2-13/+2
The BASE_CFLAGS variable contains only warnings, just like the XCB version of CWARNFLAGS. This will result in no changes in the binaries produced. Xorg was missing -fd for SUNCC so it has been added to util-macros v 1.18. Do not get confused with the xorg deprecated CWARNFLAGS variable which contains an option that is not a warning, -fno-strict-aliasing. This option, should it be needed, can be added using the XORG_TESTSET_CFLAG macro. Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-30autoconf: use XORG_DEFAULT_OPTIONSGaetan Nadon1-2/+6
XCB has been part of X.Org for a while now. This patch will harmonize the XCB configuration, using xorg-macros series of macros. It is already used in the XCB utils packages and is needed to build xcb-proto. The XORG_DEFAULT_OPTIONS already includes the statement for the silent rules. The AC_PROG_CC statement is removed so as not to override AC_PROG_CC_C99 in XORG_DEFAULT_OPTIONS. The effective change is that xcb now uses c99 as requested. Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2014-01-21Support <pad align="n" />Peter Harris1-10/+18
Reviewed-By: Ran Benita <ran234@gmail.com> Signed-off-by: Peter Harris <pharris@opentext.com>
2014-01-03Force XCB event structures with 64-bit extended fields to be packed.Kenneth Graunke2-3/+11
With the advent of the Present extension, some events (such as PresentCompleteNotify) now use native 64-bit types on the wire. For XGE events, we insert an extra "uint32_t full_sequence" field immediately after the first 32 bytes of data. Normally, this causes the subsequent fields to be shifted over by 4 bytes, and the structure to grow in size by 4 bytes. Everything works fine. However, if event contains 64-bit extended fields, this may result in the compiler adding an extra 4 bytes of padding so that those fields remain aligned on 64-bit boundaries. This causes the structure to grow by 8 bytes, not 4. Unfortunately, XCB doesn't realize this, and always believes that the length only increased by 4. read_packet() then fails to malloc enough memory to hold the event, and the event processing code uses the wrong offsets. To fix this, mark any event structures containing 64-bit extended fields with __attribute__((__packed__)). v2: Use any(...) instead of True in (...), as suggested by Daniel Martin. v3 (Alan Coopersmith): Fix build with Solaris Studio 12.3 by moving the attribute to after the structure definition. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Keith Packard <keithp@keithp.com> [v1] Reviewed-by: Josh Triplett <josh@joshtriplett.org> [v1] Reviewed-by: Daniel Martin <consume.noise@gmail.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-12-22Release libxcb 1.101.10Uli Schlachter2-2/+2
Signed-off-by: Uli Schlachter <psychon@znc.in>
2013-12-14Add NEWS for 1.10Julien Cristau1-3/+18
Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-12-14Add NEWS entries for releases 1.9.1 to 1.9.3Uli Schlachter1-1/+23
libxcb 1.9.1 was released from a branch and thus its NEWS entries never made it into the master branch. The other releases didn't update NEWS. Signed-off-by: Uli Schlachter <psychon@znc.in> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-12-14Bump xcb-proto requirement to 1.10Julien Cristau1-1/+1
Makes sure we generate the new generic event struct. Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-12-14Test the value of msg_controllen for platforms whose CMSG_FIRSTHDR() does ↵PHO1-5/+7
not test it for us As RFC 2292 points out, some platforms (e.g. Darwin 9.8.0) provide CMSG_FIRSTHDR(msg) which just returns msg.msg_control without first checking if msg.msg_controllen is non-zero. We need a workaround for such platforms not to let _xcb_in_read() segfault. https://bugs.freedesktop.org/show_bug.cgi?id=72253 Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-12-14Increment the "current" version info for sync, xinput and xkbUli Schlachter1-3/+3
Sync: Due to commit e6a246e50e62cbcba3 "sync: Change value list param of CreateAlarm and ChangeAlarm into switch", various symbols disappeared, for example xcb_sync_{change,create}_alarm_sizeof. xinput: This extension was updated from version 1.4 to 2.3. This means that lots of new things are generated. However, this change is backwards-compatible and thus age gets set to 1. xkb: In commit 37d0f55392d6 "xkb: Work around alignment problems in GetNames and GetMap replies", some padding fields were introduced into structures for which an _unpack() function is generated. This changed the size of the struct and caused offsets into this struct to change. https://bugs.freedesktop.org/show_bug.cgi?id=71507 Signed-off-by: Uli Schlachter <psychon@znc.in> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-12-14Revert "Remove xcb_ge_event_t from xcb.h"Uli Schlachter1-0/+20
This reverts commit f4d5b84800f960831e4fbb3ad9848bbb701020be. The version of this struct that the code generator produces breaks the API, because it gives the fields different (albeit better) names. Thus, we need to restore the old version of this struct. Additionally to the revert, this struct is documented as being deprecated. The replacement was added to xcb-proto. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71502 Signed-off-by: Uli Schlachter <psychon@znc.in> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-12-12c_client.py: Fix _sizeof() functionsDaniel Martin1-2/+2
Currently, it is not possible to correctly iterate over the replies of some requests. For example, the list of XIDeviceInfo returned by the XIQueryDevice request from xinput2 is read as garbage starting from the second entry. The culprits are the _sizeof() used by the iterators. In the above case: int xcb_input_xi_device_info_sizeof (const void *_buffer /**< */) { char *xcb_tmp = (char *)_buffer; [...] unsigned int xcb_block_len = 0; [...] xcb_block_len += sizeof(xcb_input_xi_device_info_t); xcb_tmp += xcb_block_len; /* name */ xcb_block_len += (((_aux->name_len + 3) / 4) * 4) * sizeof(char); xcb_tmp += xcb_block_len; [...] } The problem here is that `xcb_block_len` is not zero'd right above the `/* name */` comment, causing `xcb_tmp` to be incremented by `sizeof(xcb_input_xi_device_info_t)` twice. The returned size is too large. https://bugs.freedesktop.org/show_bug.cgi?id=68387 Tested-by: Ran Benita <ran234@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> Reviewed-by: Daniel Martin <consume.noise@gmail.com> Signed-off-by: Ran Benita <ran234@gmail.com> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-11-18Revert "fix deadlock with xcb_take_socket/return_socket v3"Uli Schlachter3-25/+21
This reverts commit 9ae84ad187e2ba440c40f44b8eb21c82c2fdbf12. After this patch was merged, there were complaints about it not being a good idea. Revert this for now until we can agree on this. References: http://lists.freedesktop.org/archives/xcb/2013-June/008340.html Signed-off-by: Uli Schlachter <psychon@znc.in> Conflicts: src/xcbint.h
2013-11-18Fix alignment issues in FD passing codeMark Kettenis2-4/+10
A char array on the stack is not guaranteed to have more than byte alignment. This means that casting it to a 'struct cmsghdr' and accessing its members may result in unaligned access. This will generate SIGBUS on struct alignment architectures like OpenBSD/sparc64. The canonical solution is to use a union to force proper alignment. Signed-off-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Matthieu Herrb <matthieu@herrb.eu> Signed-off-by: Uli Schlachter <psychon@znc.in>
2013-11-07Check if we need to define _XOPEN_SOURCE for struct msghdr.msg_controlAlan Coopersmith1-0/+34
Required to expose the structure members in Solaris headers, since it was an XPG4/UNIX95 addition to the Solaris ABI. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-11-07Add configure option to enable or disable fd passing with sendmsgKeith Packard1-8/+10
--disable-sendfds or --enable-sendfds By default, configure auto-detects based on whether your system supports sendmsg at all. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-11-07Switch to using the CMSG_* macros for FD passingKeith Packard3-25/+19
Use these instead of computing the values directly so that it might work on BSD or other non-Linux systems Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-11-07Add Present extensionKeith Packard5-0/+25
Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-By: Uli Schlachter <psychon@znc.in>
2013-11-07Add DRI3 libraryKeith Packard5-0/+26
Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-By: Uli Schlachter <psychon@znc.in>
2013-11-07Require xcb proto version 1.9Keith Packard1-1/+1
Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-07Add event queue splittingKeith Packard3-12/+107
This allows apps to peel off certain XGE events into separate queues for custom handling. Designed to support the Present extension Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-By: Uli Schlachter <psychon@znc.in>
2013-11-07Add support for receiving fds in repliesKeith Packard4-9/+288
Requests signal which replies will have fds, and the replies report how many fds they expect in byte 1. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-By: Uli Schlachter <psychon@znc.in>
2013-11-07Add xcb_send_fd APIKeith Packard7-3/+86
This uses sendmsg to transmit file descriptors from the application to the X server Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-By: Uli Schlachter <psychon@znc.in>
2013-11-07-pendantic is too pendanticKeith Packard1-1/+1
Many system headers have warnings when compiled with this flag. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-By: Uli Schlachter <psychon@znc.in>
2013-11-07Make protocol C files depend on protocol XML filesKeith Packard1-1/+1
When new XML files get installed, make sure the C files are regenerated Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-By: Uli Schlachter <psychon@znc.in>
2013-11-07Remove xcb_ge_event_t from xcb.hKeith Packard1-17/+0
xcb proto now publishes this structure from an XML description Signed-off-by: Keith Packard <keithp@keithp.com>
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>