aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Application icon: Drop NoMachine logo as nxagent icon, switch to X11 icon ↵Mike Gabriel2018-08-243-49/+427
| | | | for now.
* nxmissing.xpm: Add XPM marker so that image viewers recognize the image file ↵Mike Gabriel2018-08-241-0/+1
| | | | format.
* Merge branch 'uli42-pr/decode_options' into 3.6.xMike Gabriel2018-08-242-14/+54
|\ | | | | | | Attributes GH PR #725: https://github.com/ArcticaProject/nx-libs/pull/725
| * Args.c: allow options to contain URL encoded charactersUlrich Sibiller2018-08-242-0/+40
| | | | | | | | | | | | Same as in nxcomp's option handling. We really only need it for "," (%2C) and "=" (%3D), currently, but it can handle all encoded characters.
| * Args.c: rename nxagentParseOptions to nxagentParseSingleOptionUlrich Sibiller2018-08-241-14/+14
|/ | | | new name is more descriptive
* Merge branch 'uli42-pr/drop_double_min_max' into 3.6.xMike Gabriel2018-08-245-20/+14
|\ | | | | | | Attributes GH PR #724: https://github.com/ArcticaProject/nx-libs/pull/724
| * Replace MIN/MAX macros by min/max from misc.hUlrich Sibiller2018-08-235-20/+14
|/ | | | We do not need two versions in the code
* Merge branch 'uli42-pr/fix_wm_props' into 3.6.xMike Gabriel2018-08-221-13/+20
|\ | | | | | | Attributes GH PR #721: https://github.com/ArcticaProject/nx-libs/pull/721
| * Fix broken 9a7c0b081fad98bfcfcceff9557781f4b39ec572Ulrich Sibiller2018-08-221-13/+20
|/ | | | | | | | | Windowsize was wrong when run with nxagent :<someDisplay>. Basically three changes: - reference sizeHints and wmHints correctly (no &) - do not use uninitialized wmHints - set wmHints Xutf8SetWMProperties() call instead of separate call
* Merge branch 'uli42-pr/fix_events_debug_warnings' into 3.6.xMike Gabriel2018-08-221-16/+10
|\ | | | | | | Attributes GH PR #675: https://github.com/ArcticaProject/nx-libs/pull/675
| * Events.c: drop variable that caused compilation warningUlrich Sibiller2018-08-221-8/+2
| | | | | | | | | | | | | | Fixes this message when compiling with TEST: Events.c:2725:22: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] message_data = validateString(NameForAtom(x.u.clientMessage.u.l.longs0));
| * Events.c: fix wrong printf format specifiersUlrich Sibiller2018-08-221-4/+4
| |
| * Events.c: fix compiler warningsUlrich Sibiller2018-08-221-3/+3
| | | | | | | | format ‘%p’ expects argument of type ‘void *’
| * Events.c: mitigate compiler warningUlrich Sibiller2018-08-221-1/+1
|/ | | | "ISO C forbids assignment between function pointer and 'void *' [-pedantic]"
* Merge branch 'uli42-pr/refactor_defaulteventmask' into 3.6.xMike Gabriel2018-08-224-41/+19
|\ | | | | | | Attributes GH PR #692: https://github.com/ArcticaProject/nx-libs/pull/692
| * refactor nxagentGet(Default)EventMaskUlrich Sibiller2018-08-224-41/+19
|/ | | | Fixes ArcticaProject/nx-libs#691.
* Merge branch 'uli42-pr/track_versions' into 3.6.xMike Gabriel2018-08-221-0/+22
|\ | | | | | | Attributes GH PR #718: https://github.com/ArcticaProject/nx-libs/pull/718
| * add list with versions of the xserver modulesUlrich Sibiller2018-08-221-0/+22
|/
* Merge branch 'Etersoft-fix-nxagent-window-title-encoding' into 3.6.xMike Gabriel2018-08-221-9/+8
|\ | | | | | | Attributes GH PR #705: https://github.com/ArcticaProject/nx-libs/pull/705
| * nxagent: Used 'Xutf8SetVMPropertis' instead of 'XSetStandardProperties' + ↵Pavel Vaynerman2018-08-221-13/+6
| | | | | | | | 'Xutf8SetWMProperties'
| * fix window title encoding (use utf8) for nxagentPavel Vaynerman2018-08-221-2/+8
|/
* Use min() [defined in include/misc.h] instead of MIN() [not defined in any ↵Alan Coopersmith2018-08-211-3/+3
| | | | | | | | | | | | | | | Xorg header]. Backport from X.org: commit 724dbc2f8bbe2f21bf16f20ca7b8bb555516626c Author: Alan Coopersmith <Alan.Coopersmith@sun.com> Date: Tue May 2 01:30:37 2006 +0000 Use min() [defined in include/misc.h] instead of MIN() [not defined in any Xorg header]. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* [PATCH] os: XDMCP options like -query etc. should imply -listen tcpMihai Moldovan2018-07-181-0/+17
| | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit 491cf02e191e70c5ce24c19da880bb79bebfc03c Author: Jon TURNEY <jon.turney@dronecode.org.uk> Date: Tue Feb 10 2015 14:37:26 +0000 [PATCH] os: XDMCP options like -query etc. should imply -listen tcp In X server 1.17, the default configuration is now -nolisten tcp. In this configuration, XDMCP options don't work usefully, as the X server is not listening on the port for the display that it tells the display manager to connect to. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de
* misc: fix more regressions and whitespace weirdness introduced in ↵Mihai Moldovan2018-07-0710-18/+53
| | | | 913fcf1a74426725f14380dd5b34286a21c37ab7.
* nx-X11/lib/include/xtrans/Xtrans.c: Regression fix for 913fcf1a.Mike Gabriel2018-07-031-1/+0
| | | | | Remove one over-zealous free() call. Thanks to Ulrich Sibiller for spotting this.
* XKB.h: Use the correct value for XkbAllAccessXEventsMaskUlrich Sibiller2018-07-031-1/+1
| | | | | | | | | | | | | | | | | Fixes ArcticaProject/nx-libs#704 Backport from kbproto: commit 2306fcd4c511d41ae4b31b9cbd9f79cf69287730 Author: Dirk Wallenstein <halsmit@t-online.de> Date: Fri Feb 5 20:42:43 2010 +0100 Use the correct value for XkbAllAccessXEventsMask Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* Merge branch 'mjtrangoni-WIP-add-cppcheck' into 3.6.xMike Gabriel2018-07-0314-44/+118
|\ | | | | | | Attributes GH PR #678: https://github.com/ArcticaProject/nx-libs/pull/678
| * travis.yml: refactor some config options, add gcc-8 and clang-6.0.Mario Trangoni2018-07-031-22/+53
| |
| * Fix some memory leaks.Mario Trangoni2018-07-0312-30/+44
| |
| * travis.yml: Add cppcheck - A tool for static C/C++ code analysis.Mario Trangoni2018-07-032-2/+31
|/
* Merge branch 'uli42-pr/fix_xfont2' into 3.6.xMike Gabriel2018-07-031-4/+5
|\ | | | | | | Attributes GH PR #709: https://github.com/ArcticaProject/nx-libs/pull/709
| * Makefile: pass down Xfont2 define for ImakeUlrich Sibiller2018-07-031-4/+5
|/ | | | Fixes: ArcticaProject/nx-libs#708
* Merge branch 'uli42-gh-sunweaver/pr/xserver-xkb-cleanup' into 3.6.xMike Gabriel2018-07-0327-2599/+207
|\ | | | | | | Attributes GH PR #706: https://github.com/ArcticaProject/nx-libs/pull/706
| * debian/nxagent.*: Drop conffile /etc/nxagent/nxagent.keyboard. Not shipped ↵Mike Gabriel2018-07-034-1/+9
| | | | | | | | upstream anymore.
| * nx-libs.spec: Drop reference to obsolete nxagent.keyboard file.Mike Gabriel2018-07-031-1/+0
| |
| * etc/nxagent.keyboard: Drop file. Not required anymore.Mike Gabriel2018-07-032-2/+0
| |
| * Xserver/xkb: Remove XkbCF DDX configuration code.Mike Gabriel2018-07-032-1343/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1ef60ce8ebb681b3cfb5e515be5c187c0442dcda Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Mar 25 22:35:48 2006 +0000 Really remove all DDX pre-config code. commit ec10f70b2114e5369a5b2f34b084dcf55634dcb4 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Mar 25 21:52:49 2006 +0000 Remove XkbCF DDX configuration code. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Removal of dead code in Xserver/xkb. Follow-up commit for 3739a9b.Mike Gabriel2018-07-0317-1079/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spotted in and backported from X.org: commit 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d Author: Adam Jackson <ajax@benzedrine.nwnk.net> Date: Sun Mar 18 16:31:19 2007 -0400 Static markup and dead code cull over xkb/. The former <X11/extensions/XKBsrv.h> has been pulled into the server now as include/xkbsrv.h, and the world updated to look for it in the new place, since it made no sense to define server API in an extension header. Any further work along this line will need to do similar things with XKBgeom.h and friends. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Xserver/xkb: Remove -xkbmap argument.Daniel Stone2018-07-033-76/+0
| | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit fd8bde8bb0f9d796b3464973b53285c0a6d22a31 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon May 29 11:14:03 2006 +0000 Remove -xkbmap argument. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * hw/nxagent/Keyboard.c: Drop support for loading XKB config from file.Mike Gabriel2018-07-031-97/+7
|/ | | | | | * Support for XkbCF has been dropped in XKB extension by X.org * Has never been used in recent NXv3 implementations (e.g. X2Go) * Config file parsing is error prone, use setxkbmap API instead
* Merge branch 'uli42-pr/more_debug' into 3.6.xMike Gabriel2018-07-031-0/+29
|\ | | | | | | Attributes GH PR #707: https://github.com/ArcticaProject/nx-libs/pull/707
| * Atoms.c: more debugging outputUlrich Sibiller2018-07-031-0/+29
|/
* Merge branch 'uli42-pr/misc' into 3.6.xMike Gabriel2018-07-036-72/+64
|\ | | | | | | Attributes GH PR #712: https://github.com/ArcticaProject/nx-libs/pull/712
| * dixfonts.c: use calloc for LFclosurePtrMike Gabriel2018-07-031-1/+1
| | | | | | | | ... to keep dix/dixfonts and hw/nxagnet/NXdixfonts.c in sync.
| * dix/dixfonts.c: free() can handle NULLMike Gabriel2018-07-031-8/+6
| | | | | | | | so let's remove some superflous tests
| * NXdixfonts.c: free() can handle NULLUlrich Sibiller2018-07-031-13/+10
| | | | | | | | so let's remove some superflous tests
| * NXdixfonts.c: use calloc for LFclosurePtrUlrich Sibiller2018-07-031-1/+1
| | | | | | | | Just to be sure. It is used at lots of locations afterwards.
| * xkb/xkb.c: init all reply structsUlrich Sibiller2018-07-031-26/+19
| | | | | | | | | | | | and do it identically everywhere. As we are using C99 designated initializers here we remove the memset and bzero calls that had been used for this at some locations.
| * os/io.c: fix unitialised bytesUlrich Sibiller2018-07-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by implementing some kind of recalloc (mix of realloc and calloc). Fixes this valgrind finding: ==7061== Syscall param writev(vector[...]) points to uninitialised byte(s) ==7061== at 0x781EFE0: __writev_nocancel (syscall-template.S:84) ==7061== by 0x488974: _XSERVTransSocketWritev (Xtranssock.c:2914) ==7061== by 0x47DBD3: FlushClient (io.c:1080) ==7061== by 0x47DBD3: FlushAllOutput.part.0 (io.c:817) ==7061== by 0x477304: WaitForSomething (WaitFor.c:246) ==7061== by 0x434369: Dispatch (NXdispatch.c:360) ==7061== by 0x40EB92: main (main.c:353) ==7061== Address 0x102106f3 is 50,211 bytes inside a block of size 54,308 alloc'd ==7061== at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==7061== by 0x47F08F: FlushClient (io.c:1123) ==7061== by 0x47F307: WriteToClient (io.c:991) ==7061== by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660) ==7061== by 0x42B7D6: ListFonts (NXdixfonts.c:735) ==7061== by 0x433A6D: ProcListFonts (NXdispatch.c:989) ==7061== by 0x4344A5: Dispatch (NXdispatch.c:482) ==7061== by 0x40EB92: main (main.c:353) ==7061== Uninitialised value was created by a heap allocation ==7061== at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==7061== by 0x47F08F: FlushClient (io.c:1123) ==7061== by 0x47F307: WriteToClient (io.c:991) ==7061== by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660) ==7061== by 0x42B7D6: ListFonts (NXdixfonts.c:735) ==7061== by 0x433A6D: ProcListFonts (NXdispatch.c:989) ==7061== by 0x4344A5: Dispatch (NXdispatch.c:482) ==7061== by 0x40EB92: main (main.c:353) ==7061==
| * ProcGetPointerMapping uses rep.nElts before it is initializedUlrich Sibiller2018-07-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of this xorg upstream commit (with omitting the mentioned d792ac125a0462a04a930af543cbc732f8cdab7d). commit 34cf559bcf99dad550527b5ff53f247f0e8e73ee Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 10 15:58:48 2012 -0700 ProcGetPointerMapping uses rep.nElts before it is initialized In: commit d792ac125a0462a04a930af543cbc732f8cdab7d Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Mon Jul 9 19:12:43 2012 -0700 Use C99 designated initializers in dix Replies the initializer for the .length element of the xGetPointerMappingReply structure uses the value of rep.nElts, but that won't be set until after this initializer runs, so we get garbage in the length element and clients using it will generally wedge. Easy to verify: $ xmodmap -pp Fixed by creating a local nElts variable and using that. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 21:43:00 +0000