NXv3 (redistributed) https://cgit.arctica-project.org/nx-libs/atom?h=3.5.99.23 2020-01-09T23:25:46+00:00 2020-01-09T23:25:46+00:00 Ulrich Sibiller uli42@gmx.de 2020-01-09T22:18:17+00:00 urn:sha1:a94e8258f72ab5db4b9a1de7e10140b8d622667b commit 08d0481e299c28b64a0db9bb0782ba2b551028fd Author: Keith Packard <keithp@keithp.com> Date: Sun Dec 15 01:12:22 2013 -0800 os: Fix -Wshadow errors Rename variables to avoid shadowing globals Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net> 2020-01-05T23:50:26+00:00 Ulrich Sibiller uli42@gmx.de 2018-11-07T21:19:17+00:00 urn:sha1:d409b566bdaf7d40f1697095e62b7811c793fd30 2020-01-05T23:49:59+00:00 Ulrich Sibiller uli42@gmx.de 2018-11-07T21:28:32+00:00 urn:sha1:74270d6b72f4a154c08bd37dfff92369b4b14863 2020-01-05T23:49:59+00:00 Ulrich Sibiller uli42@gmx.de 2018-11-07T21:27:49+00:00 urn:sha1:38ab9ad85948bbd475337d60138e6de60726130a 2020-01-05T23:49:55+00:00 Ulrich Sibiller uli42@gmx.de 2018-11-07T21:24:59+00:00 urn:sha1:5fb7f53c6f06df54e7fb45498d697d17483565b6 2019-09-29T15:10:05+00:00 Ulrich Sibiller uli42@gmx.de 2019-08-01T21:18:03+00:00 urn:sha1:b1850beb9f58f32cb13f585b55a44a4467f2093a 2019-08-27T06:12:23+00:00 Ulrich Sibiller uli42@gmx.de 2019-08-10T22:21:44+00:00 urn:sha1:a539aaa6aaa7a29023ef4c3d116fc2e1a11c82c1 Before there was no way of getting a white background despite having the approriate code. Backport of this commit: commit cb0a565d2b2cf8823abbd77b4426cc2237731dc1 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Aug 18 17:04:48 2006 +0300 dix: add whiteroot flag Add a -wr option to use a white root window, and use a BackPixel rather than BackPixmap for both white and black root windows. Fixes ArcticaProject/nx-libs#832 2019-06-22T09:30:47+00:00 Ulrich Sibiller uli42@gmx.de 2019-06-19T23:35:22+00:00 urn:sha1:3c0469971a5092781783b6a5c86b668047e475be 2019-06-12T16:35:01+00:00 Ulrich Sibiller uli42@gmx.de 2019-05-31T22:52:06+00:00 urn:sha1:a765857aaa450862f6a3dc5de811671fbc82ca61 We are not using any alloc function that respects that variable, so lets drop it. Backport of this commit: commit 0ce61e21d6d7dcca0090e319bbcdb678570f2c3f Author: Adam Jackson <ajax@redhat.com> Date: Fri Oct 3 16:05:19 2008 -0400 Remove the Must_have_memory hack. Also remove an astonishing amount of misunderstanding of how casts work. 2019-06-11T09:32:55+00:00 Ulrich Sibiller uli42@gmx.de 2019-05-27T13:42:11+00:00 urn:sha1:a736122f5712d5d1b3b798ace3583a101c0cdf61 Not sure how it came to this situation, but the following commit is partly contained in our version of the code. Some lines had not been removed, tough... commit c80c41767eb101e9dbd8393d8cca7764b4e248a4 Author: Aaron Plattner <aplattner@nvidia.com> Date: Mon Oct 25 22:01:32 2010 -0700 os: Fix BigReq ignoring when another request is pending Commit cf88363db0ebb42df7cc286b85d30d7898aea840 fixed the handling of BigReq requests that are way too large and handles the case where the read() syscall returns a short read. However, it neglected to handle the case where it returns a long read, which happens when the client has another request in the queue after the bogus large one. Handle the long read case by subtracting the smaller of 'needed' and 'gotnow' from oci->ignoreBytes. If needed < gotnow, simply subtract the two, leaving gotnow equal to the number of extra bytes read. Since the code immediately following the (oci->ignoreBytes > 0) block tries to handle the next request, advance oci->bufptr immediately instead of setting oci->lenLastReq and letting the next call to ReadRequestFromClient do it. Fixes the XTS pChangeKeyboardMapping-3 test. CASES TESTS PASS UNSUP UNTST NOTIU WARN FIP FAIL UNRES UNIN ABORT -Xproto 122 389 367 2 19 0 0 0 1 0 0 0 +Xproto 122 389 368 2 19 0 0 0 0 0 0 0 Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>