commit 4b40b44cb6d088b6ffa2fb5cf3ad8f12da588cef Author: Matt Turner Date: Sat Feb 22 12:10:53 2020 -0800 Release libxcb 1.14 Signed-off-by: Matt Turner commit 78c492deaa7ae3aad0b0eeb4b126bb291cc637a7 Author: Matt Turner Date: Sat Feb 22 12:19:58 2020 -0800 Build xz tarballs instead of bzip2 Signed-off-by: Matt Turner commit 8f7e4c4e9fc6ee6b5b5498a7d8af79150be0d26a Author: Matt Turner Date: Sat Feb 22 11:24:11 2020 -0800 configure.ac: Depend on pthread-stubs only on not-Linux Signed-off-by: Matt Turner commit f9f4b00aad69ff36e81c63089b1b16660eaca900 Author: Sam Varshavchik Date: Sat Jan 4 10:43:59 2020 -0500 Implement xcb_total_read() and xcb_total_written(). Returns raw byte counts that have been read or written to the xcb_connection_t. I found it very useful when developing a high level widget toolkit, to track down inefficient/sub-optimum code that generates a lot of X protocol traffic. Signed-off-by: Sam Varshavchik commit 59e271e15bcecf0c461cd5c6c59081fb86b96c22 Author: A. Wilcox Date: Mon Dec 23 21:49:29 2019 -0600 tests: Support Check 0.13.0 API [mattst88]: Keep compatibility with old API via preprocessor Fixes: #43 commit 21324989b7e121c008a2c4fdf98547541cbf7b83 Author: Martin Dørum Date: Sun May 19 16:05:08 2019 +0200 Handle EINTR from recvmsg in _xcb_in_read I have a GTK application which occasionally crashes with an "interrupted system call" g_message from gdk. After a lot of debugging, I've found that the call to recvmsg in _xcb_in_read occasionally fails with EINTR, and instead of retrying the system call, xcb would just shut down the connection. This change makes _xcb_in_read treat EINTR the same as it would treat EAGAIN; it returns 1 and libX11 ends up calling xcb_poll_for_event again (from what I have understood). I have spoken with a few people who think recvmsg failing with EINTR in this case shouldn't ever happen, and I don't know enough to agree or disagree with that. In case anyone wants to dig further and try to figure out why the recvmsg call sometimes fails with EINTR, here's the backtrace from inside of _xcb_in_read where that happened: Thread 1 "beanbar" hit Breakpoint 1, _xcb_in_read (c=c@entry=0x55ecbe4aba80) at xcb_in.c:1059 1059 fprintf(stderr, "Hello World am %s:%i, errno is %s\n", __FILE__, __LINE__, strerror(errno)); (gdb) bt 0 0x00007fa48fa48639 in _xcb_in_read (c=c@entry=0x55ecbe4aba80) at xcb_in.c:1059 1 0x00007fa48fa489d8 in poll_for_next_event (c=0x55ecbe4aba80, queued=queued@entry=0) at xcb_in.c:352 2 0x00007fa48fa48a3d in poll_for_next_event (queued=0, c=) at xcb_in.c:722 3 0x00007fa48fa48a3d in xcb_poll_for_event (c=) at xcb_in.c:722 4 0x00007fa4908d1b7e in poll_for_event (dpy=dpy@entry=0x55ecbe4a9730, queued_only=queued_only@entry=0) at xcb_io.c:245 5 0x00007fa4908d1cf0 in poll_for_response (dpy=dpy@entry=0x55ecbe4a9730) at xcb_io.c:303 6 0x00007fa4908d1fed in _XEventsQueued (mode=2, dpy=0x55ecbe4a9730) at xcb_io.c:363 7 0x00007fa4908d1fed in _XEventsQueued (dpy=dpy@entry=0x55ecbe4a9730, mode=mode@entry=2) at xcb_io.c:344 8 0x00007fa4908c3d47 in XPending (dpy=0x55ecbe4a9730) at Pending.c:55 9 0x00007fa493cadbc7 in () at /usr/lib/libgdk-3.so.0 10 0x00007fa49234d08a in g_main_context_prepare () at /usr/lib/libglib-2.0.so.0 11 0x00007fa49234d6e6 in () at /usr/lib/libglib-2.0.so.0 12 0x00007fa49234d8ae in g_main_context_iteration () at /usr/lib/libglib-2.0.so.0 13 0x00007fa4938b920e in g_application_run () at /usr/lib/libgio-2.0.so.0 14 0x000055ecbc820af4 in main (argc=1, argv=0x7ffd06238098) at src/main.c:190 Signed-off-by: Martin Dørum commit 656c08c5429a3cf53e7abd7fc56cd3c3a79c0f64 Author: Jon Turney Date: Sun Sep 14 00:05:27 2014 +0100 Include time.h before using time() Signed-off-by: Jon Turney commit be1745c8eb00defcb31d336ccc142de056e92bd8 Author: Alan Coopersmith Date: Sun Feb 17 12:06:10 2019 -0800 Add README.md to EXTRA_DIST Signed-off-by: Alan Coopersmith commit 58f37377c851960cbf21fac1caf38ab1e66c7d6c Author: Eduardo Sánchez Muñoz Date: Sun Feb 17 13:33:12 2019 +0100 Add "ge.*" to src/.gitignore commit 7bac366953005233fc3c8736e6f1cd5798e65e28 Author: Alan Coopersmith Date: Sat Feb 16 13:41:28 2019 -0800 Update README for gitlab migration Signed-off-by: Alan Coopersmith commit 02ff3eadf48e6affe3b59ef688312b4dab538e8b Author: Alan Coopersmith Date: Sat Feb 16 13:20:45 2019 -0800 Update configure.ac bug URL for gitlab migration Signed-off-by: Alan Coopersmith commit 542befe40a3a7c6a5d1dcb7f38fb9eb261b96b24 Author: Alan Coopersmith Date: Mon Jan 7 14:42:53 2019 -0800 c_client: fix "adress" typo Signed-off-by: Alan Coopersmith commit 8287ebd7b752c33b0cabc4982606fe4831106f7e Author: Uli Schlachter Date: Thu Sep 27 14:04:17 2018 +0200 Release libxcb 1.13.1 commit bbda345a718ff73086437e51f03fcbb73e4365b9 Author: Erik Kurzinger Date: Mon Aug 20 12:06:25 2018 -0700 don't flag extra reply in xcb_take_socket If any flags are specified in a call to xcb_take_socket, they should only be applied to replies for requests sent after that function returns (and until the socket is re-acquired by XCB). Previously, they would also be incorrectly applied to the reply for the last request sent before the socket was taken. For instance, in this example program the reply for the GetInputFocus request gets discarded, even though it was sent before the socket was taken. This results in the call to retrieve the reply hanging indefinitely. static void return_socket(void *closure) {} int main(void) { Display *dpy = XOpenDisplay(NULL); xcb_connection_t *c = XGetXCBConnection(dpy); xcb_get_input_focus_cookie_t cookie = xcb_get_input_focus_unchecked(c); xcb_flush(c); uint64_t seq; xcb_take_socket(c, return_socket, dpy, XCB_REQUEST_DISCARD_REPLY, &seq); xcb_generic_error_t *err; xcb_get_input_focus_reply(c, cookie, &err); } In practice, this has been causing intermittent KWin crashes when used in combination with the proprietary NVIDIA driver such as https://bugs.kde.org/show_bug.cgi?id=386370 since when Xlib fails to retrieve one of these incorrectly discarded replies it triggers an IO error. Signed-off-by: Erik Kurzinger Signed-off-by: Uli Schlachter commit 7e0f166579672d71efd819c81f0c932b0acd542c Author: Daniel Stone Date: Wed Feb 28 01:26:55 2018 +0000 Release libxcb 1.13 Signed-off-by: Daniel Stone commit a3e9821bec08a69b355b46b0655562b9df61bb21 Author: Daniel Stone Date: Wed Apr 26 17:55:54 2017 +0200 c_client: Add support for lists of FDs Matching xcbgen changes, add support having a ListType which contains file descriptors. Use this to send a variable number of FDs to the server, including when the list size is not fixed. Signed-off-by: Daniel Stone commit c7aa4e682fdc7f0035f928af6eafd052e38cc15a Author: Daniel Stone Date: Wed Apr 26 17:54:01 2017 +0200 c_client: Don't serialise non-wire fields For when we have a variable-sized field followed by a fixed field, make sure we do not serialise non-wire fields. Signed-off-by: Daniel Stone commit d10194a321c3db851b3ede9a98cdc95e951943aa Author: Christian Linhart Date: Sat Mar 11 22:03:34 2017 +0100 enable xinput by default Support for the xinput extension is complete now, as far as I can tell. According to our discussion on the list, we enable it now. Signed-off-by: Christian Linhart commit fad81b63422105f9345215ab2716c4b804ec7986 Author: David McFarland Date: Tue Apr 18 23:58:59 2017 -0300 read from connection when polling special events and replies Using the mesa vulkan driver, if you acquire an image from a swapchain using a finite timeout (x11_acquire_next_image_poll_x11), it will occasionally lock, calling xcb_poll_for_special_event in a loop until the timeout expires. Call _xcb_in_read() once from the polling functions for special events and replies, in the same way as xcb_poll_for_event. Signed-off-by: David McFarland Signed-off-by: Uli Schlachter commit f830eb93c9c38b2c6c7ea2971af3bc6a61e92277 Author: Tobias Stoeckmann Date: Sun Mar 26 15:41:12 2017 +0200 Check strdup for NULL return value. _xcb_open does not check strdup's return value for NULL if launchd suport was configured. Signed-off-by: Tobias Stoeckmann Signed-off-by: Uli Schlachter commit ee9dfc9a7658e7fe75d27483bb5ed1ba4d1e2c86 Author: Christian Linhart Date: Wed Jan 25 10:21:05 2017 +0100 add support for eventstruct eventstruct allows to use events as part of requests. This is, e.g., needed by xcb_input_send_extension_event. Signed-off-by: Christian Linhart commit 0c2c5d50f8670da3e7601feb6a29b53509513da5 Author: Christian Linhart Date: Fri Jan 20 20:14:57 2017 +0100 optionally build the GE extension xcb contains an xml-definition for the GenericEvent extension but this extension was neither generated nor built. This patch enables optional building of the GenericEvent extension with configure option --enable-ge By default, the GenericEvent extension is not built. Normally this is not needed by application programs because there is implicit support for the GE-extension for the specific events built with this extension. But it may be useful for X-protocol analyzers and stuff like that. Signed-off-by: Christian Linhart commit 9bce1f72e329cb407b7a95589b9675a08129b65d Author: Christian Linhart Date: Fri Jan 20 14:40:25 2017 +0100 move symbol lookup of sumof expr to the parser replace the complicated symboltable lookup for sumof expr by accessing the lenfield of the expr-object. This requires the corresponding patch for xcb/proto which sets the lenfield accordingly. This should be OK because for official releases we define that dependency in the build system. For getting versions off the HEAD of the git repo, it should be obvious that xcb/proto and xcb/libxcb have to be updated together. I have tested this patch and it generates exactly the same code as before. Tested-by: Christian Linhart Signed-off-by: Christian Linhart commit 65b298c7ca317d7e4316aa2b9e0499e13047c65c Author: Alan Coopersmith Date: Sat Feb 6 12:26:21 2016 -0800 Correct @param "e" to "error" in xcb_poll_for_reply*() Found by clang -Wdocumentation: ./xcbext.h:271:11: warning: parameter 'e' not found in the function declaration [-Wdocumentation] * @param e Location to store errors in, or NULL. Ignored for un... ^ ./xcbext.h:271:11: note: did you mean 'error'? * @param e Location to store errors in, or NULL. Ignored for un... ^ error ./xcbext.h:283:11: warning: parameter 'e' not found in the function declaration [-Wdocumentation] * @param e Location to store errors in, or NULL. Ignored for un... ^ ./xcbext.h:283:11: note: did you mean 'error'? * @param e Location to store errors in, or NULL. Ignored for un... ^ error Signed-off-by: Alan Coopersmith Signed-off-by: Uli Schlachter commit 32a9084546add979115a686f9a167e70b8967149 Author: Alan Coopersmith Date: Sat Feb 6 12:26:20 2016 -0800 Remove : from @param names in manually written headers Makes style match the @param names in autogenerated headers and makes clang -Wdocumentation stop complaining about all of them: ./xcb.h:523:11: warning: parameter 'display:' not found in the function declaration [-Wdocumentation] * @param display: A pointer to the display number. ^~~~~~~~ ./xcb.h:523:11: note: did you mean 'display'? * @param display: A pointer to the display number. ^~~~~~~~ display Signed-off-by: Alan Coopersmith Signed-off-by: Uli Schlachter commit 8740a288ca468433141341347aa115b9544891d3 Author: Thomas Klausner Date: Thu May 19 17:31:18 2016 +0200 Fix inconsistent use of tabs vs. space. Needed for at least python-3.5.x. Signed-off-by: Thomas Klausner Signed-off-by: Uli Schlachter commit d34785a34f28fa6a00f8ce00d87e3132ff0f6467 Author: Uli Schlachter Date: Sat May 14 10:36:54 2016 +0200 Release libxcb 1.12 Signed-off-by: Uli Schlachter commit b11fca06f75b26b94e3f1d3e3c3954d365f80759 Author: Uli Schlachter Date: Sat May 14 10:33:54 2016 +0200 Bump xcb-proto requirement to 1.12 This is needed due to various changes that were done to the XML schema. Signed-off-by: Uli Schlachter commit 095353ff1a4f611922dfc4c98b0c4bd55d9f6d4f Author: Mark Kettenis Date: Sat Jan 23 17:29:32 2016 +0100 Increase unix socket send buffer to at least 64KB Some systems (e.g. OpenBSD) have a rather small default socket send buffer size of 4KB. The result is that sending requests with a largish payload requires serveral writev(2) system calls. Make sure the socket send buffer is at least 64KB such that we're likely to succeed with a single system call for most requests. A similar change was made to the xtrans code some time ago. Signed-off-by: Mark Kettenis Reviewed-by: Matthieu Herrb commit b3516102b4469df99db39e0e354deae496867f35 Author: Christian Linhart Date: Mon Jan 18 06:56:39 2016 +0100 do not serialize pads by default anymore Pads should not be serialized/deserialized to maintain ABI compatibility when adding explicit align pads. Therefore this pad switches off serialization of pads unless it is enforced by serialize=true in the xml-definition of that pad Signed-off-by: Christian Linhart commit c03388ff9e253b86e4b41fb77034ca6007fe47e9 Author: Jaya Tiwari Date: Wed Nov 11 01:02:09 2015 +0100 calculate lengthless list Some rework done by Christian Linhart Signed-off-by: Jaya Tiwari Signed-off-by: Christian Linhart commit 775825756714eb6b8467e099cda73a03b782ea0e Author: Christian Linhart Date: Tue Nov 10 12:53:04 2015 +0100 Fix handling of align-pads in end-iterators If a list is preceded by an align-pad, then accessor for the end-iterator returned a wrong value. Reason: the length of the align-iterator was added to a pointer of list-member type. Therefore, the length was multiplied by the size of the list-member type, due to C pointer arithmetic rules. This has looked like the following, e.g., in xcb_randr_get_crtc_transform_pending_params_end: i.data = ((xcb_render_fixed_t *) prev.data) + ((-prev.index) & (4 - 1)) + (R->pending_nparams); This bug was introduced with the following commit: http://cgit.freedesktop.org/xcb/libxcb/commit/?id=4033d39d4da21842bb1396a419dfc299591c3b1f The fix handles this by casting to char* before adding the align, and then casting the result to the member type. Signed-off-by: Christian Linhart commit 32a2189183696e942b002efcbca823a416fe5f6a Author: Christian Linhart Date: Sun Nov 1 18:35:35 2015 +0100 set the align-offset as provided by proto instead of using the lower bits of the pointer address. This fixes a bug reported by Peter Hutterer in off-list communication back in June 2015. This requires the alignment-checker patches in xcb/proto. Signed-off-by: Christian Linhart commit 6e0378ebbf5f842992e37c93ad60b960427849ac Author: Adam Jackson Date: Mon Sep 21 15:27:52 2015 -0400 Bump version to 1.11.90 We've released 1.11.1 and new libX11 wants that or better. git master will suffice, so bump the version number ahead of 1.11 branch. Signed-off-by: Adam Jackson commit 4033d39d4da21842bb1396a419dfc299591c3b1f Author: Christian Linhart Date: Fri Sep 19 13:44:38 2014 +0200 make lists after align-pads work Handle align-pads when generating an end-function in the same way as handling them when generating an accessor or iterator function. Signed-off-by: Christian Linhart commit b15c96f9507119e5d38a61d92b4dbcd479ea2099 Author: Christian Linhart Date: Thu Jun 11 18:58:38 2015 +0200 make support for server side stuff optional and make it disabled by default with an EXPERIMENTAL warning reason: this feature is unfinished and we want to have flexibility for ABI/API changes, while still being able to make a release soon Signed-off-by: Christian Linhart commit c5d923d8ff4a9b9fc1aef1c6c6918bab15098d34 Author: Jon TURNEY Date: Tue Mar 17 17:49:14 2015 +0000 Link with winsock library for socket functions on MinGW Signed-off-by: Jon TURNEY commit 5b40681c887192307f3ae147d2158870aa79c05f Author: Uli Schlachter Date: Fri Jun 12 15:13:05 2015 +0200 Fix a thread hang with xcb_wait_for_special_event() Consider the following: - Two threads are calling xcb_wait_for_special_event() and xcb_wait_for_reply() concurrently. - The thread doing xcb_wait_for_reply() wins the race and poll()s the socket for readability. - The other thread will be put to sleep on the special_event_cond of the special event (this is done in _xcb_conn_wait() via the argument xcb_wait_for_special_event() gives it). - The first thread gets its reply, but does not yet receive any special event. In this case, the first thread will return to its caller. On its way out, it will call _xcb_in_wake_up_next_reader(), but that function cannot wake up anything since so far it did not handle xcb_wait_for_special_event(). Thus, the first thread stays blocked on the condition variable and no thread tries to read from the socket. A test case demonstrating this problem is available at the bug report. Fix this similar to how we handle this with xcb_wait_for_reply(): The function wait_for_reply() adds an entry into a linked list of threads that wait for a reply. Via this list, _xcb_in_wake_up_next_reader() can wake up this thread so that it can call _xcb_conn_wait() again and then poll()s the socket. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84252 Signed-off-by: Uli Schlachter Tested-by: Michel Dänzer commit f85661c3bca97faa72431df92a3867be39a74e23 Author: Michel Dänzer Date: Mon Jun 1 11:04:18 2015 +0900 Call _xcb_wake_up_next_reader from xcb_wait_for_special_event All functions calling _xcb_conn_wait() must make sure that waiting readers are woken up when we read a reply or event that they are waiting for. xcb_wait_for_special_event() did not do so. This adds the missing call to_xcb_in_wake_up_next_reader(). Fixes deadlock when waiting for a special event and concurrently processing the display connection queue in another thread. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84252 Tested-by: Thomas Daede Tested-by: Clément Guérin Reviewed-by: Uli Schlachter Signed-off-by: Michel Dänzer Signed-off-by: Uli Schlachter commit 8584c0e09573a29d8ba7050e3d5afd925b4d8d80 Author: Uli Schlachter Date: Thu May 14 09:44:05 2015 +0200 send_fds(): Handle too many outstanding FDs to send Before this patch, the following code caused an endless loop in send_fds(), because the queue of FDs to send was eventually full, but _xcb_out_flush_to() didn't make any progress, since there was no request to send: while (1) { xcb_send_fd(conn, dup(some_fd)); } Fix this by sending a sync when flushing didn't make any progress. That way we actually have something to send and can attach the pending FDs. Because send_fds() can now send requests, the code in xcb_send_request_with_fds64() has to be changed. It has to call send_fds() before it establishes a good sequence number for the request it wants to send. Signed-off-by: Uli Schlachter commit 658fb4a5f0050db68fdf092936afe596412ef5f7 Author: Uli Schlachter Date: Wed Apr 22 09:26:05 2015 +0200 Code generator: Use xcb_send_request_with_fds() Signed-off-by: Uli Schlachter commit b15aa6bd4efde784e546d168bb23b8a8e816e85b Author: Uli Schlachter Date: Wed Apr 22 09:23:47 2015 +0200 Add xcb_send_request_with_fds() and *_with_fds64() Doing xcb_send_fd(), xcb_send_request() is racy. If two threads do this at the same time, they could mix up their file descriptors. This commit makes it possibly to fix this race by providing a single function which does everything that is needed. Signed-off-by: Uli Schlachter commit cc04cfb41bece6ec239f57d83822286b507f4482 Author: Uli Schlachter Date: Mon May 18 21:40:34 2015 +0200 send_fds(): Make sure no other thread interrupts us Two threads trying to send fds at the same time could interfere. To guarantee a correct ordering, we have to use correct locking. The code in send_fds() missed one case: If there was another thread already writing requests, we slept on the "done with writing" condition variable (c->out.cond). This would allow other threads to re-acquire the iolock before us and could cause fds to be sent out of order. To fix this, at the beginning of send_fds() we now make sure that no other thread is already writing requests. This is what prepare_socket_request() does. Additionally, it gets the socket back in case xcb_take_socket() was called, which is a good thing, too, since fds are only sent with corresponding requests. commit 25f9e7e45a7652b35b71c7941beef774a39f0d86 Author: Uli Schlachter Date: Wed Apr 22 09:20:38 2015 +0200 xcb_send_fd(): Always close fds The API docs for xcb_send_fd() says "After this function returns, the file descriptor given is owned by xcb and will be closed eventually". Let the implementation live up to its documentation. We now also close fds if fd passing is unavailable (!HAVE_SENDMSG) and when the connection is in an error state. (This also does sneak in some preparatory functions for follow-up commits and thus does things in a more complicated way than really necessary.) Signed-off-by: Uli Schlachter commit bbdf1d133f7bd979c6ff3bf44ec3d0c2d2b9dbfe Author: Ran Benita Date: Wed Mar 18 12:27:32 2015 +0200 c_client.py: don't generate useless empty /** < */ comments (This does not change doxygen's output or warnings). Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit ff6cb3913b64a4aa29cb5e65168ea49d77195296 Author: Ran Benita Date: Wed Mar 18 12:27:31 2015 +0200 c_client.py: use pattern matching with enumerate() Signed-off-by: Ran Benita commit cb621341a62e6d2233db3e337611f6fdd4f675a6 Author: Christian Linhart Date: Wed Apr 29 09:11:37 2015 +0200 expose 64-bit sequence numbers for XLib While XCB uses 64-bit sequence number internally, it only exposes "unsigned int" so that, on 32-bit architecture, Xlib based applications may see their sequence number wrap which causes the connection to the X server to be lost. Expose 64-bit sequence number from XCB API so that Xlib and others can use it even on 32-bit environment. This implies the following API addition: xcb_send_request64() xcb_discard_reply64() xcb_wait_for_reply64() xcb_poll_for_reply64() Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71338 Reviewed-by: Uli Schlachter Signed-off-by: Christian Linhart Signed-off-by: Olivier Fourdan commit c49aa985941112be05599032b9bb45b2652301ce Author: Alan Coopersmith Date: Wed Apr 29 23:23:05 2015 -0700 Escape \n to display properly in xcb-requests man page In nroff, \n is a macro that "Interpolates number register x" (where x is the character following the \n sequence), thus the man page currently prints 0 instead of \n" in several lines, leading to output such as: printf("The _NET_WM_NAME atom has ID %u0, reply-⁠>atom); It needs to be escaped here, as \\n, as is done in other examples in this man page already. https://bugs.freedesktop.org/show_bug.cgi?id=90231 Reported-by: Stefan Merettig Signed-off-by: Alan Coopersmith commit a90be9955d2c5a635f791d44db1154633b9d3322 Author: Ran Benita Date: Sun Oct 12 21:58:20 2014 +0300 c_client.py: make condition easier to follow in _c_complex() Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit f9f925107e37e0c9a0ed8220ee3a23f584e3b2ec Author: Ran Benita Date: Sun Oct 12 21:58:14 2014 +0300 c_client.py: don't add /* */ before references to 'S' The name can be understood from the type of S already. For examples, look for 'S->' in xkb.c or xinput.c. Signed-off-by: Ran Benita Reviewed-by: Christian Linhart Reviewed-by: Rémi Cardona commit 17f9bda6c291a8b9ccc98b22c241b64880b80621 Author: Ran Benita Date: Sun Oct 12 21:58:19 2014 +0300 c_client.py: remove duplicated `cookie_type` argument for requests It is implied already inside the function by the `void` argument. Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit c65005e9d0ce60524d2e883c13c027a5f1f7914c Author: Ran Benita Date: Sun Oct 12 21:58:18 2014 +0300 c_client.py: spell out keyword arguments in c_request() for clarity Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 6872e925828e615e2c1d4a0bbcc6be6a32fa4e7a Author: Ran Benita Date: Sun Oct 12 21:58:17 2014 +0300 c_client.py: simplify _c_reply_has_fds() Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 8bf8b62316a3066b61243d797d22c2100fd173f5 Author: Ran Benita Date: Sun Oct 12 21:58:16 2014 +0300 c_client.py: remove commented debug statements Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit ec435aebd6ed0523de2d341e6aff5ae66f230b10 Author: Ran Benita Date: Sun Oct 12 21:58:15 2014 +0300 c_client.py: use C99 initializers instead of comments Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 89498d1d450d0e6e476f6b24908ecae857863386 Author: Ran Benita Date: Sun Oct 12 21:58:11 2014 +0300 c_client.py: remove end-of-function comments Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 2871d4b1b8736044ba50df2f7dacfcc65d820fa9 Author: Ran Benita Date: Sun Oct 12 21:58:10 2014 +0300 c_client.py: no need to compare bools to True/False Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 30976e5255a25117d17d4d8162e29b84913953cd Author: Ran Benita Date: Sun Oct 12 21:58:09 2014 +0300 c_client.py: use "foo".join() instead of reduce Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 0ab52cbcc630ff8ddfa6f6b245c6b3071867b291 Author: Ran Benita Date: Sun Oct 12 21:58:08 2014 +0300 c_client.py: fix indentation (Also remove unnecessary parens around the condition). Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 80341d5df3e30e2cfc3066d05256af9e513e4500 Author: Ran Benita Date: Sun Oct 12 21:58:07 2014 +0300 c_client.py: use comprehensions instead of map/filter Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 86ea6645d9e388112670cf88da1fe3b350953789 Author: Ran Benita Date: Sun Oct 12 21:58:06 2014 +0300 c_client.py: use print as a function for python3 compatibility This works for all python>=2.6, which is what configure requires. Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 70d32ce7d8ef3ce9490d9a51b189829c8bcdb5c4 Author: Ran Benita Date: Sun Oct 12 21:58:05 2014 +0300 c_client.py: fix pyflakes errors c_client.py:2: 'from xml.etree.cElementTree import *' used; unable to detect undefined names c_client.py:3: 'basename' imported but unused c_client.py:9: 'time' imported but unused c_client.py:1437: local variable 'list_obj' is assigned to but never used c_client.py:1745: local variable 'varfield' is assigned to but never used c_client.py:2050: local variable 'length' is assigned to but never used c_client.py:2416: local variable 'R_obj' is assigned to but never used c_client.py:2441: local variable 'S_obj' is assigned to but never used Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 12d23b934f189607ad77667834205dfcf89a41f0 Author: Ran Benita Date: Sun Oct 12 21:58:04 2014 +0300 c_client.py: simplify maximum expression Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit 1b37d6ad3a37a9d0201e3b2caee6cd53b7b4b3dc Author: Ran Benita Date: Sun Oct 12 21:58:03 2014 +0300 c_client.py: remove unneeded call to get_serialize_params() The results are not used, and the function doesn't have side effects. Signed-off-by: Ran Benita Reviewed-by: Christian Linhart commit e3ec1f74637237ce500dfd0ca59f2e422da4e019 Author: Jaya Tiwari Date: Thu Jan 22 12:16:33 2015 -0500 Adding accessors for requests Added accessor functions for requests the same way they were added for structs,events and replies. Lists for replies have accessor functions now. Signed-off-by: Jaya Tiwari Reviewed-by: Christian Linhart Comment from the Reviewer Christian Linhart: I have tested your patch after fixing the issues with the patch-format. It looks good: * only adds new functions, and does not modify existing functions. Therefore it is API and ABI compatible. * adds accessors for varsized-stuff in requests. This is needed for server-side XCB and may be useful for implementing X11-protocol proxies. commit 5353c0216e091b64d01a43e6580e6d69b2ac16c7 Merge: bbca7b8 c6f3fb2 Author: Christian Linhart Date: Tue Feb 10 10:13:04 2015 +0100 Merge http://git.demorecorder.com/git/free-sw/xcb/libxcb branch 'ParametrizedStruct-V7' commit c6f3fb2529a6211221e8254f58c85fd67c1d8844 Author: Christian Linhart Date: Mon Nov 3 09:57:59 2014 +0100 generator: support parametrized structs Parametrized structs contain paramref expressions which refer to the value of a field defined in the context where the struct is used. Implementing the parametrized structs turned out to be somewhat easier than previously thought because the generator already had some support for type-parametrization because this is needed when case or bitcase refers to fields outside of the switch. So I decided to go with the flow and to implement the solution which best fits the current implementation. I did the following: * I provided a way to specify fieldref with an explicitely given type: This resulted in . That can be added later, if needed. ( Wont be too complicated ) * So this is pretty much like the proposal from Ran Benita. changes for V2 of this patch, according to suggestions from Ran Benita: * replace map with list comprehension because map returns an iterator instead of a list from Python 3 on, so it cannot be added to a list anymore. * removed "self" parameter of function additional_params_to_str and accessed the variable additional_params from the outer function directly. changes for V2 of this patch: * adapt to revision 2 of patchset ListInputDevices * style fixes for similar things that Ran Benita has found in my previous patches Message-ID: <54574397.4060000@DemoRecorder.com> Patch-Thread-Subject: [Xcb] parametrized structs implemented Patch-Set: ParametrizedStruct Patch-Number: libxcb 1/1 Patch-Version: V3 Signed-off-by: Christian Linhart commit 912cd97a6dd019e9e7ecf09c82c4577dd2ad7529 Author: Christian Linhart Date: Mon Nov 3 09:58:08 2014 +0100 generator: support listelement-ref Support for listelement-ref needs the following three changes (in the order as they appear in the patch): * making the current list-element accessible with the variable xcb_listelement which is a pointer to the list-element * supporting lists of simple-type for sumof with a nested expression * using the variable for resolving a listelement-ref expression Changes for V2 of this patch: - adapt to removal of patch "libxcb 2/6" from patchset "ListInputDevices". Changes for V3 of this patch: - adapt to V2 of patch "libxcb 5/6" from patchset "ListInputDevices" Changes for V4 of this patch: - adapt to revision 2 of the patchset "ListInputDevices" Message-ID: <545743A0.50907@DemoRecorder.com> Patch-Thread-Subject: [Xcb] support popcount of a list and associated xml changes Patch-Set: PopcountList Patch-Number: libxcb 4/4 Patch-Version: V4 Signed-off-by: Christian Linhart commit 422458b66380e4103c4937f0e2e8bb93e31f273a Author: Christian Linhart Date: Thu Sep 4 17:50:50 2014 +0200 generator: _c_accessor_get_length: remove buggy special case The function _c_accessor_get_length had a special case handling for intermixed var and fixed size fields. However: * The implementation of that special case was buggy: It tried to call a python-dict as a function which causes Python to abort the program with a stacktrace and error message. So this code was never used. * The case it tried to handle is handeled elsewhere in the meantime: in _c_helper_absolute_name by previous patches made by me. Message-ID: <1409845851-38950-3-git-send-email-chris@demorecorder.com> Patch-Thread-Subject: [Xcb] support popcount of a list and associated xml changes Patch-Set: PopcountList Patch-Number: libxcb 3/4 Patch-Version: V1 Signed-off-by: Christian Linhart commit b1e4a3bbd8194d12d7fcd9705fcbbe0deb59bcba Author: Christian Linhart Date: Thu Sep 4 17:50:49 2014 +0200 generator: generate accessors for events, too Accessors are generally needed for var-sized fields and fields after var-sized fields. Generic events can have ver-sized fields. Therefore they need accessors. Message-ID: <1409845851-38950-2-git-send-email-chris@demorecorder.com> Patch-Thread-Subject: [Xcb] support popcount of a list and associated xml changes Patch-Set: PopcountList Patch-Number: libxcb 2/4 Patch-Version: V1 Signed-off-by: Christian Linhart commit 6234225b4be862c5882bf547d066c5a3885906dd Author: Christian Linhart Date: Thu Sep 4 17:50:48 2014 +0200 generator: no type-setup for eventcopies anymore _c_type_setup is not called for eventcopies anymore: Reasons: * the type-setup of an eventcopy would overwrite members of the original event object such as c_type, ... * it is needed for the next patch, i.e., generating accessors: type_setup would create sizeof-etc funtions which called undefined accessor functions. Sizeof-functions are generated for compatibility: Reason: * Type-setup of eventcopies has previously generated sizeof-functions for eventcopies. So, we still need to generate these functions. These new sizeof-functions simply call the sizeof-function of the defining event of the eventcopy. Message-ID: <1409845851-38950-1-git-send-email-chris@demorecorder.com> Patch-Thread-Subject: [Xcb] support popcount of a list and associated xml changes Patch-Set: PopcountList Patch-Number: libxcb 1/4 Patch-Version: V1 Signed-off-by: Christian Linhart commit 18ff453edd42712ea4d1e7218bbe8829f9f4caba Author: Christian Linhart Date: Sun Nov 2 13:46:58 2014 +0100 _c_helper_fieldaccess_expr: remove handling for empty sep The loop-variable "sep" is never empty in function "_c_helper_fieldaccess_expr", after a fix elsewhere. Therefore I removed the handling of the case of "sep" being empty. Thanks to Ran Benita for the hint that this can be removed. Signed-off-by: Christian Linhart Reviewed-by: Ran Benita Message-ID: <545627C2.3050608@DemoRecorder.com> Patch-Thread-Subject: [Xcb] [PATCHSET] ListInputDevices revision 2 Patch-Set: ListInputDevices Patch-Number: libxcb 9/9 Patch-Version: V1 commit d905b886185fd8e0d9d7f70e0d112cb58ab86f98 Author: Christian Linhart Date: Sun Nov 2 13:46:50 2014 +0100 function _c_helper_fieldaccess_expr: improve description Signed-off-by: Christian Linhart Reviewed-by: Ran Benita Message-ID: <545627BA.1000909@DemoRecorder.com> Patch-Thread-Subject: [Xcb] [PATCHSET] ListInputDevices revision 2 Patch-Set: ListInputDevices Patch-Number: libxcb 8/9 Patch-Version: V1 commit 17f6e04493c93014beaf3a704c8cc4d050cb13bf Author: Christian Linhart Date: Sun Nov 2 13:46:38 2014 +0100 rename _c_helper_absolute_name to _c_helper_fieldaccess_expr The function _c_helper_absolute_name was named in a misleading way. It computes a C-expression for accessing a field of an xcb-type. Therefore the name _c_helper_fieldaccess_expr is more appropriate. Note: Patch 6 of this series has been removed during the review process. Signed-off-by: Christian Linhart Reviewed-by: Ran Benita Message-ID: <545627AE.2040200@DemoRecorder.com> Patch-Thread-Subject: [Xcb] [PATCHSET] ListInputDevices revision 2 Patch-Set: ListInputDevices Patch-Number: libxcb 7/9 Patch-Version: V1 commit 51a0d57acc6ec0c9487d2dbc2dda806f05c49884 Author: Christian Linhart Date: Sun Nov 2 13:46:16 2014 +0100 generator: sumof with nested expression Support sumof with a nested expression. The nested expression is computed for every list-element and the result of the computation is added to the sum. This way, sumof can be applied to a list of structs, and, e.g., compute the sum of a specific field of that struct. example: len bar generated tmpvar: int xcb_pre_tmp_1; /* sumof length */ int xcb_pre_tmp_2; /* sumof loop counter */ int64_t xcb_pre_tmp_3; /* sumof sum */ const xcb_input_sumof_test_element_t* xcb_pre_tmp_4; /* sumof list ptr */ generated code: /* mylist2 */ /* sumof start */ xcb_pre_tmp_1 = _aux->len; xcb_pre_tmp_3 = 0; xcb_pre_tmp_4 = xcb_input_sumof_test_field_access_mylist_1(_aux); for ( xcb_pre_tmp_2 = 0; xcb_pre_tmp_2 < xcb_pre_tmp_1; xcb_pre_tmp_2++) { xcb_pre_tmp_3 += xcb_pre_tmp_4->bar; xcb_pre_tmp_4++; } /* sumof end. Result is in xcb_pre_tmp_3 */ xcb_block_len += xcb_pre_tmp_3 * sizeof(uint16_t); changes for V2 of this patch: * explicitely set the member access operator in the prefix-tuple passed to function _c_helper_field_mapping. This enables us to simplify function "_c_helper_absolute_name" (which will be renamed "_c_helper_fieldaccess_expr" soon) V3: Changed style and formatting according to suggestions from Ran Benita Signed-off-by: Christian Linhart Reviewed-by: Ran Benita Message-ID: <54562798.8040500@DemoRecorder.com> Patch-Thread-Subject: [Xcb] [PATCHSET] ListInputDevices revision 2 Patch-Set: ListInputDevices Patch-Number: libxcb 5/9 Patch-Version: V3 commit 4a915c0dbadf326ea61349e29a0029d29f4bd339 Author: Christian Linhart Date: Sun Nov 2 13:45:40 2014 +0100 generator: sumof: support any type, generate explicit code A sumof-expression now generates explicit code ( for-loop etc ) instead of calling xcb_sumof. This way, it supports any type which can be added. Previously, only uint_8 was supported. Here's an example and the generated code: xml: len declaration of tempvars at the start of enclosing function: int xcb_pre_tmp_1; /* sumof length */ int xcb_pre_tmp_2; /* sumof loop counter */ int64_t xcb_pre_tmp_3; /* sumof sum */ const uint16_t* xcb_pre_tmp_4; /* sumof list ptr */ code: /* mylist2 */ /* sumof start */ xcb_pre_tmp_1 = _aux->len; xcb_pre_tmp_3 = 0; xcb_pre_tmp_4 = xcb_input_sumof_test_mylist_1(_aux); for ( xcb_pre_tmp_2 = 0; xcb_pre_tmp_2 < xcb_pre_tmp_1; xcb_pre_tmp_2++) { xcb_pre_tmp_3 += *xcb_pre_tmp_4; xcb_pre_tmp_4++; } /* sumof end. Result is in xcb_pre_tmp_3 */ xcb_block_len += xcb_pre_tmp_3 * sizeof(uint8_t); This patch is also a preparation for sumof which can access fields of lists of struct, etc. V2: Changed style and formatting according to suggestions from Ran Benita Signed-off-by: Christian Linhart Reviewed-by: Ran Benita Message-ID: <54562774.8030306@DemoRecorder.com> Patch-Thread-Subject: [Xcb] [PATCHSET] ListInputDevices revision 2 Patch-Set: ListInputDevices Patch-Number: libxcb 4/9 Patch-Version: V2 commit fda1fb4ed47a705744677a0074d83464af7aa4eb Author: Christian Linhart Date: Sun Nov 2 13:45:29 2014 +0100 generator: expressions can generate pre-code This patch provides a mechanism for generating preparatory code for expressions. This is e.g. necessary when an expression needs computations which cannot be done in a C-Expression, like for-loops. This will be used for sumof expressions but may be useful elsewhere. Note: Patch 2 of this series has been removed during the review process. V2: adapt to changes in previous patches V3: some style and formatting changes according to suggestions from Ran Benita. Signed-off-by: Christian Linhart Reviewed-by: Ran Benita Message-ID: <54562769.3090405@DemoRecorder.com> Patch-Thread-Subject: [Xcb] [PATCHSET] ListInputDevices revision 2 Patch-Set: ListInputDevices Patch-Number: libxcb 3/9 Patch-Version: V3 commit 265d38882cffce597367cc8bb2160b9e2482a80f Author: Christian Linhart Date: Sun Nov 2 13:45:12 2014 +0100 generator: fix absname for fields with only accessor function Fix _c_helper_absolute_name for fields which cannot be accessed as a struct/union member but which can be accessed by an accessor function. The fix generates calls to the accessor function in these cases. Example: len The sumof-expression ( ) refers to mylist1 which is only acessible by an accessor function. Previously, sumof was only used inside bitcases, where such lists are accessible by members of the deserialized parent struct. (there is a difference between deserialization of switches and structs.) V2 of this patch: * replaced "!= None" with "is not None" because that's more pythonic. (according to suggestion from Ran Benita) V3 of this patch: simplification: * fixed the recursion in _c_type_setup so that _c_helper_absolute_name does not need check a gazillion things as a workaround anymore. * simplified _c_helper_absolute_name - remove unneeded check for empty string before append of last_sep to prefix_str - removed those if-conditions which are not needed anymore after fixing the recursion in _c_type_setup. - extract functionality for checking whether a field needs an accessor ( and which type of accessor ) in functions. (also extracted from _c_accessors) - rearrange the condition branches and actions for more readability. V3 generates exactly the same *.c and *.h files as V2. V4 of this patch: * improve formatting as per suggestions of Ran Signed-off-by: Christian Linhart Reviewed-by: Ran Benita Message-ID: <54562758.5090107@DemoRecorder.com> Patch-Thread-Subject: [Xcb] [PATCHSET] ListInputDevices revision 2 Patch-Set: ListInputDevices Patch-Number: libxcb 1/9 Patch-Version: V4 commit bbca7b82f803fa13fd30a2891ec06f2a213a28c2 Merge: 382d306 fdb291b Author: Peter Harris Date: Thu Oct 30 11:51:57 2014 -0400 Merge branch 'NestedStructTypenames-V5' of http://infra-srv1.demorecorder.com/git/free-sw/xcb/libxcb commit fdb291b414a7afc2c2326124b8ca11d6846cd7b9 Author: Christian Linhart Date: Wed Sep 3 10:10:49 2014 +0200 no typename for nested structs Nested structs which are generated for named case and bitcase do not get a typename anymore, i.e., they are anonymous structs. Reasons for this change: * Prior typenames have caused nameclashes * Prior typenames introduced names in the global namespace which did not start with the xcb prefix. This change is safe with respect to API compatibility because: I have searched for instances of named bitcases and there's only one place where they are used, and that's in xkb.xml: reply GetKbdByName. ( no need to search for because it was introduced after the last release ) The reply GetKbdByName is broken in its current form in the xkb.xml anyways, so it is most probably not used anywhere. So, my conclusion is that we can safely omit named types for nested structs. No need for an attribute. Message-ID: <1409731849-51897-1-git-send-email-chris@demorecorder.com> Patch-Thread-Subject: Re: [Xcb] names of nested structs of named bitcase/case are prone to nameclashes. Solution? Patch-Set: NestedStructTypenames Patch-Number: libxcb 1/1 Patch-Version: V1 Signed-off-by: Christian Linhart Reviewed-By: Ran Benita commit a7c75be5b1e2da32f7ce2c255972178e7d4b7598 Author: Christian Linhart Date: Tue Sep 9 23:26:40 2014 +0200 generator: fix align-pads for switches which start at unaligned pos Fix the alignment computation inside switches which start at an unaligned pos. This affects both explicit and implicit align pads. The alignment offset is derived from the lowest 3 bits of the pointer to the protocol-data at the start of the switch. This is sufficient for correcting all alignments up to 8-byte alignment. As far as I know there is no bigger alignment than 8-byte for the X-protocol. Example: struct InputState, where the switch starts after two 1-byte fields, which is a 2 byte offset for 4-byte and 8-byte alignment. The previous problem can be demonstrated when adding a at the end of case "key". (Or when finding a testcase which reports the case "valuator" not at the last position of the QueryDeviceState-reply. I didn't find such a testcase, so I have used the pad align as described above.) V2: patch modified in order to fix bugs which I found when working on the next issue: * xcb_padding_offset has to be set 0 when xcb_block_len is set 0 * xcb_padding_offset cannot be "const" therefore * for unpack and unserialize, the padding_offset must computed from _buffer instead of from the aux_var. V3: patch revised according to suggestion by Ran Benita: * only create and use xcb_padding_offset for switch Message-ID: <1410298000-24734-1-git-send-email-chris@demorecorder.com> Patch-Thread-Subject: [Xcb] xinput:QueryDeviceState: full-support: generator and xml-changes Patch-Set: QueryDeviceState Patch-Number: libxcb 4/4 Patch-Version: V3 Signed-off-by: Christian Linhart Reviewed-By: Ran Benita commit 277ea629def6728c9d826ff88e95b31c3e25915f Author: Christian Linhart Date: Thu Aug 21 22:35:55 2014 +0200 generator: support lists of structs which contain a switch This essentially requires to have a correct sizeof-function for the struct. This in turn requires a sizeof-function for the switch, too. Making a sizeof-function for the switch is triggered by replacing "elif" by "if" in the first change of this patch. This way, c_need_sizeof is also set to True for switches if appropriate. The _c_serialize_helper_switch_field function has to support the context "sizeof": This is done in the second change of this patch The third change of this patch fixes an alignment error: It does not make sense to base the padding on the struct-type which is generated for switch because this struct does not represent the protocol. Rather it is the output of deserialization. ( The implicit padding for var-sized fields has other issues, IMHO, but I am not touching these now...) The effect on the generated code for the current xml-files is as follows: * several additional sizeof-functions are generated * the fix of the alignment error only changes one place in the XKB-extension for the GetKbdByName-reply. This is no problem because that reply in its current form is broken/unfinished anyways. Note: This patch also fixes a problem in the generator when a fixed-size list is the last field of a case or bitcase. Message-ID: <1408653356-21191-2-git-send-email-chris@demorecorder.com> Patch-Thread-Subject: [Xcb] xinput:QueryDeviceState: full-support: generator and xml-changes Patch-Set: QueryDeviceState Patch-Number: libxcb 2/3 Patch-Version: V1 Signed-off-by: Christian Linhart Reviewed-By: Ran Benita commit 382d306d6c44a9ece5551c210a932773b5cb94a5 Author: Emil Velikov Date: Fri Sep 5 01:46:40 2014 +0100 Move internal/private dependencies to Requires.private Program using the xcb sub-modules has indirect compile and runtime dependency of core xcb. To ensure this out we currently list xcb in the Requires field of the pkg-config files. While this provides all the required dependencies for successful compilation this causes over-linking and hides potential linking miss-use against the xcb modules. By moving to Requires.private we retain the compilation and runtime compatibility and avoids any runtime problems. Cc: Keith Packard Cc: Alan Coopersmith References: http://people.freedesktop.org/~dbn/pkg-config-guide.html#faq References: https://wiki.mageia.org/en/Overlinking_issues_in_packaging References: http://err.no/personal/blog/2008/Mar/25 Signed-off-by: Emil Velikov Reviewed-by: Julien Cristau Signed-off-by: Uli Schlachter commit d74d066949dbbbbbcb03bf7764e63f4347f99974 Author: Christian Linhart Date: Sat Sep 6 20:06:15 2014 +0200 generator: support fixed size lists in var-sized structs V2: patch revised according to suggestions from Ran Benita: * removed blanks before an after parentheses of function-calls or tuples * replaced if by elif in "if field.type.is_list". ( this fixes old code ) Message-ID: <540B4D17.1080908@DemoRecorder.com> Patch-Thread-Subject: [Xcb] xinput:QueryDeviceState: full-support: generator and xml-changes Patch-Set: QueryDeviceState Patch-Number: libxcb 1/3 Patch-Version: V2 Signed-off-by: Christian Linhart Reviewed-By: Ran Benita commit b0e6c2de09c7474868dd7185674fa113a5c2e0aa Author: Uli Schlachter Date: Mon Aug 18 10:38:48 2014 +0200 xcb_get_setup(): Never return NULL The documentation doesn't mention it and it's unlikely that a lot of code out there handles this case correctly. So, instead of returning NULL, let xcb_get_setup() return a pointer to a static, invalid, all-zero setup information structure. Signed-off-by: Uli Schlachter commit c4e40f646b8da4fd112ea54a612c880be5e942a8 Author: Uli Schlachter Date: Mon Aug 18 10:38:41 2014 +0200 Make some functions also work on error connections There is no technical reason why xcb_get_setup() and xcb_get_file_descriptor() shouldn't work on non-static error connections. They cannot be used for many useful things, but at least they work. This works around bugs in lots of programs out there which assume that xcb_get_setup() does not return NULL and which just happily dereference the results. Since xcb_connect() never returns NULL, it's a bit weird that xcb_get_setup() can do so. xcb_get_file_descriptor() is just modified since this can be done here equally easily and because the fd isn't closed until the final xcb_disconnect() on the error connection. Non-static error connections are connections which entered an error state after xcb_connect() succeeded. If something goes wrong in establishing a connection, xcb_connect() will return a static error connection which doesn't have the fields used here. Signed-off-by: Uli Schlachter commit 355d4d6ab9f5c12c2ee4a91e8cf6eb4a2854d73c Author: Christian Linhart Date: Tue Aug 19 15:57:34 2014 +0200 support switch case in the generator The implementation is rather simple: When a is used instead of a then operator "==" is used instead of "&" in the if-condition. So it creates a series of "if" statements (instead of a switch-case statement in C ) In practice this does not matter because a good optimizing compiler will create the same code as for a switch-case. With this simple implementation we get additional flexibility in the following forms: * a case value may appear in multiple case branches. for example: case C1 will be selected by values 1, 4, or 5 case C2 will be selected by values 3, 4, or 7 * mixing of bitcase and case is possible (this will usually make no sense but there may be protocol specs where this is needed) details of the impl: * replaced "is_bitcase" with "is_case_or_bitcase" in all places so that cases are treated like bitcases. * In function "_c_serialize_helper_switch": write operator "==" instead of operator "&" if it is a case. commit 966fba6ba4838949d0727dfa45eeb9392d1f85d9 Author: Daniel Martin Date: Tue Jul 29 22:48:44 2014 +0200 Disable Xevie and Xprint by default Both extensions have been dropped from the X-Server in 2008: http://cgit.freedesktop.org/xorg/xserver/commit/?id=1c8bd31 http://cgit.freedesktop.org/xorg/xserver/commit/?id=f4036f6 Don't build them by default. Reviewed-by: Julien Cristau Signed-off-by: Daniel Martin Signed-off-by: Uli Schlachter commit a5e90ae6a1543a681d95b831dc5c44e9c6e78610 Author: Gaetan Nadon Date: Wed Mar 26 15:40:57 2014 -0400 help text: do not report the insanly long list of Warning flags. Originally there was just one. Now that XCB has been integrated with X and uses the same compiler flags, it is a different story. Used CFLAGS: CPPFLAGS............: CFLAGS..............: -g -O2 Warning CFLAGS......: -Wall -Wpointer-arith AND SO ON FOR 8 lines... It completely defaces the otherwise excellent output. Reviewed-by: Josh Triplett Signed-off-by: Gaetan Nadon Signed-off-by: Uli Schlachter commit 529e3bfc2088dcd35e68a0a8394d0e9bff7c978b Author: Gaetan Nadon Date: Wed Mar 26 15:40:56 2014 -0400 Add ChangeLog and INSTALL using xorg macros Same as all other X modules. The one in libxcb git is removed. Those files are created during 'make dist' Reviewed-by: Josh Triplett Signed-off-by: Gaetan Nadon Signed-off-by: Uli Schlachter commit 74f552c1b39eb6a1ab64451477a492a2b22d9d7a Author: Gaetan Nadon Date: Wed Mar 26 15:24:46 2014 -0400 sendmsg: remove --enable-sendfds as it is superceeded by --enable-dri3 DRI3 requires sendmsg support which is auto-detected. A builder can enable or disable dri3 feature. If sendmsg function is not available, dri3 cannot be enabled. This reverts af8067cbf4856 which was done at a time where --enable-dri3 had not been added yet. Reviewed-by: Josh Triplett Signed-off-by: Gaetan Nadon Signed-off-by: Uli Schlachter commit 23f57ac8bf0812bbc851ec9a815e50a640b97db5 Author: Gaetan Nadon Date: Wed Mar 26 15:24:45 2014 -0400 config: issue an error if DRI3 is requested, but sendfds is not available When a user issues the --enable-dri3 option and sendfds is not available on the system, the configuration will abort with an error message. Reviewed-by: Josh Triplett Signed-off-by: Gaetan Nadon Signed-off-by: Uli Schlachter commit 7f07b57be587a2ebe0cadceba3fe67ed4a1e79db Author: Gaetan Nadon Date: Wed Mar 26 15:24:44 2014 -0400 config: default option for enable-dri3 is not implemented The first symptom is the help text: --enable-dri3 Build XCB DRI3 Extension (default: "$sendfds") The implementation variable $sendfds leaked into the user interface. Testing the various user inputs: DRI3 is enabled PASS --enable-dri3 DRI3 is enabled PASS --enable-dri3=yes DRI3 is enabled PASS --enable-dri3=no DRI3 is disabled PASS --disable-dri3 DRI3 is disabled PASS --enable-dri3=$sendfds DRI3 is disabled FAIL This patch implements the usual idiom for features that are enabled by default if the various conditions are met (sendfds is available). New help text: --enable-dri3 Build XCB DRI3 Extension (default: auto) With the additional user input: --enable-dri3=auto which is equivalent to providing no input at all. Reviewed-by: Josh Triplett Signed-off-by: Gaetan Nadon Signed-off-by: Uli Schlachter commit d1e8ec96fca4862f37ec9f0e9407bb989c4c161a Author: Uli Schlachter Date: Fri Aug 1 15:56:52 2014 +0200 Release libxcb 1.11 commit c5c6cfa4d2a27d0f9e139a1856d866433b6046bc Author: Uli Schlachter Date: Fri Aug 1 16:03:24 2014 +0200 Bump xcb-proto requirement to 1.11 This is needed for the new direct_imports field that we need from xcb-proto. Signed-off-by: Uli Schlachter commit 70ea5da64b34336bb0916f6c325545cb50746159 Author: Alexander Mezin Date: Sun Jun 29 17:33:48 2014 +0700 xcb.h: add 'struct' before xcb_setup_t, xcb_query_extension_reply_t These structs are typedef'ed in xproto.h, so in xcb.h these types (without 'struct') are actually undefined. GCC reports this as error when building precompiled header. Signed-off-by: Alexander Mezin Reviewed-by: Peter Harris commit 7e6af51b4e984f661fe4f21596cab5cb8ee15ea0 Author: Ran Benita Date: Tue Feb 25 14:11:35 2014 +0200 c_client.py: remove more trailing space from generated files Signed-off-by: Ran Benita Reviewed-by: Josh Triplett Reviewed-by: Daniel Martin commit 8221d249b77131b338e3b35ce2229193f129e514 Author: Ran Benita Date: Sun Feb 23 22:55:21 2014 +0200 c_client.py: remove trailing whitespace from generated files Signed-off-by: Ran Benita Reviewed-by: Daniel Martin commit e3c728ee3d9a2fd7478d5f57830c3483b774a16e Author: Ran Benita Date: Sun Feb 23 22:55:20 2014 +0200 c_client.py: remove useless generated comments They are bloated, don't add anything over the signature, in some cases duplicate the doxygen comments, and are not integrated with the tags in any way. Remove them and cut the generated LOC by half. Signed-off-by: Ran Benita Reviewed-by: Daniel Martin commit cae2e398563841c5b814596fd1f1c64354dcac71 Author: Ran Benita Date: Sun Feb 23 22:55:19 2014 +0200 c_client.py: make the man page output deterministic Some parts of the man pages (SEE ALSO and ERRORS) are generated by iterating a Python dict. But the iteration order in a dict is random, so each build the output is ordered differently. Avoid that by iterating in sorted order. Signed-off-by: Ran Benita Reviewed-by: Daniel Martin commit bfbf83b1d8113ac398b57c2738706792946d1c03 Author: Ran Benita Date: Sun Feb 23 22:55:18 2014 +0200 c_client.py: prefix all monkey-patched fields with c_ The script adds many fields to the objects coming from xcbgen. To distinguish them, a c_ prefix is used, but for some it was missing. Signed-off-by: Ran Benita Reviewed-by: Daniel Martin commit 285d566a5c11c6edd3665beb42312e24bde77d16 Author: Ran Benita Date: Sun Feb 23 22:55:17 2014 +0200 c_client.py: remove trailing whitespace These are extra annoying in python code. Signed-off-by: Ran Benita Reviewed-by: Daniel Martin commit 285838cfe41c212a2453d903497757d2392fd0ce Author: Ran Benita Date: Sun Feb 23 22:55:16 2014 +0200 c_client.py: remove useless 'today' variable Signed-off-by: Ran Benita Reviewed-by: Daniel Martin commit 49a61c8b459ab19c7f39e653bbb0d0339ea8f00f Author: Alan Coopersmith Date: Fri Jul 11 20:41:15 2014 -0700 Fix typos & awkward wording in tutorial Signed-off-by: Alan Coopersmith commit 125135452a554e89e49448e2c1ee6658324e1095 Author: Michael Haubenwallner Date: Fri Jun 13 16:18:34 2014 +0200 bug#79986: include system headers early AIX does redefine 'events' to 'reqevents' eventually. To not have this cause compilation errors, need to include the local header files after any system header file. Reviewed-by: Alan Coopersmith Signed-off-by: Alan Coopersmith commit bc5a1047548b578624cfbc44ca192cde7664ed78 Author: Alan Coopersmith Date: Fri Jun 13 21:26:21 2014 -0700 Document failure modes of xcb_connect*() functions Documentation was previously unclear that these always return a non-NULL pointer, and that callers need to check it for error values, instead of checking for a NULL return value. Triggered by having to dig through code to answer a user's question on the #xcb irc channel, since neither of us found it covered in the docs. Signed-off-by: Alan Coopersmith Reviewed-by: Uli Schlachter commit 72e45969ff71204cee2dde3502841736cfd41c8a Author: Daniel Martin Date: Mon Jun 9 17:55:04 2014 +0200 Handle between lists Without this patch we end up with invalid C code if we've a between two variadic lists. Check for such a condition and take the alignment pad into account. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79808 Signed-off-by: Daniel Martin Signed-off-by: Peter Harris commit d978a4f69b30b630f28d07f1003cf290284d24d8 Author: Jeremy Huddleston Sequoia Date: Sat Apr 5 20:54:59 2014 -0700 xcb_open: Improve abstraction for launchd secure sockets This changes away from hard-coding the /tmp/launch-* path to now supporting a generic [.] format for $DISPLAY. Signed-off-by: Jeremy Huddleston Sequoia commit 29e419c5840a1eeda3336a0802686ee723dcaab3 Author: Jeremy Huddleston Sequoia Date: Sat Apr 5 21:09:42 2014 -0700 xcb_open: Minor code cleanup for better readability Signed-off-by: Jeremy Huddleston Sequoia Reviewed-by: Uli Schlachter commit be0fe56c3bcad5124dcc6c47a2fad01acd16f71a Author: Keith Packard Date: Mon Dec 23 21:15:20 2013 -0800 Ensure xcb owns socket and no other threads are writing before send_request 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 Reviewed-by: Uli Schlachter commit e2813e1cde893f384fa620ff3c13493beebabe0c Author: Keith Packard Date: Wed Feb 12 14:15:46 2014 -0800 Update .pc file Requires lines to express full dependencies 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 Signed-off-by: Uli Schlachter commit 32de4c4213a49c61127c6957ea05fef3e5355291 Author: Keith Packard Date: Wed Feb 12 14:15:45 2014 -0800 Validate .pc file Requires lines This walks through the .pc.in files and makes sure all of the Requires lines express sufficient dependency information. Signed-off-by: Keith Packard Signed-off-by: Uli Schlachter commit 1f6cd9f1fcd3c07d323b678292c9cb00ae1f7504 Author: Keith Packard Date: Wed Feb 12 14:15:44 2014 -0800 Only #include directly referenced module header files This avoids having the nested header files also included at the top level, which is more efficient. Signed-off-by: Keith Packard Signed-off-by: Uli Schlachter commit cb686b576739deea00180c54697c8b62b8419ae0 Author: Uli Schlachter Date: Tue Feb 25 15:50:50 2014 +0100 Add doxygen documentation to functions in xcbext.h Signed-off-by: Uli Schlachter Reviewed-by: Josh Triplett commit 2fb14e5883f2ea2f01d248674cfcc26ccb704753 Author: Uli Schlachter Date: Tue Dec 31 15:18:01 2013 +0100 Make xcb_disconnect(NULL) safe 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 Reviewed-by: Julien Cristau commit 4dcbfd77b78ca6b016ce815af26235501f6cd75a Author: Uli Schlachter Date: Tue Dec 31 15:05:36 2013 +0100 xcb_disconnect(): Fix leak with error connections 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 Reviewed-by: Julien Cristau commit d84dd752ef571491b015443fefedca53c7f81282 Author: Uli Schlachter Date: Mon Sep 9 13:04:11 2013 +0200 Remove tabs and trailing whitespaces Signed-off-by: Uli Schlachter commit 4ffa6f83b92763eb901c7ddb7c20775e24d507ca Author: Ran Benita Date: Sat Jan 18 17:10:53 2014 +0200 Add comments about how _xcb_conn_ret_error() works 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 Signed-off-by: Uli Schlachter commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3 Author: Gaetan Nadon Date: Tue Jan 7 14:02:21 2014 -0500 generated man pages: use xorg footer and no hard coded extension 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 Signed-off-by: Gaetan Nadon commit e4061b8f00d301a51d4c9eef4a07f1e87592fe85 Author: Gaetan Nadon Date: Tue Jan 7 14:02:16 2014 -0500 generated man pages: build without hard coded extension 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 Signed-off-by: Gaetan Nadon commit 3cdd524cadc4352ebd9e17b1f73134bec1838b40 Author: Gaetan Nadon Date: Tue Jan 7 14:02:05 2014 -0500 man: build static man pages using xorg patterns 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 Signed-off-by: Gaetan Nadon commit c056adcd92daa06f4825d5c85a40e140a3e85b42 Author: Gaetan Nadon Date: Thu Jan 9 14:32:18 2014 -0500 autoconf: replace all tabs with spaces Reviewed-by: Josh Triplett Signed-off-by: Gaetan Nadon commit 412928f113c8a5e5b30c03a294a42b0b1cf5f5d7 Author: Gaetan Nadon Date: Tue Jan 7 14:00:44 2014 -0500 autoconf: use default xorg configuration for doxygen documentation 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 Signed-off-by: Gaetan Nadon commit 9ba6aa759e937e60b231b209b1293a40ad6c7a8a Author: Gaetan Nadon Date: Tue Jan 7 14:00:43 2014 -0500 autoconf: fix warning by replacing deprecated AC_HELP_STRING Reviewed-by: Josh Triplett Signed-off-by: Gaetan Nadon commit 942eabaae3600e7277aa09a179ef10c9a06de62f Author: Gaetan Nadon Date: Tue Jan 7 14:00:42 2014 -0500 autoconf: require libtool minimum level 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 Signed-off-by: Gaetan Nadon commit 517cb0e888eca4030b4bd00c316619db925032ea Author: Gaetan Nadon Date: Tue Jan 7 14:00:41 2014 -0500 autoconf: comment and layout the initialization section No functional changes. Trying to make it clearer. Reviewed-by: Alan Coopersmith Reviewed-by: Josh Triplett Signed-off-by: Gaetan Nadon commit 0a17b61a8971d3c4600a5c19fa7d753e7196abfb Author: Gaetan Nadon Date: Tue Jan 7 14:00:40 2014 -0500 autoconf: AC_INIT: add bug url Reviewed-by: Josh Triplett Signed-off-by: Gaetan Nadon commit 414b1037c5a9770270022e62aa66fe7a4021a96b Author: Gaetan Nadon Date: Tue Jan 7 14:00:39 2014 -0500 autoconf: use the warning variables from xorg 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 Signed-off-by: Gaetan Nadon commit c4f2c70bc37a592406b7693562c7513f2f99b34d Author: Gaetan Nadon Date: Tue Jan 7 14:00:38 2014 -0500 autoconf: use XORG_DEFAULT_OPTIONS 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 Signed-off-by: Gaetan Nadon commit e7263931aff3e3450dc938ad465a7577f943549f Author: Peter Harris Date: Tue Jan 14 14:50:55 2014 -0500 Support Reviewed-By: Ran Benita Signed-off-by: Peter Harris commit 3b72a2c9d1d656c74c691a45689e1d637f669e3a Author: Kenneth Graunke Date: Fri Jan 3 15:08:33 2014 -0800 Force XCB event structures with 64-bit extended fields to be packed. 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 Reviewed-by: Keith Packard [v1] Reviewed-by: Josh Triplett [v1] Reviewed-by: Daniel Martin Signed-off-by: Alan Coopersmith commit 010872f611a044ced4e96b18a7514796b2a443df Author: Uli Schlachter Date: Sun Dec 22 15:59:24 2013 +0100 Release libxcb 1.10 Signed-off-by: Uli Schlachter commit f653464554469b5767f1c99abced25a76bace047 Author: Julien Cristau Date: Sat Dec 14 06:16:37 2013 +0100 Add NEWS for 1.10 Signed-off-by: Julien Cristau commit 9c2a6dc20c64ce93e0acd2fceec6d3cab8fc9134 Author: Uli Schlachter Date: Fri Nov 15 22:33:12 2013 +0100 Add NEWS entries for releases 1.9.1 to 1.9.3 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 Signed-off-by: Julien Cristau commit ea4406a8e0193cad8effe569e7835f8b67894e54 Author: Julien Cristau Date: Sat Dec 14 05:54:20 2013 +0100 Bump xcb-proto requirement to 1.10 Makes sure we generate the new generic event struct. Signed-off-by: Julien Cristau commit a1299eb2a210b5788a2b827b82a3d825caa1f201 Author: PHO Date: Tue Dec 3 12:43:04 2013 +0900 Test the value of msg_controllen for platforms whose CMSG_FIRSTHDR() does 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 commit b30b11ac49d934541312b03c41d1ab83047a59f4 Author: Uli Schlachter Date: Mon Nov 18 20:28:08 2013 +0100 Increment the "current" version info for sync, xinput and xkb 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 Signed-off-by: Julien Cristau commit ce5395eb4611341ba7c243ed524d023a616f73bb Author: Uli Schlachter Date: Mon Nov 18 20:30:18 2013 +0100 Revert "Remove xcb_ge_event_t from xcb.h" 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 Signed-off-by: Julien Cristau commit 18f0afab3f0de68114fe185e89d8b25a8c072a2c Author: Daniel Martin Date: Fri Nov 22 23:27:28 2013 +0100 c_client.py: Fix _sizeof() functions 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 Reviewed-by: Ran Benita Reviewed-by: Daniel Martin Signed-off-by: Ran Benita Signed-off-by: Julien Cristau commit 5d1dbb468bb0f834eaa8adea6daf6729808ca429 Author: Uli Schlachter Date: Mon Nov 18 19:49:41 2013 +0100 Revert "fix deadlock with xcb_take_socket/return_socket v3" 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 Conflicts: src/xcbint.h commit c7c5b710f2cc0782412c9e159986c96b52aa0d02 Author: Mark Kettenis Date: Mon Nov 11 23:11:56 2013 +0100 Fix alignment issues in FD passing code 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 Reviewed-by: Matthieu Herrb Signed-off-by: Uli Schlachter commit e8663a935890ff366f49e356211049dfd0d9756a Author: Alan Coopersmith