aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Display.c: drop icon file supportUlrich Sibiller2020-01-053-154/+17
| | | | | | | | | | | | | | | | | | | The normal case was to use the builtin icons. There were two cases where the icon file was read from disk: 1) /usr/NX/share/images/nxagent.xpm was existing which normally is not there 2) case 2 was not true and nxagent.xpm was existing somewhere in the PATH (!) (replace nxagent.xpm by x2goagent.xpm if in x2gp mode) Scanning the path from the PATH variable for xpm files is kind of unexpected and dangerous, too (think of automounter triggers or invalid xpm files). Also remove the xpm files from the distribution.
* Merge branch 'uli42-pr/fix_startup_slowness' into 3.6.xMike Gabriel2020-01-052-387/+152
|\ | | | | | | Attributes GH PR #889: https://github.com/ArcticaProject/nx-libs/pull/889
| * nxagent.xpm: reduce colours from 242 to 8Ulrich Sibiller2020-01-051-371/+137
| | | | | | | | | | | | | | | | | | This leads to a tremendous startup speedup (several seconds, depending on latency) because libXpm had to do a lot of X requests (have not further examined which). With this colour-reduced version things are quick again for those connections without losing a lot of quality. Fixes ArcticaProject/nx-libs#824
| * x2goagent.xpm: move copyright to the end to make it a valid xpm fileUlrich Sibiller2020-01-051-16/+15
|/ | | | gimp refused to load it, nxagent crashed if this was loaded as icon file!
* Merge branch 'uli42-pr/manpages_updates' into 3.6.xMike Gabriel2019-11-241-28/+57
|\ | | | | | | Attributes GH PR #878: https://github.com/ArcticaProject/nx-libs/pull/878
| * nxagent manpage: improve descriptions and typesUlrich Sibiller2019-11-241-25/+42
| | | | | | | | | | Most <int> options are <bool>. Change that and add missing defaults. Also add list of descriptions for the defer option.
| * nxagent manpage: extend clipboard documentationUlrich Sibiller2019-11-241-3/+15
|/
* Merge branch 'uli42-pr/silence_mesa' into 3.6.xMike Gabriel2019-11-232-0/+106
|\ | | | | | | Attributes GH PR #876: https://github.com/ArcticaProject/nx-libs/pull/876
| * Mesa: silence "maybe uninitialized" warningsUlrich Sibiller2019-11-182-0/+106
|/
* Merge branch 'uli42-pr/utf8_clipboard' into 3.6.xMike Gabriel2019-11-151-10/+15
|\ | | | | | | Attributes GH PR #875: https://github.com/ArcticaProject/nx-libs/pull/875
| * Clipboard.c: report more supported targetsUlrich Sibiller2019-11-151-3/+2
| | | | | | | | | | fix one FIXME. This is a rewritten and extended version of a quick patch by Danil Pleshakov and Dimbor.
| * Clipboard: fix debugging outputUlrich Sibiller2019-11-151-4/+10
| | | | | | | | Correctly determine the Atom names from the real X server.
| * Clipboard.c: automatically calc the array sizeUlrich Sibiller2019-11-151-2/+2
| |
| * Clipboard.c: improve XChangeProperty codeUlrich Sibiller2019-11-151-2/+2
|/ | | | | | | | | | The previously used "Atom" type was confusing. Clarify this by writing the code as requested in the manpage of XChangeProperty: "If the specified format is 8, the property data must be a char array. If the specified format is 16, the property data must be a short array. If the specified format is 32, the property data must be a long array."
* Merge branch 'uli42-pr/cleanup_rootless' into 3.6.xMike Gabriel2019-11-151-214/+171
|\ | | | | | | Attributes GH PR #860: https://github.com/ArcticaProject/nx-libs/pull/860
| * Rootless.c: rewrite loop to allow for scope improvementsUlrich Sibiller2019-11-151-17/+10
| | | | | | | | | | make i a local loop variable everywhere by changing the while loop to a for loop.
| * Rootless.c: fix linefeeds when printing listsUlrich Sibiller2019-11-151-5/+5
| |
| * Rootless.c: silence compiler warning about wrong parmeter sizesUlrich Sibiller2019-11-151-5/+3
| |
| * Rootless.c: disable unused functionUlrich Sibiller2019-11-151-0/+2
| |
| * Rootless.c: silence compiler warnings about wrong fromat specifiersUlrich Sibiller2019-11-151-15/+15
| |
| * Rootless.c: Fatal error if malloc failsUlrich Sibiller2019-11-151-1/+5
| |
| * Rootless.c: cleanup function prototypesUlrich Sibiller2019-11-151-10/+8
| |
| * Rootless.c: reformat commentsUlrich Sibiller2019-11-151-34/+26
| |
| * Rootless.c: scope improvementsUlrich Sibiller2019-11-151-58/+38
| |
| * Rootless.c: use __func__ instead of hardcoded function nameUlrich Sibiller2019-11-151-78/+74
| |
| * Rootless.c: use designated initializersUlrich Sibiller2019-11-151-15/+9
|/ | | | This fixes a possible unitialized struct variable.
* Merge branch 'uli42-pr/simplify_pixmap' into 3.6.xMike Gabriel2019-11-151-274/+143
|\ | | | | | | Attributes GH PR #867: https://github.com/ArcticaProject/nx-libs/pull/867
| * Pixmap.c: reformat commentsUlrich Sibiller2019-11-151-56/+44
| | | | | | | | plus some minor formatting fixes
| * Pixmap.c: scope improvementsUlrich Sibiller2019-11-151-125/+86
| |
| * Pixmap.c: drop code that does not make senseUlrich Sibiller2019-11-151-10/+2
| | | | | | | | | | | | This check has already been done before we reach here. Also add some comments about a condition that will never occur...
| * Pixmap.c: call miModifyPixmapHeader twice instead of duplicating codeUlrich Sibiller2019-11-151-83/+11
|/
* Merge branch 'uli42-pr/args_fixes' into 3.6.xMike Gabriel2019-11-151-400/+140
|\ | | | | | | Attributes GH PR #857: https://github.com/ArcticaProject/nx-libs/pull/857
| * Args.c: reformat switch blocksUlrich Sibiller2019-11-151-135/+22
| | | | | | | | This makes them much more readable
| * Args.c: Unify formattingUlrich Sibiller2019-11-151-188/+91
| |
| * Args.c: do not print function name in errors or warningsUlrich Sibiller2019-11-151-6/+6
| |
| * Args.c: scope improvementsUlrich Sibiller2019-11-151-29/+16
| |
| * Args.c: simplify options string allocationUlrich Sibiller2019-11-151-18/+4
| |
| * Args.c: fix clipboard=0 or -clipboard 0Ulrich Sibiller2019-11-151-1/+1
| | | | | | | | This should disable clipboard but effictively did activate clipboard=both.
| * Args.c: remove unreachable codeUlrich Sibiller2019-11-151-24/+0
| | | | | | | | | | | | Right at the beginnigng of nxagentParseSingleOption we check for "clipboard" and prepare argv and argc accordingly for ddxProcessArgument. The removed code thus could never be reached.
| * Args.c: fix unitialized variableUlrich Sibiller2019-11-151-0/+1
|/ | | | | | | "clipboard=something" does not need to be passed on, so return after setting nxagentOptions accordingly. This fixes [nx-X11/programs/Xserver/hw/nxagent/Args.c:1584]: (error) Uninitialized variable: argc
* Merge branch 'uli42-pr/simplify_glxext' into 3.6.xMike Gabriel2019-11-022-56/+5
|\ | | | | | | Attributes GH PR #868: https://github.com/ArcticaProject/nx-libs/pull/868
| * NXglxext.c: use upstream versions of Dispatch functionsUlrich Sibiller2019-11-022-56/+5
|/ | | | | | | | | instead of a full copy. We still have our own function because we need to handle the nxagentGlxTrap. This trap is now set before the start of the dispatcher while it has been set only directly before calling the dispatched function. Saves ~50 duplicated lines.
* Merge branch 'uli42-pr/simplify_nxwindow' into 3.6.xMike Gabriel2019-11-023-172/+34
|\ | | | | | | Attributes GH PR #866: https://github.com/ArcticaProject/nx-libs/pull/866
| * NXwindow.c: use upstream function DeleteWindow()Ulrich Sibiller2019-11-022-52/+0
| | | | | | | | | | | | | | DeleteWindow() is calling FreeWindowResources() which is calling DisposeWindowOptional() which sets pWin->optional to NULL. So the now removed code was never called. After removal DeleteWindow() is identical to the dix version, so we use that one.
| * NXwindow.c: call InitRootWindow from dixUlrich Sibiller2019-11-023-49/+18
| |
| * NXwindow.c: mark NX changesUlrich Sibiller2019-11-021-0/+16
| | | | | | | | many functions are almost identical to dix. Mark the minimal changes.
| * NXwindow.c: drop own UnmapWindow()Ulrich Sibiller2019-11-022-18/+0
| | | | | | | | | | The only difference to the dix version was a fprintf if compiled with -D TEST.
| * NXwindow.c: call upstream version UnmapWindow()Ulrich Sibiller2019-11-022-58/+5
|/
* Merge branch 'uli42-pr/simplify_nxglyph' into 3.6.xMike Gabriel2019-11-022-38/+45
|\ | | | | | | Attributes GH PR #865: https://github.com/ArcticaProject/nx-libs/pull/865
| * NXglyph.c: mark NX changesUlrich Sibiller2019-11-021-1/+8
| |