aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* DIX: XKB: Set xkbInfo to NULL as well as freeing itDaniel Stone2017-12-071-0/+1
| | | | | | | | | | | | | | | | | Backported from X.org: commit 512bac25ec0e980968b93a2ebe88bd89bf99b697 Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Nov 6 14:52:03 2007 +0000 DIX: XKB: Set xkbInfo to NULL as well as freeing it (bug # 10639) XkbRemoveResourceClient wants to access xkbInfo if it exists, so make sure we NULL it after freeing it. It doesn't make much sense to move the RemoveResourceClient call first, as there's not much point in notifying clients while we're shutting the server down anyway. Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* Allow options to appear with other components.Daniel Stone2017-12-071-7/+0
| | | | | | | | | | | | Backported from X.Org: commit 1cfa9f647e0241f4b9e56556b128d7bfd987eaca Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Feb 28 16:55:26 2006 +0000 Bug # 5216: Allow options to appear with other components. Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* devPrivates fixesLars Knoll2017-12-072-1/+3
| | | | | | | | | | | | | | Backported from X.Org: commit 0693083335185ce05ee64546151f3fc43ce98575 Author: Lars Knoll <lars@trolltech.com> Date: Mon Mar 6 21:00:09 2006 +0000 render/picture.c Correctly initialize devPrivates variable in source only pictures to 0 miext/cw/cw.h Don't try to access devPrivates of source only pictures Backported-from-NX-by: Ulrich Sibiller <uli42@gmx.de>
* Coverity # 337: Remove useless NULL check.Adam Jackson2017-12-071-1/+1
| | | | | | | | | | | | Backported from X.org: Commit 6bb2dc02a7cffd6ed7dd28e88d584920a4150749 Author: Adam Jackson <ajax@nwnk.net> Date: Wed Mar 15 16:01:47 2006 +0000 Coverity # 337: Remove useless NULL check. Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* Coverity # 491: Check version number correctly.Adam Jackson2017-12-071-1/+1
| | | | | | | | | | | | Backported from X.org: commit 72cc6307257fcbb800267464487bf918ee674328 Author: Adam Jackson <ajax@nwnk.net> Date: Wed Mar 15 16:32:05 2006 +0000 Coverity # 491: Check version number correctly. Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* Coverity # 487: Check version number correctly.Adam Jackson2017-12-071-1/+1
| | | | | | | | | | | | | | Backported from X.org: commit 152090ce442e94de1ae920208a92931af6493c8c Author: Adam Jackson <ajax@nwnk.net> Date: Wed Mar 15 16:33:12 2006 +0000 Coverity # 487: Check version number correctly. Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de> Fixes ArcticaProject/nx-libs#542
* Coverity # 807: Fix a memory leak in XFixesExpandRegion.Adam Jackson2017-12-071-0/+1
| | | | | | | | | | | | | | Backported from X.org: commit 5e106a71b9f8077216d41619402952b0005dd8a4 Author: Adam Jackson <ajax@nwnk.net> Date: Wed Mar 15 16:49:04 2006 +0000 Coverity # 807: Fix a memory leak in XFixesExpandRegion. Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de> Fixes ArcticaProject/nx-libs#541
* randr: free crtc->outputs on destroyGiuseppe Bilotta2017-12-071-0/+1
| | | | | | | | | | | | | | | | | Backported from X.org: commit fc7fb5bbe1c8f787e53500b9a2ca4af815f310d1 Author: Giuseppe Bilotta giuseppe.bilotta@gmail.com Date: Thu Nov 9 10:21:21 2017 +0100 randr: free crtc->outputs on destroy Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de> Fixes ArcticaProject/nx-libs#558
* randr: always realloc crtcs and outputsGiuseppe Bilotta2017-12-072-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit 16381d186e7c791031392ed8afcfd33009854e9e Author: Giuseppe Bilotta giuseppe.bilotta@gmail.com Date: Thu Nov 9 10:21:20 2017 +0100 randr: always realloc crtcs and outputs When the last crtc (resp. output) is destroyed, the rrScrPriv crtcs (resp. outputs) fields do not get cleared, which can lead to a situation where the private's numCrtcs (resp. numOutputs) field is zero, but the associated memory is still allocated. Just checking if numCrtcs (resp. numOutputs) is zero is thus not a good criteria to determine whetehr to use a realloc or a malloc. Since crtcs (resp. outputs) are NULL-initialized anyway, relying on numCrtcs (resp. numOutputs) is actually unnecessary, because reallocation of a NULL ptr is equivalent to a malloc anyway. Therefore, just use realloc() unconditionally, and ensure that the fields are properly initialized. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de> Fixes ArcticaProject/nx-libs#558
* Merge branch 'uli42-pr/improve_nxproxy_help' into 3.6.xMihai Moldovan2017-12-072-6/+51
|\ | | | | | | Attributes GH PR #578: https://github.com/ArcticaProject/nx-libs/pull/578
| * nxproxy/nxcomp: document logging optionsUlrich Sibiller2017-12-072-0/+42
| |
| * nxcomp/nxproxy: slightly improve the usage message of nxproxyUlrich Sibiller2017-12-071-6/+8
| |
| * nxcomp/nxproxy: add missing hint for keyconv optionUlrich Sibiller2017-12-071-0/+1
|/
* Merge branch 'sunweaver-pr/drop-bin-wrappers' into 3.6.xMihai Moldovan2017-12-068-95/+25
|\ | | | | | | | | | | | | Attributes GH PR #562: https://github.com/ArcticaProject/nx-libs/pull/562 Fixes: ArcticaProject/nx-libs#546 Fixes: ArcticaProject/nx-libs#547
| * Makefile: Quote '$@' in make calls with double quotes.Mike Gabriel2017-12-051-9/+9
| |
| * Makefile: Don't use DESTDIR in configure.Mike Gabriel2017-12-051-1/+1
| | | | | | | | Fixes ArcticaProject/nx-libs#547.
| * 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).
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 23:07:43 +0000