| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
GetHosts saves the pointer to allocated memory in *data, and then
wants to bounds-check writes to that region, but was mistakenly using
a bare 'data' instead of '*data'. Also, data is declared as void **,
so we need a cast to turn it into a byte pointer so we can actually do
pointer comparisons.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
v1: Keith Packard
v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
|
|
|
|
|
| |
v1: Eamon Walsh
v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
|
|
|
|
| |
Just like upstream does
|
|
|
|
| |
just as upstream did
|
|
|
|
| |
it is no longer needed because the code here is only used in the server.
|
|
|
|
| |
just like upstream does
|
|
|
|
| |
just like upstream does
|
|
|
|
| |
just like upstream does
|
|
|
|
| |
just like upstream does
|
|
|
|
| |
just like upstream does
|
|
|
|
|
|
|
|
| |
Before those files where symlinked in the makefile. While trying to
upgrade libX11 to 1.3.4 it turned out that the symlinked did not work
in the xserver anymore.
Upstream has copies of those files, too.
|
|
|
|
| |
randr.h and randrproto.h. This commit leaves the newer file versions in the package and let's the build process use those everywhere.
|
|
|
|
| |
header file, so that it only contains the XRRScreenChangeNotifyEvent typedef.
|
|
|
|
|
|
|
| |
This fixes ArcticaProject/nx-libs#204.
However, this fix does not address the root of the problem, it simply avoids
it. We could run into it again... See bugreport for an explanation.
|
|
|
|
|
|
|
| |
After commit cbf3ef0f219a7d5c94a7f5d5b46c9a0e26cc6588 this no longer
necessary.
This reverts commit 9a4bb50af54ced8d53112b8fa3b5b9dc3b481224.
|
|
|
|
| |
xserver upstream has included the required files. So do we.
|
|
|
|
|
| |
Upstream does not use xkbfile but has own copies of the required
files. It was not used elsewhere.
|
|
|
|
| |
information as display by nxagent.
|
| |
|
|
|
|
| |
expected selections of values.
|
|
|
|
| |
reconnectchecks parameter value is explained.
|
| |
|
|
|
|
| |
instead of =none.
|
|
|
|
|
|
| |
nxagentCheckForColormapsCompatibility().
Maybe needs special strictness handling as well.
|
|
|
|
|
|
| |
nxagentInitAndCheckVisuals().
Maybe needs special strictness handling as well.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
nxagentCheckForPixmapFormatsCompatibility() and nxagentInitPixmapFormats().
Don't implicitly call the checking function in the init function (and throw
away the checking functions result...)
Instead, explicitly use the checking function after the init function in other
parts of the code and throw away the checking functions return value
selectively or actually use it while reconnecting.
This is totally different behavior compared to the original one. Hopefully it
doesn't cause any problems (i.e., hopefully there was no good reason for never
using the checking functions return value, but an oversight.)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
nxagentOption value in nxagentCheckForPixmapFormatsCompatibility() and modify behavior based on this value.
Recognized values:
- Strict means that the number of internal and
external pixmap formats must match exactly and
every internal pixmap format must be available
in the external pixmap format array.
- Safe means that the number of pixmap formats might
diverge, but all internal pixmap formats must
also be included in the external pixmap formats
array. This is recommended, because it allows
clients with more pixmap formats to still connect,
but not lose functionality.
- Risky means that the internal pixmap formats array
is allowed to be smaller than the external pixmap
formats array, but at least one pixmap format must
be included in both. This is potentially unsafe.
- Bypass or higher means that all of these checks are
essentially deactivated. This is a very bad idea.
Note that the default ReconnectTolerance value is still Strict.
Also, the return value of this function is currently not used or passed through
to other functions at all. An upcoming commit will change this behavior and
actually enable the checks.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
nxagentOption value in nxagentCheckForDepthsCompatibility() and modify behavior based on this value.
Recognized values:
- Strict means that the number of old and new depths must
match exactly and every old depth value must be
available in the new depth array.
- Safe means that the number of depths might diverge,
but all former depth must also be included in the
new depth array. This is recommended, because
it allows clients with more depths to still
connect, but not lose functionality.
- Risky means that the new depths array is allowed to be
smaller than the old depths array, but at least
one depth value must be included in both.
This is potentially unsafe.
- Bypass or higher means that all of these checks are
essentially deactivated. This is a very bad idea.
Note that the default ReconnectTolerance value is still Strict.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
nxagentOption in nxagentCheckForDefaultDepthCompatibility() and modify behavior based on this value.
Recognized values:
- Strict means that the old and new default depth values
must match exactly.
- Safe or Risky means that the default depth values
might differ, but the new default depth value must be at
least as high as the former default depth value. This is
recommended, because it allows clients with a
higher default depth value to still connect, but
not lose functionality.
- Bypass or higher means that all of these checks are
essentially deactivated. This is probably a very
bad idea.
Note that the default ReconnectTolerance value is still Strict.
|
|
|
|
| |
}.cpp}: add tolerancechecks parameter as an nx/nx option and ReconnectTolerance as an nxagentOption.
|
| |
|
|
|
|
|
| |
This has already been started while replacing copyright info in file
headers and has now been completed with this commit.
|
|
|
|
| |
that NoMachine placed there own copyright statement in.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove defines of NEED_EVENTS and NEED_REPLIES because they are never
used anywhere.
Basically these three commits, but as they are newer and to not match
the code structure the patches have not been applied but replaced by
sed + manual intervention:
From cb95642dc8edebb2935dd471f8b339cb98aa8481 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri, 28 Nov 2008 22:28:32 +1000
Subject: Remove #define NEED_EVENTS and NEED_REPLIES
A grep on xorg/* revealed there's no consumer of this define.
Quote Alan Coopersmith:
"The consumer was in past versions of the headers now located
in proto/x11proto - for instance, in X11R6.0's xc/include/Xproto.h,
all the event definitions were only available if NEED_EVENTS were
defined, and all the reply definitions required NEED_REPLIES.
Looks like Xproto.h dropped them by X11R6.3, which didn't have
the #ifdef's anymore, so these are truly ancient now."
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
--
From 6de368c9aa7ccd2fcd62fca5a2b278913db4d03d Mon Sep 17 00:00:00 2001
From: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu, 1 Jul 2010 06:50:47 -0300
Subject: Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
--
From 57c03e52e6b4e3ed54df5fdd778865467d08e119 Mon Sep 17 00:00:00 2001
From: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu, 1 Jul 2010 06:59:48 -0300
Subject: Purge macro NEED_EVENTS
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Casting return to (void) was used to tell lint that you intended
to ignore the return value, so it didn't warn you about it.
Casting the third argument to (char *) was used as the most generic
pointer type in the days before compilers supported C89 (void *)
(except for a couple places it's used for byte-sized pointer math).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
|
| |
Enough with the casting. Doesn't break API or even ABI, but does make
a lot of silly casts superfluos.
|
|
|
|
| |
been added to nxagent.1 man page.
|
| |
|
| |
|
|
|
|
| |
nowadays.
|
| |
|
|
|
|
|
|
| |
base folder.
Drop other LICENSE files added by NoMachine scattered all over the code tree.
|
| |
|
|
|
|
| |
One COPYING file in the project's base folder is sufficient.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
TryClientEvents already did this; this commit just moves the assignment
one level down so that no event source has to worry about sequence
numbers.
...No event source, that is, except XKB, which inexplicably calls
WriteToClient directly for several events.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This matches the test in TryClientEvents, and is a superset of tests
done by the callers of these functions. The consequence of forgetting
these tests is a server crash, so they're always desirable. In my
opinion, it's better to not require the callers to remember to do these
checks.
For callers that don't do very much work before calling WriteToClient or
WriteEventsToClient, I've removed the redundant checks.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=27497
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
INITARGS was a hardcoded define to void. Since knowing the function
signature for your extensions is kinda useful, just replace it with a
hardcoded void, but leave the define there for API compatibility.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
|
| |
to xkb.h. Explicitly initialise nTypes in xkb.c.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit a1cb69dc28fdbfbdfaf954e0bec221f759462399
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 22:05:44 2013 +0900
Xext: Clean up warnings
GC funcs and ops are const.
Remove unused variables.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|