aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix broken path due to missing /Ulrich Sibiller2017-11-171-10/+10
|
* NXglxext.c: rename and relocate variableUlrich Sibiller2017-11-171-4/+3
| | | | | This change make the code more similar to upstream Xorg which helps when merging in changes from later Xorg releases.
* glxext.c/NXglxext.c: merge two functions into oneUlrich Sibiller2017-11-172-120/+9
| | | | | | | This has also been done in Xorg 7.1 This also fixes a little flaw for the swapped case: a check for glXRenderLarge was missing.
* keysym.h: fix include pathUlrich Sibiller2017-11-171-1/+1
|
* Merge branch 'uli42-pr/fix_manpage' into 3.6.xMike Gabriel2017-11-171-55/+73
|\ | | | | | | Attributes GH PR #552: https://github.com/ArcticaProject/nx-libs/pull/552
| * nxagent manpage: some minor formatting improvements and typo fixesUlrich Sibiller2017-11-171-55/+73
|/ | | | | delete trailing whitespace, break long lines, always emphasize nxagent and nxproxy, emphassize options identcially everywhere
* Merge branch 'Ionic-bugfix/hardcode-some-socket-paths' into 3.6.xMike Gabriel2017-11-041-15/+7
|\ | | | | | | Attributes GH PR #544: https://github.com/ArcticaProject/nx-libs/pull/544
| * nxcomp/src/Loop.cpp: hardcode X11 and (legacy/xfs) font UNIX paths.Mihai Moldovan2017-11-041-15/+7
|/ | | | | | | | Fixes: ArcticaProject/nx-libs#536 Allowing overrides via NX_TEMP and TEMP breaks system using pam_tmpdir.so and most server infrastructure expects the location to be fixed anyway.
* Merge branch 'Ionic-bugfix/fix-X-cookie-on-osx' into 3.6.xMike Gabriel2017-11-031-3/+23
|\ | | | | | | Attributes GH PR #543: https://github.com/ArcticaProject/nx-libs/pull/543
| * nxcomp/src/Auth.cpp: handle launchd sockets in DISPLAY variable correctly ↵Mihai Moldovan2017-11-031-3/+23
|/ | | | when fetching X cookie.
* nxproxy: use ax_pthread.m4.Mihai Moldovan2017-10-273-0/+18
| | | | | Works around libtool bug related to using both -nostdlib and -pthread (with the former dropping latter usage.)
* nxcomp/m4/ax_pthread.m4: move to top-level m4/ directory, use symlink.Mihai Moldovan2017-10-272-485/+486
|
* Regression fix for f855b3b6. Caused FTBFS with Loop.cpp:2669:0: error: ↵Mike Gabriel2017-10-271-1/+0
| | | | unterminated #ifdef (#ifdef TIME).
* Merge branch 'theqvd-improved-logging-loop' into 3.6.xMike Gabriel2017-10-271-2869/+1603
|\ | | | | | | Attibutes GH PR #302: https://github.com/ArcticaProject/nx-libs/pull/302
| * nxcomp/src/Loop.cpp: fix whitespace errors on continued lines.Mihai Moldovan2017-10-271-810/+810
| |
| * Remove leading \n in NXTrans* loggingVadim Troshchinskiy2017-10-271-3/+3
| |
| * Fix whitespace and line splitting issues reported by ionicVadim Troshchinskiy2017-10-271-10/+19
| |
| * Conversion of Loop.cpp to the new log systemVadim Troshchinskiy2017-10-271-2560/+1285
| |
* | Merge branch 'theqvd-improved-logging' into 3.6.xMike Gabriel2017-10-2721-2/+2693
|\| | | | | | | Attributes GH PR #193: https://github.com/ArcticaProject/nx-libs/pull/193
| * nxcomp: add basic logging_test utility in test subdirectory.Mihai Moldovan2017-10-276-1/+373
| | | | | | | | Needs more sophisticated features to actually test stuff correctly.
| * nxcomp/src/Log.h: prepare for logger testing application.Mihai Moldovan2017-10-271-0/+4
| | | | | | | | DO NOT USE!
| * nxcomp/src/Log.cpp: add PID to thread ID output if requested.Mihai Moldovan2017-10-271-1/+2
| | | | | | | | | | | | | | | | The default function we use (if a thread name is not specified explicitly) is pthread_self(). This function returns a number that is guaranteed to be unique for each thread within a process, but this assertion doesn't hold globally. Hence only using the thread ID is ambiguous when logging from multiple processes.
| * nxcomp/src/Log.h: block signals while writing out data.Mihai Moldovan2017-10-271-0/+20
| | | | | | | | | | Prevents race conditions caused by signal handlers while flushing out our log queue.
| * nxcomp/src/Log.{cpp,h}: port to std::stack as internal buffer structure.Mihai Moldovan2017-10-272-23/+37
| | | | | | | | | | | | | | | | This has one drawback: after flushing log data to its underlying output, a new NXLogStamp object MUST be written to the NXLog object in order to create a new entry within the stack. This can be changed if necessary. For now I'd like to keep it as-is.
| * nxcomp/{configure.ac,Log.cpp}: implement configure-time std::put_time check ↵Mihai Moldovan2017-10-272-1/+19
| | | | | | | | and use macro value in Log.cpp.
| * nxcomp/Log.h: delete stream_ member before class object destruction.Mihai Moldovan2017-10-271-0/+4
| |
| * nxcomp/Log.h: also clear the buffer after setting it to an empty string.Mihai Moldovan2017-10-271-1/+2
| |
| * Set default log level to WARNINGVadim Troshchinskiy2017-10-271-1/+1
| | | | | | | | | | This is to ensure the log output is the same as previous releases, which didn't have INFO defined by default.
| * New logging implementationVadim Troshchinskiy2017-10-274-0/+719
| | | | | | | | | | | | | | | | Features: * Works without ifdefs * Configurable with commandline arguments * Log level configurable per file * Thread safe
| * nxcomp: add AX_PTHREAD code from autoconf-archive and check for pthread support.Mihai Moldovan2017-10-273-1/+494
| |
| * nx{comp{,shad},proxy}: add configure flag --enable-cxx11 to enable and setup ↵Mihai Moldovan2017-10-2711-0/+1045
|/ | | | | | | | | | optional C++11 support. Use AX_CXX_COMPILE_STDCXX(_11) from autotools archive. Note: should only be used in tandem. Make sure that each component either uses the C++11 ABI or none uses it. Mixing and matching libraries and binaries with different C++ ABIs might lead to weird errors.
* nxcomp/configure.ac: rename --{en,dis}able-info to --{en,dis}able-debug, as ↵Mihai Moldovan2017-10-271-1/+1
| | | | originally planned.
* README.md: add short Windows section and mention that using Cygwin tools is ↵Mihai Moldovan2017-10-201-1/+10
| | | | imperative when working with the git repository.
* nx-libs.spec: pass CDEBUGFLAGS and friends directly through via make command.Mihai Moldovan2017-10-161-1/+1
|
* nx-libs.spec: handle potentially undefined variables more gracefully.Mihai Moldovan2017-10-161-3/+3
|
* nx-libs.spec: drop ugly optsflag sed hack, hopefully obsoleted by passing ↵Mihai Moldovan2017-10-161-2/+0
| | | | CDEBUGFLAGS through.
* nx-libs.spec: add -mno-vxs to general C(XX)FLAGS on ppc64le.Mihai Moldovan2017-10-161-0/+9
| | | | | | Hopefully just a temporary workaround until https://bugzilla.redhat.com/show_bug.cgi?id=1489712 / https://bugs.centos.org/view.php?id=13779 are resolved.
* Merge branch 'theqvd-media_argument_bugfix' into 3.6.xMike Gabriel2017-10-103-11/+19
|\ | | | | | | Attributes GH PR #526: https://github.com/ArcticaProject/nx-libs/pull/526
| * Fix bug #525: PANIC! No port specified for multimedia connectionsVadim Troshchinskiy2017-10-103-11/+19
|/ | | | | | | Commit 5f1eb0dc3eb89e84a3b146975e147b995fb7673f introduced a regression that made the use of the multimedia port mandatory. Fixes ArcticaProject/nx-libs#525
* Merge branch 'Ionic-add-stray-files-to-gitignore' into 3.6.xMike Gabriel2017-10-102-0/+4
|\ | | | | | | Attributes GH PR #524: https://github.com/ArcticaProject/nx-libs/pull/524
| * .gitignore: ignore vim swap files.Mihai Moldovan2017-10-101-0/+1
| |
| * **/.gitignore: add stray files.Mihai Moldovan2017-10-102-0/+3
| | | | | | | | | | | | These are already cleaned up by the top-level Makefile. Fixes: ArcticaProject/nx-libs#523
* | Merge branch 'sunweaver-pr/nxcomp-tokensize-in-vpn-tunnels' into 3.6.xMihai Moldovan2017-10-091-2/+2
|\| | | | | | | Attributes GH PR #521: https://github.com/ArcticaProject/nx-libs/pull/521
| * nxcomp/src/Loop.cpp: Reduce control->TokenSize slightly again in order to ↵Simon Matter2017-10-091-2/+2
|/ | | | fix fragmentation of packages when on VPN (or otherwise encapsulated) connections.
* .gitignore: Improve all .gitignore files, adapt to autotools build-flow and ↵Mike Gabriel2017-10-096-7/+22
| | | | its build cruft.
* nxcomp/src/Loop.cpp: whitespace fixes only.Mihai Moldovan2017-09-291-6/+6
|
* nxcomp/configure.ac: prettify AC_ARG_ENABLE() calls, use more quotes and ↵Mihai Moldovan2017-09-291-13/+13
| | | | AS_IF() where appropriate.
* nxproxy/src/Main.c: Silence compiler warning.Simon Matter2017-09-291-1/+2
| | | | Fixes ArcticaProject/nx-libs#506.
* Merge pull request #519 from theqvd/fix_nxagent_arg_parsingVadim Troshchinskiy2017-09-292-57/+51
|\ | | | | | | | | | | | | | | Fix nxagent argument parsing logic This makes it so that slave=1 and media=1 work again as they should. The changes introduced earlier resulted in the unintentional requirement to specify the actual port number, breaking backwards compatibility.
| * Fix nxagent argument parsing logicVadim Troshchinskiy2017-09-292-57/+51
|/ | | | | | | | | This makes it so that slave=1 works again as it should. The changes introduced earlier resulted in the unintentional requirement to specify the actual port number, breaking backwards compatibility. Fixes: ArcticaProject/nx-libs#518