aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
Commit message (Collapse)AuthorAgeFilesLines
* remove unused registry.hUlrich Sibiller2016-11-021-64/+0
| | | | might be reintroduced later when upgrading the server
* remove *-def.cppUlrich Sibiller2016-11-022-2123/+0
| | | | never used
* Imake: drop DoLoadableServer, MakeDllModules and IHaveModulesUlrich Sibiller2016-11-0234-1821/+2
| | | | | | We do not build loadable modules, so we do not need them anywhere. Also remove the extra files requires for module builds.
* Remove extmod from nx-X11/programs/Xserver/Xext/.Mike Gabriel2016-11-0217-365/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports (in their essence) these X.org Xserver commits: commit a7a2f9f66ddc27df96557093f3dd266e24eb653b Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Jul 10 02:03:13 2012 +0100 Remove the last remnants of extmod extmod was originally a big pointless module. Now it's an empty, pointless module. This commit makes it unexist. Signed-off-by: Daniel Stone <daniel@fooishbar.org> 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> commit 7a11b817e770cd2196814f1ac6264c6d87b76c6a Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:06 2012 +0100 Move Xv and XvMC from extmod to built-in Always build these extensions into the core server, rather than letting them languish in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit 7d859bd87834dd79c7fa3792075496ece698c082 Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:05 2012 +0100 Move XRes from extmod to built-in Always build XRes support into the core server, rather than letting it languish in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit ba21fc29587e4f11320b88a70433beb1fe22cdf3 Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:04 2012 +0100 Move DPMS from extmod to built-in Always build DPMS support into the core server, rather than letting it languish in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit 3ed2c6e11298c4299042cfe4578f6cc02e441d58 Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:03 2012 +0100 Move MIT-SCREEN-SAVER from extmod to built-in If we've built MIT-SCREEN-SAVER support, then just build it into the main binary, rather than leaving it in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Conflicts: nx-X11/programs/Xserver/Xext/extmod/Imakefile
* Imakefile cleanup: Delete all ancient Vcs comments stemming from SVN times ↵Mike Gabriel2016-10-3137-106/+0
| | | | | | of X.org and XFree86. Fixes ArcticaProject/nx-libs#250.
* Xserver/Imakefile: Drop references to already removed afb code.Mike Gabriel2016-10-301-2/+1
|
* Xserver/Imakefile: Drop all references to building already removed cfb* ↵Mike Gabriel2016-10-301-71/+3
| | | | implementations.
* Death to mfb (removing last remnants from NX code).Adam Jackson2016-10-304-874/+15
| | | | | | | | | | | | commit f31bd087e8a7f65cd588bd1d022bb18e72b2a60c Author: Adam Jackson <ajax@redhat.com> Date: Fri Jun 13 10:35:07 2008 -0400 Death to mfb. Anyone still interested in 1 or 4 bpp framebuffers, talk to fb. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Disinfect mi/ of mfb.Adam Jackson2016-10-301-2/+17
| | | | | | | | | | commit 748cfbc820f8cdeb544c54a6db495fecf2e2457b Author: Adam Jackson <ajax@aspartame.nwnk.net> Date: Sat Nov 17 21:23:05 2007 -0500 Disinfect mi/ of mfb. Backport-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* nxcompext: Drop (nowadays) no-op file NXlibint.h.Mike Gabriel2016-10-301-2/+1
| | | | Fixes ArcticaProject/nx-libs#255.
* saver.c: fix unused variable warningsUlrich Sibiller2016-10-301-7/+0
|
* remove hw/xfree86 altogetherUlrich Sibiller2016-10-294-2942/+0
| | | | This is part one of ArcticaProject/nx-libs#246
* remove xf86Version.h and xf86Date.hUlrich Sibiller2016-10-292-60/+0
| | | | version.def and date.def also will be no longer created
* sendexev.c: Fix return of unitialized variableUlrich Sibiller2016-10-201-3/+7
| | | | | Well, kinda fix. Upstream handles that differently here, we need a thorough check! Add another FIXME comment because of this.
* xfixes: Remove unused variable.Cyril Brulebois2016-10-201-2/+0
| | | | | | | | | The last use of pScreen in ProcXFixesSetPictureClipRegion was removed in aa7096ca6f108e399d9916639cf20c57f9776305 so remove it entirely. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Cyril Brulebois <kibi@debian.org> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* Remove useless line of code that contained a bug and triggered a gcc ↵Benjamin Herrenschmidt2016-10-201-2/+0
| | | | warning. This variable will be overriden before being used anyway. (Bugzilla #5595)
* dix: fix cast from pointer to integerJulien Cristau2016-10-201-1/+1
|
* dbe: Call to DDX SwapBuffers requires address of int, not unsigned int ↵Keith Packard2016-10-201-3/+4
| | | | | | | | | | | | | | | | | | [CVE-2014-8097 pt. 2] When the local types used to walk the DBE request were changed, this changed the type of the parameter passed to the DDX SwapBuffers API, but there wasn't a matching change in the API definition. At this point, with the API frozen, I just stuck a new variable in with the correct type. Because we've already bounds-checked nStuff to be smaller than UINT32_MAX / sizeof(DbeSwapInfoRec), we know it will fit in a signed int without overflow. 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* xkb.c: fix 'assignment makes integer from pointer without a cast'Ulrich Sibiller2016-10-201-1/+1
| | | | | | xkb.c: In function ‘_GetCountedString’: xkb.c:4405:8: warning: assignment makes integer from pointer without a cast [enabled by default] len= (CARD16 *)wire;
* xkmread.c: use _X_UNUSED to avoid compiler warning when result is not neededUlrich Sibiller2016-10-201-4/+7
|
* xcmisc.c: remove HAVE_STDINTUlrich Sibiller2016-10-201-4/+0
| | | | | This eliminates a warning since we do not have this define in our build environment.
* security.c: fix compiler warningsUlrich Sibiller2016-10-201-2/+1
|
* Window.c: Fix function assignment warningUlrich Sibiller2016-10-201-1/+1
| | | | | | Window.c: In function ‘nxagentFrameBufferPaintWindow’: Window.c:1968:31: warning: ISO C forbids assignment between function pointer and ‘void *’ [-Wpedantic] PaintWindowBackgroundBackup = pWin->drawable.pScreen -> PaintWindowBackground;
* Display.c: remove unused variableUlrich Sibiller2016-10-201-2/+0
| | | | | | | Display.c: In function ‘nxagentCheckForPixmapFormatsCompatibility’: Display.c:2471:8: warning: variable ‘one_match’ set but not used [-Wunused-but-set-variable] bool one_match = false; ^
* Colormap.c: add cast to avoid warningUlrich Sibiller2016-10-201-1/+1
| | | | | | | Colormap.c: In function ‘nxagentSetInstalledColormapWindows’: Colormap.c:314:27: warning: format ‘%p’ expects argument of type ‘void *’, but argument 3 has type ‘WindowPtr’ [-Wformat=] pWin, pWin -> drawable.class); ^
* Args.c: fix string format warningUlrich Sibiller2016-10-201-2/+2
| | | | warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘long int’ [-Wformat=]
* rename xf86bigfstr.h to xf86bigfproto.hUlrich Sibiller2016-10-192-2/+2
|
* nx-X11/programs/Xserver/GL/glx/Imakefile: typo fix, leading to ↵Mihai Moldovan2016-10-141-1/+1
| | | | | | glcontextmodes.c not being compiled. The typo didn't cause immediate problems.
* hw/nxagent/{Clipboard|Events}.c: Typo fix in error messages.Mike Gabriel2016-10-132-3/+3
|
* Remove CRAY supportUlrich Sibiller2016-10-101-6/+1
| | | | | This basically repeats commit bad67799229b94ea2ba0174319949766ad1c2fc6 after the upgrade to libX11 1.3.4.
* xserver: add missing xkbfile.hUlrich Sibiller2016-10-081-0/+484
| | | | | This should have been part of commit 2c31ce2 which also happens to have a wrong description... Sigh.
* xserver: adapt xkbsrc includes syntax to match upstreamUlrich Sibiller2016-10-065-5/+5
|
* os/access: fix regression in server interpreted authDave Airlie2016-10-061-1/+1
| | | | | | | | | | | | | | | | This was reported on irc on Fedora when rawhide went to 1.17.1. regression occured in: 2566835b4374edb3e5a8353d4f7c9e7ec4851c57 os: Eliminate uninitialized value warnings from access.c siAddrMatch doesn't need addr to be a useful value, it checks some things like localuser without having an address at all. Signed-off-by: Dave Airlie <airlied@redhat.com> Tested-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
* os: Eliminate uninitialized value warnings from access.cKeith Packard2016-10-061-8/+8
| | | | | | | | | | | | The ConvertAddr function doesn't reliably set the 'addr' return value, and so callers are getting flagged for using potentially uninitialized values. Initialize the value in the callers to NULL and then go ahead and check for NULL values before using them. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
* dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6]Keith Packard2016-10-061-1/+1
| | | | | | | | | | | | | | | 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)
* Fix multiple warnings in os/xdmauth.c.Eamon Walsh2016-10-061-10/+12
| | | | | v1: Eamon Walsh v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
* replace transport.c link by xstrans.cUlrich Sibiller2016-10-068-14/+39
| | | | Just like upstream does
* xserver: drop XKBSRV_NEED_FILE_FUNCSUlrich Sibiller2016-10-0617-20/+5
| | | | just as upstream did
* xserver: remove define XKB_IN_SERVERUlrich Sibiller2016-10-0615-370/+1
| | | | it is no longer needed because the code here is only used in the server.
* xserver: use own copy of XKBgeom.h headerUlrich Sibiller2016-10-0611-16/+671
| | | | just like upstream does
* xserver: use own copy of XKBrules.h headerUlrich Sibiller2016-10-064-5/+3
| | | | just like upstream does
* xserver: use own copy of XKBrules.h headerUlrich Sibiller2016-10-062-1/+200
| | | | just like upstream does
* xserver: use own copy of XKBstr.h headerUlrich Sibiller2016-10-069-8/+615
| | | | just like upstream does
* xserver: use own copy of XKBsrv.h headerUlrich Sibiller2016-10-0640-38/+1228
| | | | just like upstream does
* copy files from libX11 to xserver dirUlrich Sibiller2016-10-065-6/+3506
| | | | | | | | 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.
* randrproto: It was discovered that nx-libs shipped two different version of ↵Mike Gabriel2016-10-014-1371/+3
| | | | randr.h and randrproto.h. This commit leaves the newer file versions in the package and let's the build process use those everywhere.
* hw/nxagent/X11/include/Xrandr_nxagent.h: Reduce injected libXrandr(_nxagent) ↵Mike Gabriel2016-10-011-22/+0
| | | | header file, so that it only contains the XRRScreenChangeNotifyEvent typedef.
* Fix FTBFS with gcc 4.4Ulrich Sibiller2016-10-011-2/+0
| | | | | | | 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.
* Revert "Fix wrong include"Ulrich Sibiller2016-09-241-7/+0
| | | | | | | After commit cbf3ef0f219a7d5c94a7f5d5b46c9a0e26cc6588 this no longer necessary. This reverts commit 9a4bb50af54ced8d53112b8fa3b5b9dc3b481224.
* remove misc dirUlrich Sibiller2016-09-213-5/+117
| | | | xserver upstream has included the required files. So do we.