aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Drop bin wrappers for nxagent and nxproxy, directly install nxproxy and ↵Mike Gabriel2017-12-058-88/+18
| | | | | | nxagent to BINDIR. Fixes ArcticaProject/nx-libs#546.
* Merge branch 'uli42-pr/fix_global_tcpFD' into 3.6.xMike Gabriel2017-12-059-90/+84
|\ | | | | | | Attributes GH PR #579: https://github.com/ArcticaProject/nx-libs/pull/579
| * nxcomp: use lowercase abbreviations for seconds and millisecondsUlrich Sibiller2017-12-029-71/+71
| |
| * nxcomp: remove unused return valuesUlrich Sibiller2017-12-021-19/+12
| | | | | | | | Some functions' return values are never used anywhere, so drop them.
| * nxcomp: Fix setting of global tcpFDUlrich Sibiller2017-12-021-1/+2
|/ | | | | | | This corrects a flaw that stayed undetected for 2.5 years, introduced via c5a2cf82f6baf7a9e64ec2328a5bac0dfee453ef Fixes ArcticaProject/nx-libs#573
* Merge branch 'uli42-pr/nokeyconv' into 3.6.xMihai Moldovan2017-11-265-5/+72
|\ | | | | | | Attributes GH PR #556: https://github.com/ArcticaProject/nx-libs/pull/556
| * Keyboard.c: make nxagentKeycodeConversion a BooleanUlrich Sibiller2017-11-231-1/+1
| |
| * add option keyconv=(auto|on|off)Ulrich Sibiller2017-11-235-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | Adds a new option called "keyconv" to control keycode conversion. Before commit 2f2ade61a8823bad012737b2b388dcc168cccbbf keycode conversion was activated if the client was Linux and client side rules and/or model was "evdev". The only (and undocumented) way to disable that was providing a value different from "linux" for the "client" option (which had no other effect). The mentioned commit removed the dependency on Linux and so there was no way anymore to disable keycode conversion.
| * Keyboard.c: Use booleans for nxagentKeycodeConversionUlrich Sibiller2017-11-231-5/+5
|/
* nxcomp/src/Misc.cpp: Update explanation for the NX_TEMP env variable.Mike Gabriel2017-11-221-2/+1
|
* nxproxy.1 man page: Update explanation for NX_TEMP env variable.Mike Gabriel2017-11-221-2/+1
|
* Merge branch 'Ionic-bugfix/hardcode-socket-paths-in-libX11' into 3.6.xMike Gabriel2017-11-221-168/+0
|\ | | | | | | Attributes GH PR #563: https://github.com/ArcticaProject/nx-libs/pull/563
| * nx-X11/lib/include/xtrans/Xtranssock.c: drop UNIX path overrides as well.Mihai Moldovan2017-11-221-168/+0
|/ | | | | | | Was missed in GH PR #544: https://github.com/ArcticaProject/nx-libs/pull/544 Fixes: ArcticaProject/nx-libs#536
* Merge branch 'uli42-pr/simplify_free' into 3.6.xMike Gabriel2017-11-2113-185/+58
|\ | | | | | | Attributes GH PR #555: https://github.com/ArcticaProject/nx-libs/pull/555
| * Error.c: simply nxagentGetClientsPath()Ulrich Sibiller2017-11-211-31/+8
| | | | | | | | | | | | nxagentGetClientsPath() allocated and returned a string that was never used anywhere because it also fills the global variable with the same value.
| * simply free() callsUlrich Sibiller2017-11-2112-154/+50
|/ | | | free() can handle NULL so there's no need to check this ourselves
* Merge branch 'uli42-pr/options_on_reconnect' into 3.6.xMike Gabriel2017-11-203-57/+60
|\ | | | | | | Attributes GH PR #554: https://github.com/ArcticaProject/nx-libs/pull/554
| * Args.c: simplify nxagentProcessOptionsFile()Ulrich Sibiller2017-11-181-20/+16
| |
| * Args.c: Fix compile bug with DEBUG enabledUlrich Sibiller2017-11-181-1/+1
| |
| * Fix options parsing on reconnectUlrich Sibiller2017-11-183-36/+43
|/ | | | | | Commit 3f7b3001988bf921e6cd860f03a6256b1451ee3d was incomplete: the options parameter was not parsed as a string on reconnect. It was always assumed to be a filename.
* Merge branch 'uli42-small_fixes' into 3.6.xMike Gabriel2017-11-174-135/+23
|\ | | | | | | Attributes GH PR #532: https://github.com/ArcticaProject/nx-libs/pull/532
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 03:50:05 +0000