aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'uli42-pr/fix_broken_cursor_handling' into 3.6.xMike Gabriel2019-06-114-69/+81
|\ | | | | | | Attributes GH PR #810: https://github.com/ArcticaProject/nx-libs/pull/810
| * os: fix BigReq ignoring when another request is pendingUlrich Sibiller2019-06-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * render/glyph.c: add missing usage_hintUlrich Sibiller2019-06-111-1/+2
| | | | | | | | was missing in 8b5bb2cdafe5f7bd77826a1fd28f07b7329be899
| * Fix NXevents.c: Reactivate errornously commented functionUlrich Sibiller2019-06-112-66/+79
|/ | | | | | | | | CheckMotion() had been commented in add881931f2e702fb1952f4e1baba04b3dc536ee as it looked identical to the version from dix/events.c except for some commented code. But this based (probably) on a thinko - code that had been disabled by NX became active again this way. Fix this by removing the comments and by adding #ifdef/else to emphasize the difference.
* Merge branch 'uli42-pr/remove_requestlog' into 3.6.xMike Gabriel2019-06-113-23/+0
|\ | | | | | | Attributes GH PR #811: https://github.com/ArcticaProject/nx-libs/pull/811
| * dix: remove unused requestLogIndexUlrich Sibiller2019-05-293-23/+0
|/ | | | | | | | | | | | | | | | | | | | | As done in these commits: commit 6583477035234e23ead2fad9db7a07e5862447a4 Author: Nicolai Hähnle <nhaehnle@gmail.com> Date: Sat May 23 13:35:24 2009 +0200 Remove reference to non-existing requestLog and requestLogIndex These fields were removed in 252ec504817e05b185e4896a2d899e9c00b8aeef. Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 252ec504817e05b185e4896a2d899e9c00b8aeef Author: Adam Jackson <ajax@redhat.com> Date: Mon Mar 30 15:18:30 2009 -0400 Document which bits of ClientRec are currently unused
* Merge branch 'uli42-pr/fix_xkb_crash' into 3.6.xMike Gabriel2019-05-212-0/+18
|\ | | | | | | Attributes GH PR #809: https://github.com/ArcticaProject/nx-libs/pull/809
| * libNX_X11: add additional checks for dpy and xkbUlrich Sibiller2019-05-171-0/+14
| | | | | | | | | | | | | | | | | | We have seen crashes during session shutdown/connection problems here. These patches should avoid them. There's no proper way to test them, but they should do no harm.. Fixes ArcticaProject/nx-libs#801 Fixes https://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=695
| * xkbUtils.c: Catch division by zeroUlrich Sibiller2019-05-171-0/+4
|/ | | | Fixes ArcticaProject/nx-libs#808
* Merge branch 'andschwa-xtestext1h' into 3.6.xMike Gabriel2019-05-174-40/+0
|\ | | | | | | | | | | Attributes GH PR #806: https://github.com/ArcticaProject/nx-libs/pull/806 Fixes ArcticaProject/nx-libs#807.
| * Remove Debian build references to `xtestext1.h`Andrew Schwartzmeyer2019-05-134-40/+0
|/ | | | | This file has been deleted, but references to it in the build remain, causing `debuild` to fail.
* Merge branch 'uli42-pr/small_fixes' into 3.6.xMike Gabriel2019-05-1128-3209/+120
|\ | | | | | | Attributes GH PR #797: https://github.com/ArcticaProject/nx-libs/pull/797
| * nxagent: make nxagentX2go a BooleanUlrich Sibiller2019-05-102-10/+10
| |
| * README.keystrokes: mention nxdialogUlrich Sibiller2019-05-101-5/+17
| |
| * Remove useless "ignore" keystroke for Ctrl-Alt-BackspaceUlrich Sibiller2019-05-102-3/+0
| | | | | | | | nxagent does not react on that anyway (see xkb/xkbDflts.h)
| * README.keystrokes: refine descriptionUlrich Sibiller2019-05-101-8/+14
| |
| * NXdispatch.c: indent code to match environmentUlrich Sibiller2019-05-101-13/+13
| |
| * NXdispatch.c: add missing fixesUlrich Sibiller2019-05-101-5/+3
| | | | | | | | transfer to derived file was incomplete in 6acbfab33133a92dbd7f128284d26f94bfeb1af2
| * NXdispatch.c: add missing changeUlrich Sibiller2019-05-101-0/+3
| | | | | | | | This change was missing in 239fe3d0802b12ce8947741693244ff8154fa559
| * Rename libdamage to (correct) libdamageextUlrich Sibiller2019-05-102-3/+3
| | | | | | | | upstream xorg is also using that name
| * NXdamage.c: add missing upstream fixesUlrich Sibiller2019-05-101-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of those fixes have been part of xorg's INITIAL damage.c from 2004. They where missing in NX nevertheless. The other fixes come from this commit: commit fec868bf0f67a8f62fc69d55e2ff72b6cacea6f8 Author: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue Nov 23 17:10:55 2004 +0000 //freedesktop.org/bugzilla/show_bug.cgi?id=1204): Fix X11 test suite (caused by DAMAGE layer) failure with Xvfb when rendering text using |XDrawText*()| (XDrawText() tests 1, 3, 4, 27, 28, 29, 30, 34, 37, 39, 41, 43 and XDrawText16() tests 1, 3, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 34, 37, 39, 41, 43). Patch by Hong Bo Peng <penghb@cn.ibm.com> and Stefan Dirsch <sndirsch@suse.de>.
| * NXwindow.c: add missing changeUlrich Sibiller2019-05-101-2/+0
| | | | | | | | was forgotten during backport (see commit 7401a6691a9a3cd77431466b941eaf169c9b2b2c)
| * Keyboard.c: clean/unify formattingUlrich Sibiller2019-05-101-13/+19
| |
| * Keyboard.c: improve TEST and DEBUG outputUlrich Sibiller2019-05-101-2/+3
| |
| * nxagent: Remove own GetTimeInMillis() implementationUlrich Sibiller2019-05-104-32/+17
| | | | | | | | | | | | | | | | | | | | along with the DDXTIME define that has been dropped in Xorg upstream, too. commit 985c34bf06af70a7296db8307899a17347a25558 Author: Adam Jackson <ajax@theobromine.nwnk.net> Date: Thu Jul 20 17:33:13 2006 -0400 Remove the DDXTIME conditional, for being unused.
| * Die XTESTEXT1, die!Ulrich Sibiller2019-05-1010-3100/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit a73e0f8cdfec1c9199ffe696146ba7d677c4c10d Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Jun 1 18:47:47 2006 +0000 Die XTESTEXT1, die! Citing an email from the xorg-modular mailing list: On Tuesday 21 February 2006 23:04, Enrico Weigelt wrote: > Hi folks, > > I'm wondering what's the difference between XTEST and XTESTEXT1 > (the second one can be configured w/ my current patch ...) > Are they both the same ( -> XTest extension ) ? > Can I put both symbols together ? They're not the same extension. XTest is the one you want, if you want either. The other hasn't been built by default in ages and I should probably go ahead and nuke it from the tree. - ajax
| * Reconnect.c: initialize stateFile pathUlrich Sibiller2019-05-101-1/+1
| | | | | | | | We check that via strlen() while never properly initializing it.
| * spelling fixesUlrich Sibiller2019-05-103-6/+6
|/
* Merge branch 'uli42-pr/short_font_code' into 3.6.xMike Gabriel2019-05-105-128/+105
|\ | | | | | | Attributes GH PR #795: https://github.com/ArcticaProject/nx-libs/pull/795
| * Font.c: use __func__ in TEST printsUlrich Sibiller2019-05-101-15/+15
| |
| * Font.c: Avoid duplicate font pathsUlrich Sibiller2019-05-101-2/+26
| |
| * auto-determine system font path and add to list of font pathsUlrich Sibiller2019-05-104-0/+12
| | | | | | | | | | This will help on non-supported platforms as it will add a path the current code might not be aware of.
| * Font.c: Loop over font pathsUlrich Sibiller2019-05-101-8/+16
| | | | | | | | | | drop defines and use an array instead. This way adding further paths can be done much easier.
| * Font.c: Let dix check if a font path existsUlrich Sibiller2019-05-101-30/+24
| | | | | | | | | | Dix will only add font paths that are existing on the system. There's no need to check that ourselves.
| * Font.c: build the font paths at runtimeUlrich Sibiller2019-05-101-33/+34
| | | | | | | | Drop the font path defines and build the path strings at runtime instead.
| * Drop Speedo font supportUlrich Sibiller2019-05-102-11/+7
| | | | | | | | Has been obsoleted in 2005, see https://en.wikipedia.org/wiki/Bitstream_Speedo_Fonts
| * Font.c: factor out font checksUlrich Sibiller2019-05-101-95/+37
|/
* Merge branch 'uli42-pr/fix_flavour_change' into 3.6.xMike Gabriel2019-05-102-8/+27
|\ | | | | | | Attributes GH PR #804: https://github.com/ArcticaProject/nx-libs/pull/804
| * nxagent: Determine nxagentProgName only onceUlrich Sibiller2019-05-102-8/+27
|/ | | | | | | also add TEST prints, init nxagentProgName with NULL and add const where it was missing. Fixes ArcticaProject/nx-libs#803
* Merge branch 'mjtrangoni-update-clang-8' into 3.6.xMike Gabriel2019-04-231-3/+3
|\ | | | | | | Attributes GH PR #794: https://github.com/ArcticaProject/nx-libs/pull/794
| * travis.yml: Update clang 7.0 => 8.0Mario Trangoni2019-04-221-3/+3
|/ | | | Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
* roll-tarballs.sh: Fix script removal from nx-libs-lite tarballs.Mike Gabriel2019-04-171-1/+3
|
* roll-tarballs.sh: Remove nxdialog/* in nx-libs-lite tarballs.Mike Gabriel2019-04-171-0/+1
|
* release 3.5.99.203.5.99.20Mike Gabriel2019-04-178-10/+81
|
* nxdialog/bin/nxdialog: Fix error dialog-type-not-supplied error message.Mike Gabriel2019-04-171-1/+1
| | | | Fixes ArcticaProject/nx-libs#793.
* Merge branch 'sunweaver-pr/pthread-flags' into arctica-3.6.xMihai Moldovan2019-04-081-2/+2
|\ | | | | | | Attributes GH PR #790: https://github.com/ArcticaProject/nx-libs/pull/790
| * nxcomp/src/Makefile.am: Correct usage of PTHREAD_CFLAGS and PTHREAD_LIBS. ↵Mike Gabriel2019-04-071-2/+2
|/ | | | PTHREAD_CFLAGS is also supposed to be used when linking. See comments in m4/ax_pthread.m4.
* nxdialog/Makefile.am: We forgot to clean up nxdialog/bin/Makefile.in.Mike Gabriel2019-04-071-0/+1
|
* Makefile: Add clean/distclean target calls for nxdialog subdir to master ↵Mike Gabriel2019-04-071-0/+2
| | | | Makefile's clean/distclean targets.
* Merge branch 'Ionic-bugfix/libXcomp-pthread-underlinking' into 3.6.xMike Gabriel2019-04-0710-91/+49
|\ | | | | | | Attributes GH PR #791: https://github.com/ArcticaProject/nx-libs/pull/791
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 02:08:31 +0000