aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * NXglyph.c: adapt FindGlyph() to better match render/glyph.cUlrich Sibiller2019-11-021-19/+24
| | | | | | | | no function change
| * NXglyphcurs.c: use dixChangeCG()Ulrich Sibiller2019-11-021-18/+13
|/
* Merge branch 'uli42-pr/simplify_nxxvdisp' into 3.6.xMike Gabriel2019-11-023-148/+15
|\ | | | | | | Attributes GH PR #864: https://github.com/ArcticaProject/nx-libs/pull/864
| * Simplify (NX)xvdisp.cUlrich Sibiller2019-11-023-148/+15
|/ | | | | | | | | | NXxvdisp.c only exists to set/unset nxagentXvTrap before/after dispatch. There's no need to duplicate the original code. We now rename the original dispatch functions and call them in our dispatch code. Also drop check for sun and cygwin, as they never appeared in xorg upstream code.
* Merge branch 'uli42-pr/simplify_nxdispatch' into 3.6.xMike Gabriel2019-11-022-148/+73
|\ | | | | | | Attributes GH PR #863: https://github.com/ArcticaProject/nx-libs/pull/863
| * NXdispatch.c: mark NX changesUlrich Sibiller2019-11-021-17/+47
| |
| * NXdispatch.c: simplify InitClientPrivates()Ulrich Sibiller2019-11-022-35/+13
| | | | | | | | by calling the upstream function from dix/dispatch.c
| * NXdispatch.c: call upstream CloseDownClient()Ulrich Sibiller2019-11-022-87/+6
| | | | | | | | remove ~80 duplicate lines
| * NXdispatch.c: Simplify InitSelections()Ulrich Sibiller2019-11-022-9/+7
|/ | | | by calling upstream version from dispatch.c
* Merge branch 'uli42-pr/simplify_nxextension' into 3.6.xMike Gabriel2019-11-025-189/+2
|\ | | | | | | Attributes GH PR #861: https://github.com/ArcticaProject/nx-libs/pull/861
| * nxagent: drop NXextension.cUlrich Sibiller2019-11-024-33/+2
| | | | | | | | | | instead of including it and creating NXextension.o we can simply use the dix version. There are no NX specials anymore.
| * NXextension.c: use ProcListExtensions() from dixUlrich Sibiller2019-11-022-116/+0
| |
| * NXextension.c: use ProcQueryExtension() from dixUlrich Sibiller2019-11-022-41/+1
|/
* Merge branch 'uli42-pr/simplify_nxshm' into 3.6.xMike Gabriel2019-11-022-145/+35
|\ | | | | | | Attributes GH PR #859: https://github.com/ArcticaProject/nx-libs/pull/859
| * NXshm.c: call upstream miShmPutImageUlrich Sibiller2019-11-022-38/+6
| | | | | | | | instead of having an identical copy in nxagent_miShmPutImage
| * NXshm.c: use upstream versions of Dispatch functionsUlrich Sibiller2019-11-022-92/+14
| | | | | | | | instead of having an own (identical) copy
| * NXshm.c: rework code to be identical for ProcShmDispatch and SProcShmDispatchUlrich Sibiller2019-11-021-60/+60
|/
* Merge branch 'uli42-pr/drop_holders' into 3.6.xMike Gabriel2019-11-0210-345/+12
|\ | | | | | | Attributes GH PR #856: https://github.com/ArcticaProject/nx-libs/pull/856
| * nxagent: drop Holder.[ch]Ulrich Sibiller2019-11-028-120/+12
| | | | | | | | The only left code was nxagentCheckum() which was not compiling anyway.
| * Drop unused placeholder codeUlrich Sibiller2019-11-025-225/+0
|/
* Merge branch 'uli42-pr/fix_broken_damage' into 3.6.xMike Gabriel2019-11-015-282/+19
|\ | | | | | | Attributes GH PR #870: https://github.com/ArcticaProject/nx-libs/pull/870
| * Drop NXdamage.cUlrich Sibiller2019-11-014-64/+0
| | | | | | | | With the previous commits this file finally becomes obsolete.