aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
Commit message (Collapse)AuthorAgeFilesLines
* fix wrong include in XlibInt.cUlrich Sibiller2016-10-091-1/+1
|
* 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.
* Add XF86TouchpadOn and XF86TouchpadOff to keysymdbPeter Hutterer2016-10-011-0/+2
| | | | | | | This patch isn't necessary in Xlib 1.4 and later since the keysymdb has been made redunant. While we're on 1.3.x, we need it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* lib/X11/XKeysymDB: Update to last version found in X.org (between 1.3.5 and ↵Mike Gabriel2016-10-011-2/+28
| | | | 1.3.6).
* Imake.tmpl: Use gccmakedep instead of makedepend.Mike Gabriel2016-10-011-1/+1
| | | | This fixes ArcticaProject/nx-libs#206.
* include/extensions/damageproto.h: Use nx-X11's xfixesproto.h and ↵Mike Gabriel2016-10-011-2/+2
| | | | damagewire.h instead of X.org's.
* randrproto: It was discovered that nx-libs shipped two different version of ↵Mike Gabriel2016-10-016-1491/+1208
| | | | randr.h and randrproto.h. This commit leaves the newer file versions in the package and let's the build process use those everywhere.
* nx-X11: Enable -Wpedantic as default CFLAG. This is to detect redefined ↵Mike Gabriel2016-10-013-4/+4
| | | | typedefs when building nxagent.
* 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.
* whitespace cleanupUlrich Sibiller2016-09-241-7/+1
|
* ensure that <X11/..> headers references use nx-X11 files if existingUlrich Sibiller2016-09-241-0/+6
| | | | | | | | | | System headers including other headers via <X11/..> now use the nx-X11 variant (if existing). With this patch in place we should think about dropping the <nx-X11/..> namespace now for includes. Fixes ArcticaProject/nx-libs#200.
* remove misc dirUlrich Sibiller2016-09-213-5/+0
| | | | xserver upstream has included the required files. So do we.
* move xkblib to xserverUlrich Sibiller2016-09-2129-3547/+3
| | | | | Upstream does not use xkbfile but has own copies of the required files. It was not used elsewhere.
* hw/nxagent/Init.c: Fix copy+paste flaw when re-arranging copyright ↵Mike Gabriel2016-08-241-2/+2
| | | | information as display by nxagent.
* Fix pasting the clipboard directly after session start.Ulrich Sibiller2016-08-241-0/+9
|
* nxagent.1 man page: Some layout fixes for string options with well-defined ↵Mike Gabriel2016-07-281-0/+5
| | | | expected selections of values.
* hw/nxagent/Display.c: Fix comment where the meaning of the "bypass" ↵Mike Gabriel2016-07-281-3/+2
| | | | reconnectchecks parameter value is explained.
* nxagent.1 man page: Add explanation about the new reconnectchecks nx/nx option.Mike Gabriel2016-07-281-0/+26
|
* hw/nxagent/Args.c: Follow-up fix for PR #183: expect reconnectchecks=bypass ↵Mike Gabriel2016-07-281-1/+1
| | | | instead of =none.
* nx-X11/programs/Xserver/hw/nxagent/Display.c: add FIXME comment to ↵Mihai Moldovan2016-07-281-0/+1
| | | | | | nxagentCheckForColormapsCompatibility(). Maybe needs special strictness handling as well.
* nx-X11/programs/Xserver/hw/nxagent/Display.c: add FIXME comment to ↵Mihai Moldovan2016-07-281-0/+1
| | | | | | nxagentInitAndCheckVisuals(). Maybe needs special strictness handling as well.
* nx-X11/programs/Xserver/hw/nxagent/Display.c: split up ↵Mihai Moldovan2016-07-281-5/+9
| | | | | | | | | | | | | | | 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.)
* nx-X11/programs/Xserver/hw/nxagent/Display.c: use new ReconnectTolerance ↵Mihai Moldovan2016-07-281-23/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* nx-X11/programs/Xserver/hw/nxagent/Display.c: use new ReconnectTolerance ↵Mihai Moldovan2016-07-281-24/+118
| | | | | | | | | | | | | | | | | | | | | | 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.
* nx-X11/programs/Xserver/hw/nxagent/Display.c: use new ReconnectTolerance ↵Mihai Moldovan2016-07-281-1/+42
| | | | | | | | | | | | | | | | | | | 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.
* {nx-X11/programs/Xserver/hw/nxagent/{Args.c,Options.{c,h}},nxcomp/{Loop,Misc ↵Mihai Moldovan2016-07-283-0/+95
| | | | }.cpp}: add tolerancechecks parameter as an nx/nx option and ReconnectTolerance as an nxagentOption.
* Fix wrong includeUlrich Sibiller2016-07-261-0/+7
|
* VCS info lines: Remove ancient X.org / XFree86 VCS info line from code files.Mike Gabriel2016-07-06926-1560/+0
| | | | | This has already been started while replacing copyright info in file headers and has now been completed with this commit.
* Per-file copyright notices: Update copyright information in file headers ↵Mike Gabriel2016-07-06132-1181/+2173
| | | | that NoMachine placed there own copyright statement in.
* Xserver/dix/events.c: Drop unused i variable from TryClientEvents.Ulrich Sibiller2016-07-061-1/+0
|
* remove unreferenced NEED_EVENTS/NEED_REPLIESUlrich Sibiller2016-07-05239-338/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Remove unneccesary casts from WriteToClient callsAlan Coopersmith2016-07-0571-317/+317
| | | | | | | | | | | | | | 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>
* Make WriteToClient take a const void * like any decent IO write function.Kristian Høgsberg2016-07-053-6/+8
| | | | | Enough with the casting. Doesn't break API or even ABI, but does make a lot of silly casts superfluos.
* Xserver.man: Drop original and old Xserver man page. Relevant parts have now ↵Mike Gabriel2016-07-052-792/+0
| | | | been added to nxagent.1 man page.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 17:23:43 +0000