| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
We have it disabled by default but there hasn't been a way to enable it.
|
|
|
|
| |
NX_WAKEUP had been non-effective and its effect had been tied to NX_TRANS_WAKEUP.
|
|
|
|
|
|
|
|
|
|
| |
1. indent ifdefs
2. add some logic at start that unset NX_TRANS_WAKEUP and
NX_TRANS_DEBUG if NX_TRANS_SOCKET is unset. This way we only have to
check for one macro and not all three.
3. remove redundant macro checks
4. decouple debug printfs by always running the original code and adding the
identical check in #ifdef NX_TRANS_DEBUG
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backport of this xorg-xserver commit:
commit 75c51c67b340548286efd41a53882e2acaf74ab5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jun 18 09:49:12 2009 -0700
Clarify use of and need for mffs vs. ffs
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes ArcticaProject/nx-libs#301, #631
Backport from xorg-xserver:
commit ca82d4bddf235c9b68d51d68636bab40eafb9889
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 13:00:23 2007 -0700
Bug #7186: Fix an excessive request size limitation that broke big-requests.
MAXBUFSIZE appears to be a leftover of some previous time. Instead, just
use maxBigRequestSize when bigreqs are available (limiting buffers to ~16MB).
When bigreqs are not available, needed won't be larger than the maximum
size of a non-bigreqs request (256kB).
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Xorg header].
Backport from X.org:
commit 724dbc2f8bbe2f21bf16f20ca7b8bb555516626c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue May 2 01:30:37 2006 +0000
Use min() [defined in include/misc.h] instead of MIN() [not defined in any
Xorg header].
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 491cf02e191e70c5ce24c19da880bb79bebfc03c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Feb 10 2015 14:37:26 +0000
[PATCH] os: XDMCP options like -query etc. should imply -listen tcp
In X server 1.17, the default configuration is now -nolisten tcp. In this
configuration, XDMCP options don't work usefully, as the X server is not
listening on the port for the display that it tells the display manager to
connect to.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... by implementing some kind of recalloc (mix of realloc and calloc).
Fixes this valgrind finding:
==7061== Syscall param writev(vector[...]) points to uninitialised byte(s)
==7061== at 0x781EFE0: __writev_nocancel (syscall-template.S:84)
==7061== by 0x488974: _XSERVTransSocketWritev (Xtranssock.c:2914)
==7061== by 0x47DBD3: FlushClient (io.c:1080)
==7061== by 0x47DBD3: FlushAllOutput.part.0 (io.c:817)
==7061== by 0x477304: WaitForSomething (WaitFor.c:246)
==7061== by 0x434369: Dispatch (NXdispatch.c:360)
==7061== by 0x40EB92: main (main.c:353)
==7061== Address 0x102106f3 is 50,211 bytes inside a block of size 54,308 alloc'd
==7061== at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==7061== by 0x47F08F: FlushClient (io.c:1123)
==7061== by 0x47F307: WriteToClient (io.c:991)
==7061== by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660)
==7061== by 0x42B7D6: ListFonts (NXdixfonts.c:735)
==7061== by 0x433A6D: ProcListFonts (NXdispatch.c:989)
==7061== by 0x4344A5: Dispatch (NXdispatch.c:482)
==7061== by 0x40EB92: main (main.c:353)
==7061== Uninitialised value was created by a heap allocation
==7061== at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==7061== by 0x47F08F: FlushClient (io.c:1123)
==7061== by 0x47F307: WriteToClient (io.c:991)
==7061== by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660)
==7061== by 0x42B7D6: ListFonts (NXdixfonts.c:735)
==7061== by 0x433A6D: ProcListFonts (NXdispatch.c:989)
==7061== by 0x4344A5: Dispatch (NXdispatch.c:482)
==7061== by 0x40EB92: main (main.c:353)
==7061==
|
|
|
|
| |
UseTIRPC.
|
|
|
|
| |
is used nowhere anyway
|
| |
|
| |
|
|
|
|
| |
'nxagentProgName' instead and pass it around where needed.
|
|
|
|
| |
Fixes ArcticaProject/nx-libs#639.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use stock implementation instead.
* Reason from NoMachine's NX CHANGELOG for having its own implementation
of Xvasprintf() (from around nxagent 3.3.0):
- Fixed TR06G02225. The implementation of Xvprintf() has been reviewed
to work on more platforms. Previous implementation caused a failure
in the build of keyboard map on some platform like Solaris 8 and 9.
- Fixed TR03G02198. Reimplemented Xvprintf() in Xserver/os to handle
the case in which vsnprintf returned -1.
* Reason for removing it again:
- Fixes segfaults in SetDefaultFontPath when launching nxagent.
- All locations in Xserver/** using the code check for return value
of -1.
- Solaris 8 and 9 are beyond of our support scope.
- Keep more in sync with X.org.
- Good moment to drop more GPL-2 code from Xserver's code base.
|
|
|
|
|
|
|
| |
function, add missing header includes.
Fix up for 1e3a97482840401af9ffcf73db6008ebfe6c1d52, which has been
faulty in this regard.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 5c2e2a164d615ab06be28a663734e782614b5cc7
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Wed Apr 18 09:51:51 2012 +0000
os/xprintf: add Xvscnprintf and Xscnprintf
Normal snprintf() usually returns the number of bytes that would have been
written into a buffer had the buffer been long enough.
The scnprintf() variants return the actual number of bytes written,
excluding the trailing '\0'.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 1324b0ca9f8a7fdaf03b374c75eb3c9df407c2f1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Dec 10 00:08:24 2010 +0000
Typo in xserver Xvasprintf()
I needed this patch in the wrapper around vsnprintf() in os/xprintf.c
(MinGW for Windows build) to correct various crashes.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit c95c1d338fdb62dbe3dba934b97324fa778b7fce
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 18:43:12 2010 -0800
Add asprintf() implementation for platforms without it
Provides a portable implementation of this common allocating sprintf()
API found in many, but not yet all, of the platforms we support.
If the platform provides vasprintf() we simply wrap it, otherwise we
implement it - either way callers can use it regardless of platform.
Since not all platforms guarantee to NULL out the return pointer on
failure, we don't either, and require callers to check the return
value for -1.
The old Xprintf() API is deprecated, but left for compatibility for now.
The new API is added in a new header so that it can be used in parts of
the server such as hw/xfree86/parser that don't include all the server
headers.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Includes re-indentation changes from
9838b7032ea9792bec21af424c53c07078636d21.
Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>
|
|
|
|
|
|
| |
nxagent will abort if it encounters an unknown command line option. As
we want 3.6 to be a drop-in replacement for 3.5 we cannot simply drop old
options but must accept them as no-op.
|
| |
|
|
|
|
| |
are given, use the explicit display number as a starting point for auto-detecting the next available display number.
|
|
|
|
| |
(machine-parseable) text when -displayfd is set to STDERR.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
- Move FONT_DEFINES and XLIBFONT definition to from Server.tmpl to
Imake.tmpl.
- Add FONT_DEFINES to ALLDEFINES.
- Drop SpecialCObjectRules with FONT_DEFINES from various Imakefiles
again, FONT_DEFINES is now set "globally".
- Hand over FONT_DEFINES from main Makefile to nx-X11's make BuildEnv
to make gccmakedep happy.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
alike.
Fixes ArcticaProject/nx-libs#296.
Inspired by the following X.org commit. Other than X.org, we will continue
support for building nx-libs against libXfont1 for a while.
commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 1 18:50:55 2015 -0700
dix: Switch to the libXfont2 API (v2)
This new libXfont API eliminates exposing internal X server symbols to
the font library, replacing those with a struct full of the entire API
needed to use that library.
v2: Use libXfont2 instead of libXfont_2
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
|
|
|
|
|
|
|
|
| |
commit cbb165ab88cb0810268001e84d87671440baf837
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 18:34:45 2009 -0400
os: Remove the useless -x option
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
after closing the file
commit d72f691c0c9cace857975a6608a4cb431c8b6846
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 15:00:30 2014 -0700
os: FatalError if -displayfd writes fail
When the server is started with the -displayfd option, check to make
sure that the writes succeed and give up running if they don't.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 4957e986841225e9984daca76f1a0ee08df125bb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 15:00:35 2014 -0700
os: Clear the -displayfd option after closing the file
Failing to clear this means that we'll attempt to write the display
number to a random file descriptor on subsequent X server generations.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit edcb6426f20c3be5dd5f50b76a686754aef2f64e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 1 18:11:14 2016 -0800
Use unique logfile names when starting server with -displayfd
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=93212
Previously all X servers started with -displayfd would overwrite
Xorg.0.log - now a temporary name of Xorg.pid-<pid>.log is used
until after -displayfd finds an open display - then it is renamed
to the traditional Xorg.<display>.log name.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit ea5b2b0a2e2143ad1414fcbdc081b5d584588346
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Oct 21 15:03:55 2014 +0100
os: -displayfd should check ports up to 65535
-displayfd should check ports up to 65535
Noticed during https://cygwin.com/ml/cygwin-xfree/2014-07/msg00024.html
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bundle X.org backport of these commits:
commit 7ea64fb4374504bd3d524fc08c90efdab9f253ea
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Mar 9 09:55:57 2015 -0700
Clear ListenTransConns entries in CloseWellKnownConnections
Since _XSERVTransClose frees the connection pointer passed to it,
remove that pointer from the array, so we don't try to double free it
if we come back into CloseWellKnownConnections again.
Should fix https://bugzilla.yoctoproject.org/show_bug.cgi?id=6665 in which
the shutdown section of the main() loop called CloseWellKnownConnections()
and then moved on to ddxGiveUp(), which failed to release the VT and thus
called AbortServer(), which called CloseWellKnownConnections() again.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7b02f0b87ec2fa0cc5a65307a1fd55c671cec884
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:17 2015 -0800
os: Use NotifyFd interface for listen descriptors
Replace the custom path for dealing with new incoming connections with
the general-purpose NotifyFd API.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba71b69f94f00a6f6910597185610668e79c10be
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 1 17:34:41 2016 -0800
Avoid segfault in CloseWellKnownConnections when using -displayfd
When -displayfd is looping through the possible display ids to use,
if it can't open all the listening sockets for one (say when :0 is
already in use), it calls CloseWellKnownConnections to close all
the ListenTransConns entries before the point that ListenTransFds
was allocated & initialized, so CloseWellKnownConnections would
segfault trying to read entries from a NULL ListenTransFds pointer.
Introduced by commit 7b02f0b8
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit bc348bd2c42f3f18786085ccef2f010eff5bf3d2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Mar 11 14:34:32 2013 +0000
Handle -displayfd and an explicit display number sensibly
Handle -displayfd and an explicit display number sensibly, e.g. use the
explicitly specified display number, and write it to the displayfd
v2: displayfd might be 0, so use -1 as invalid value
v3: Rebase for addition of NoListenAll flag
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
| |
This allows us to trigger the NoListenAll := TRUE code path in nxagent.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 44fe1b8ea284df6bbaef67e246016d104665b2fe
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Mar 19 14:03:13 2014 -0700
os: Add a mechanism to prevent creating any listen sockets
A socket-activated server will receive its listening sockets from the
parent process and should not create its own sockets. This patch
introduces a NoListen flag that can be set by a DDX to prevent
the server from creating the sockets. When NoListen is enabled, we
also disable the server lock checking, since the parent process is
responsible for checking the lock before picking the display name and
creating the sockets.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|