aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: Adapt install target to the new situation where we fake X11 ↵Mike Gabriel2016-10-011-1/+1
| | | | headers in .build-export. This fixes FTBFS during file installation into .deb and .rpm packages.
* Merge pull request #203 from mikedep333/issue-202Mike DePaulo2016-09-291-0/+1
|\ | | | | nx-libs.spec: Add BuildRequires: imake
| * nx-libs.spec: Add BuildRequires: imakeMike DePaulo2016-09-291-0/+1
|/ | | | Fixes ArcticaProject/nx-libs#202.
* Merge branch 'uli42-pr/improve_include_path_handling' into 3.6.xMike Gabriel2016-09-242-12/+5
|\ | | | | | | Attributes GH PR #201: https://github.com/ArcticaProject/nx-libs/pull/201
| * 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.
* Merge branch 'uli42-remove-misc' into 3.6.xMike Gabriel2016-09-2232-3552/+3
|\ | | | | | | Attributes GH PR #199: https://github.com/ArcticaProject/nx-libs/pull/199
| * 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.
* release 3.5.99.13.5.99.1Mike Gabriel2016-09-134-57/+169
|
* nxcomp/Loop.cpp: We have PrintVersionInfo(), why not use it? Use endl ↵Mike Gabriel2016-08-261-6/+9
| | | | instead of \n for EOLs when streaming application's preamble to stderr.
* nxcomp/Loop.cpp: Mention DXPC copyright holders on application (i.e. ↵Mike Gabriel2016-08-261-0/+3
| | | | nxproxy) start-up.
* nxcomp/Loop.cpp: We have GetCopyrightInfo() in Misc.cpp, so why not use it? ↵Mike Gabriel2016-08-241-2/+2
| | | | Also: point to ArcticaProject/nx-libs namespace on Github for further information.
* hw/nxagent/Init.c: Fix copy+paste flaw when re-arranging copyright ↵Mike Gabriel2016-08-241-2/+2
| | | | information as display by nxagent.
* nxcomp/Misc.cpp: Display new list of copyright holders when launching ↵Mike Gabriel2016-08-241-8/+16
| | | | nxproxy / nxagent.
* nxcomp/*.c: Update copyright headers, use new list of copyright holders like ↵Mike Gabriel2016-08-242-14/+30
| | | | for the .cpp files.
* nxcomp/Loop.cpp: Refer to Github namespace of Arctica Project as location to ↵Mike Gabriel2016-08-241-1/+1
| | | | | | search for software updates. Fixes ArcticaProject/190
* Merge branch 'uli42-fix_x2go_952' into 3.6.xMike Gabriel2016-08-241-0/+9
|\ | | | | | | | | | | Fixes X2GoBTS#952 Attributes GH PR #194: https://github.com/ArcticaProject/nx-libs/pull/194
| * 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.
* Merge branch 'Ionic-feature/reconnect-checks' into 3.6.xMike Gabriel2016-07-286-52/+373
|\ | | | | | | | | | | | | | | Attributes GH PR #183: https://github.com/ArcticaProject/nx-libs/pull/183 Together with PR #143 this fixes ArcticaProject/nx-libs#132. t merges an updated upstream into a topic branch.
| * 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-285-2/+100
|/ | | | }.cpp}: add tolerancechecks parameter as an nx/nx option and ReconnectTolerance as an nxagentOption.
* Merge branch 'uli42-3.6.x' into 3.6.xMike Gabriel2016-07-271-0/+7
|\ | | | | | | Attributes GH PR #189: https://github.com/ArcticaProject/nx-libs/pull/189
| * Fix wrong includeUlrich Sibiller2016-07-261-0/+7
|/
* release 3.5.99.03.5.99.0Mike Gabriel2016-07-062-10/+6615
|
* README.md: Add build howto for openSUSE based RPMs.Mike Gabriel2016-07-061-0/+29
|
* README.md: Status update of listed 3.6.x features.Mike Gabriel2016-07-061-14/+12
|
* make-changelog.sh: Ship simple script for updating the upstream ChangeLog ↵Mike Gabriel2016-07-061-0/+2
| | | | file from Git history.
* Merge branch 'sunweaver-pr/update-license-files' into 3.6.xMike Gabriel2016-07-061324-4695/+6391
|\ | | | | | | | | | | | | | | | | | | Attributes GH PR #182: https://github.com/ArcticaProject/nx-libs/pull/182 Reviewed by: Nicolas Arenas <narenas@qindel.com> -- Tue, 05 Jul 2016 06:15:57 -0700 Reviewed by: Mihai Moldovan <ionic@ionic.de> -- Tue, 05 Jul 2016 09:40:04 -0700 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 05 Jul 2016 13:57:05 -0700 :44:48 -0700 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 05 Jul 2016 13:57:05 -0700
| * 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-06407-3123/+6368
| | | | | | | | that NoMachine placed there own copyright statement in.
| * LICENSE files: Update copyright holders, FSF address and various other minor ↵Mike Gabriel2016-07-062-12/+23
|/ | | | things.
* nxproxy.1 man page: Another rendering flaw fixed.Mike Gabriel2016-07-061-2/+2
|
* debian/*.doc-base: Add .doc-base files for bin:packages containing ↵Mike Gabriel2016-07-063-0/+21
| | | | documentation.
* Xserver/dix/events.c: Drop unused i variable from TryClientEvents.Ulrich Sibiller2016-07-061-1/+0
|
* nxproxy.1 man page: Fix a typo + a rendering error. Detected by lintian.Mike Gabriel2016-07-061-4/+3
|
* debian/rules: Enable -fPIE / -pie hardening support for nxagent and nxproxy.Mike Gabriel2016-07-051-2/+2
|
* Merge pull request #180 from uli42/pr/remove_need_events_repliesUlrich Sibiller2016-07-05240-340/+0
|\ | | | | remove NEED_EVENTS/NEED_REPLIES
| * remove unreferenced NEED_EVENTS/NEED_REPLIESUlrich Sibiller2016-07-05240-340/+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>
* bin/nxauth: Remove deprecated wrapper script "nxauth".Mike Gabriel2016-07-051-29/+0
|