Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Re-enable XC-MISC extension | Ulrich Sibiller | 2018-01-08 | 1 | -2/+2 |
| | | | | | | Got dropped by accident in 9bc6ff269aa8bf4c41696ebf4a686c93729ba151 Fixes ArcticaProject/nx-libs#589 | ||||
* | Display.c: drop helper variable in loop | Ulrich Sibiller | 2018-01-07 | 1 | -4/+2 |
| | |||||
* | Error.c: replace malloc+strcpy by strdup | Ulrich Sibiller | 2018-01-07 | 1 | -5/+3 |
| | |||||
* | Events.c: add FIXME | Ulrich Sibiller | 2018-01-07 | 1 | -0/+1 |
| | |||||
* | Keyboard.c: rework string allocation/building | Ulrich Sibiller | 2018-01-07 | 1 | -14/+10 |
| | |||||
* | Keystroke.c: replace calloc + 2 * strcpy by asprintf | Ulrich Sibiller | 2018-01-07 | 1 | -3/+1 |
| | |||||
* | Font.c: replace malloc + strcpy by strdup + fix memleak | Ulrich Sibiller | 2018-01-07 | 1 | -2/+3 |
| | |||||
* | Font.c: free possibly allocated mem | Ulrich Sibiller | 2018-01-07 | 1 | -0/+5 |
| | | | | even if we issue a FatalError afterwards | ||||
* | Font.c: replace memcpy by sprintf preventing possible buffer overflows | Ulrich Sibiller | 2018-01-07 | 1 | -9/+3 |
| | | | | | | I am not sure about the maximum font name length in X but just in case use snprintf instead of memcpy to be sure nothing dangerous can happen here. | ||||
* | Args.c: simplify nxagentGetDialogName() | Ulrich Sibiller | 2018-01-07 | 1 | -11/+4 |
| | |||||
* | Args.c, Error.[ch]: introduce own length macro for nxagentClientsLogName | Ulrich Sibiller | 2018-01-07 | 3 | -5/+6 |
| | |||||
* | Args.c: use strdup instead of malloc | Ulrich Sibiller | 2018-01-07 | 1 | -35/+7 |
| | |||||
* | Error.c: update nxagentPrintError | Ulrich Sibiller | 2018-01-07 | 1 | -6/+8 |
| | | | | | | | This is a partial copy from XlibInt.c's _XPrintDefaultError, which had some minor changes since being copied. Update to reflect these changes. Also comment some more lines as their result was unused an cluttered the output. | ||||
* | Error.c: replace strcpy/strcat by snprintf | Ulrich Sibiller | 2018-01-07 | 2 | -21/+13 |
| | |||||
* | Error.c: use standard file descriptor macros | Ulrich Sibiller | 2018-01-07 | 1 | -3/+3 |
| | |||||
* | Error.c: remove trailing whitespace | Ulrich Sibiller | 2018-01-07 | 1 | -5/+5 |
| | | | | and insert one single space | ||||
* | Error.c: remove empty ifdef | Ulrich Sibiller | 2018-01-07 | 1 | -4/+0 |
| | |||||
* | Font.c: pass down size | Ulrich Sibiller | 2018-01-07 | 1 | -6/+5 |
| | |||||
* | Display.c: pass down buffer size to nxagentLookForIconFile | Ulrich Sibiller | 2018-01-07 | 1 | -24/+22 |
| | | | | Also comment the code and convert error messages to warnings. | ||||
* | Replace hardcoded string lengths by macros | Ulrich Sibiller | 2018-01-07 | 6 | -69/+43 |
| | |||||
* | Font.c: make nxagentGetFontServerPath more readable | Ulrich Sibiller | 2018-01-07 | 1 | -4/+5 |
| | |||||
* | Screen.c: string handling improvements | Ulrich Sibiller | 2018-01-07 | 1 | -16/+10 |
| | |||||
* | Font.c: shorten string handling | Ulrich Sibiller | 2018-01-07 | 1 | -18/+7 |
| | |||||
* | Keyboard.c: replace malloc + strcpy by asprintf | Ulrich Sibiller | 2018-01-07 | 1 | -6/+4 |
| | |||||
* | Keyboard.c: improve user messages for keyboard file handling | Ulrich Sibiller | 2018-01-07 | 1 | -1/+1 |
| | |||||
* | Keyboard.c: fix memory leak | Ulrich Sibiller | 2018-01-07 | 1 | -1/+3 |
| | |||||
* | Dialog.c: fix possible buffer overflows | Ulrich Sibiller | 2018-01-07 | 1 | -0/+13 |
| | | | | Fix write past the end of singlePath if PATH contains dirs longer than PATH_MAX. | ||||
* | Dialog.c,Display.c,NXdixfonts.c: replace strncpy() by snprintf where appropriate | Ulrich Sibiller | 2018-01-07 | 5 | -17/+11 |
| | |||||
* | Dialog.c,Display.c,Font.c,NXdixfonts.c: don't use hardcoded string buffer ↵ | Ulrich Sibiller | 2018-01-07 | 4 | -20/+18 |
| | | | | lengths | ||||
* | nx-X11: reintroduce creation of libX11 compat symlinks. | Mihai Moldovan | 2017-12-30 | 1 | -0/+2 |
| | | | | | We need this to be able to execute the resulting nxagent binary from within the build directory. | ||||
* | nx-X11: build programs with a temporary RPATH/RUNPATH value and a relinked ↵ | Mihai Moldovan | 2017-12-30 | 1 | -2/+2 |
| | | | | | | | | | version with the system location. While the install target explicitly installs the relinked system-location version of a program, we do not actually use this. Currently, we copy nxagent directly out of the build root. | ||||
* | nxagent: implement RPATH/RUNPATH override for libX11. | Mihai Moldovan | 2017-12-30 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in ArcticaProject/nx-libs#610, we need a way to load libNX_X11 as a fake version of libX11 into nxagent's address space. For doing so, we have to link against libX11 at build-time and specify a(n) RPATH/RUNPATH to our libX11 -> libNX_X11 compat symlinks. This commit is essentially doing a cross between options 3 and 4 discussed in the provided GH issue. We link libX11 early (before specifying -Lcompat_symlinks_dir), so that the linker finds the "real" libX11 version with the libX11 SONAME. This leads to our binary depending upon both libX11 and libNX_X11 SONAMEs. We already always added RPATH/RUNPATH, but these values are not passed down to dependent libraries. What happens at run-time is that the loader searches for a libX11 SONAME, takes RPATH/RUNPATH into account and loads our libNX_X11 library instead via the compat symlinks. This satisfies the libX11 SONAME and dependent libraries will *not* load the system libX11 version again. Debian's dpkg-shlibdeps isn't quite happy about this mismatching SONAME situation, so instruct to look the other way while we're minding our business. Fixes: ArcticaProject/nx-libs#610 | ||||
* | reduce usage of uninitialised bytes | Ulrich Sibiller | 2017-12-28 | 12 | -104/+86 |
| | | | | as reported by valgrind | ||||
* | nx-X11/programs/Xserver/hw/nxagent/Screen.c: re-enable normal error/warning ↵ | Mihai Moldovan | 2017-12-24 | 1 | -2/+2 |
| | | | | | | output. Was dropped erroneously in cec31e2f06b29b332ee78cfefeefa7bfa136be75. | ||||
* | nx-X11/programs/Xserver/hw/nxagent/Screen.c: update screen size after ↵ | Mihai Moldovan | 2017-12-24 | 1 | -0/+7 |
| | | | | | | | modifying CRTC modes. This should get rid of the infamous "800x600 screen size" issue reproduced in X2Go whole display setups. | ||||
* | Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is ↵ | Mihai Moldovan | 2017-12-16 | 3 | -8/+2 |
| | | | | actually header I was searching for. | ||||
* | nx-X11/programs/Xserver/Xext/shape.c: avoid pulling in Xlib in legacy mode ↵ | Mihai Moldovan | 2017-12-16 | 1 | -0/+7 |
| | | | | via the _SHAPE_SERVER_ macro. | ||||
* | nx-X11/programs/Xserver/Xext/shape.c: pull in shapestr.h for legacy Xext ↵ | Mihai Moldovan | 2017-12-16 | 1 | -1/+1 |
| | | | | proto versions, since shape.h would pull in Xlib. | ||||
* | Handle SHAPE proto splitup gracefully for legacy Xext proto versions. | Mihai Moldovan | 2017-12-16 | 1 | -0/+4 |
| | |||||
* | zlib compatibility: whenever we want -I flags only, assume that the headers ↵ | Mihai Moldovan | 2017-12-16 | 2 | -3/+3 |
| | | | | | | are directly available. Especially don't add linking flags willy-nilly. | ||||
* | nx-X11/programs/Xserver/include/misc.h: add compat define for SHMNAME. | Mihai Moldovan | 2017-12-16 | 1 | -0/+6 |
| | |||||
* | Support building with legacy zlib versions that do not ship a pkg-config file. | Mihai Moldovan | 2017-12-16 | 3 | -4/+4 |
| | |||||
* | Support building with legacy (pre-7.1.0) Xext proto versions. | Mihai Moldovan | 2017-12-16 | 2 | -0/+8 |
| | | | | | Legacy Xext proto versions are automatically detected by the main Makefile. | ||||
* | Support building with legacy (pre-1.4.2) libXfont(1) versions. | Mihai Moldovan | 2017-12-16 | 2 | -0/+10 |
| | | | | | | | | Partly reverts ec30a857eb0d67b232f8d43e63a6370023f4c4d0, but in a forward-compatible manner. Legacy libXfont1 versions are automatically detected by the main Makefile. | ||||
* | release 3.5.99.123.5.99.12 | Mike Gabriel | 2017-12-15 | 1 | -1/+1 |
| | |||||
* | Xserver/hw/nxagent/Image.c: Fix regression FTBFS after d4465b71 got merged in. | Mike Gabriel | 2017-12-15 | 1 | -4/+4 |
| | |||||
* | release 3.5.99.113.5.99.11 | Mike Gabriel | 2017-12-15 | 1 | -1/+1 |
| | |||||
* | Xserver/hw/nxagent/Clipboard.c: Fix free calls (free back to XFree). | Mike Gabriel | 2017-12-15 | 1 | -3/+3 |
| | | | | | | | | | | | They have been flawed ever since nxagent came up, as they were Xfree (non-capital f) always, but should have been XFree (capital F, defined in Xlibint.h and part of libNX_X11). . Probably this all should be free() all over the code (bearing in mind, that XFree() returns int, not void. But still... Fixes ArcticaProject/nx-libs#553. | ||||
* | Xserver/hw/nxagent/compext: Xfree -> free and Xmalloc -> malloc. | Mike Gabriel | 2017-12-15 | 4 | -121/+114 |
| | |||||
* | Xserver/GL/glx/glxcmds.c: Cast small-int values through intptr_t when passed ↵ | Mike Gabriel | 2017-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | as pointers Picked from this X.org commit: commit b0dd6be2c8703f7062d45ac9fd646550c7d54e3b Author: Jamey Sharp <jamey@minilop.net> Date: Thu Oct 8 13:38:44 2009 +1100 Cast small-int values through intptr_t when passed as pointers On 64-bit systems, int and pointers don't have the same size, so GCC gives warnings about casts between int and pointer types. However, in the cases covered by this patch, it's always a value that fits in int being stored temporarily as a pointer and then converted back later, which is safe. Casting through the pointer-sized integer type intptr_t convinces the compiler that this is OK. Signed-off-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (Only appropriate location for backporting: Xserver/GL/glx/glxcmds.c). |