This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit a4fad8f58e8c7f601f70801016861f970ab05827 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Dec 17 23:58:16 2018 +0100 Fix crash due to uninitialized VModMap fields. Backport of commit 81b3b0cce088866dc3cda099d7c8d6655849fd43 Author: Tomas Janousek <tomi@nomi.cz> Date: Wed May 20 15:03:01 2009 +0200 Bug #6428, #16458, #21464: Fix crash due to uninitialized VModMap fields. In ProcXkbGetKbdByName, mrep.firstVModMapKey, .nVModMapKeys and .totalVModMapKeys were not initialized, contained random values and caused accesses to unallocated and later modified memory, causing XkbSizeVirtualModMap and XkbWriteVirtualModMap to see different number of nonzero values, resulting in writes past the end of an array in XkbSendMap. This patch initializes those values sensibly and reverts commits 5c0a2088 and 6dd4fc46, which have been plain non-sense. Signed-off-by: Tomas Janousek <tomi@nomi.cz> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> --- nx-X11/programs/Xserver/xkb/xkb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index e11d7e2..67d7f2b 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -1185,7 +1185,7 @@ XkbSizeVirtualModMap(XkbDescPtr xkb,xkbGetMapReply *rep) rep->totalVModMapKeys= 0; return 0; } - for (nRtrn=i=0;i<rep->nVModMapKeys-1;i++) { + for (nRtrn=i=0;i<rep->nVModMapKeys;i++) { if (xkb->server->vmodmap[i+rep->firstVModMapKey]!=0) nRtrn++; } @@ -5128,7 +5128,7 @@ ProcXkbGetKbdByName(ClientPtr client) mrep.present = 0; mrep.totalSyms = mrep.totalActs = mrep.totalKeyBehaviors= mrep.totalKeyExplicit= - mrep.totalModMapKeys= 0; + mrep.totalModMapKeys= mrep.totalVModMapKeys= 0; if (rep.reported&(XkbGBN_TypesMask|XkbGBN_ClientSymbolsMask)) { mrep.present|= XkbKeyTypesMask; mrep.firstType = 0; @@ -5154,6 +5154,8 @@ ProcXkbGetKbdByName(ClientPtr client) mrep.firstKeyExplicit = finfo.xkb->min_key_code; mrep.nKeyActs = mrep.nKeyBehaviors = mrep.nKeyExplicit = XkbNumKeys(finfo.xkb); + mrep.firstVModMapKey= finfo.xkb->min_key_code; + mrep.nVModMapKeys= XkbNumKeys(finfo.xkb); } else { mrep.virtualMods= 0; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 44c59e12dc3fb509d3d237cbc782cc44dfa30f4e Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Dec 18 00:17:51 2018 +0100 Fix uninitialized bytes Fixes this valgrind finding ==16977== Warning: invalid file descriptor -1 in syscall close() ==16977== Conditional jump or move depends on uninitialised value(s) ==16977== at 0x544B6B: XkbSendNewKeyboardNotify (xkbEvents.c:62) ==16977== by 0x540481: ProcXkbGetKbdByName (xkb.c:5330) ==16977== by 0x4341C5: Dispatch (NXdispatch.c:482) ==16977== by 0x40EB02: main (main.c:353) ==16977== Uninitialised value was created by a heap allocation ==16977== at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==16977== by 0x431BD7: NextAvailableClient (dispatch.c:3719) ==16977== by 0x47B297: AllocNewConnection (connection.c:821) ==16977== by 0x47B297: EstablishNewConnections (connection.c:910) ==16977== by 0x463DFE: ProcessWorkQueue (dixutils.c:541) ==16977== by 0x47635E: WaitForSomething (WaitFor.c:213) ==16977== by 0x434089: Dispatch (NXdispatch.c:360) ==16977== by 0x40EB02: main (main.c:353) --- nx-X11/programs/Xserver/dix/dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 3c79146..5c4e54c 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -3716,7 +3716,7 @@ ClientPtr NextAvailableClient(void * ospriv) i = nextFreeClientID; if (i == MAXCLIENTS) return (ClientPtr)NULL; - clients[i] = client = (ClientPtr)malloc(totalClientSize); + clients[i] = client = (ClientPtr)calloc(1,totalClientSize); if (!client) return (ClientPtr)NULL; InitClient(client, i, ospriv); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 79e4c20a076ec08490797595626407027e9e8b03 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Dec 17 22:33:52 2018 +0100 manpage: add -sync (partially) fixes ArcticaProject/nx-libs#666 --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 9dd4c84..23bf5de 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -199,6 +199,12 @@ e.g.: display number string written to STDERR is beautified with some human-readable (machine-parseable) text. .TP 8 +.B \-sync +This option tells \fBnxagent\fR to synchronize its window and graphics +operations with the real server. This is a useful option for +debugging, but it will slow down \fBnxagent\fR's performance +considerably. It should not be used unless absolutely necessary. +.TP 8 .B \-deferglyphs \fIwhichfonts\fP specifies the types of fonts for which the server should attempt to use deferred glyph loading. \fIwhichfonts\fP can be all (all fonts), -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 020ef045e0df09bc2f664d8d6e4b6600da53b41a Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Dec 18 21:32:37 2018 +0100 fb: Fix memcpy abuse Fixes ArcticaProject/nx-libs#750 Backport of this commit: commit e32cc0b4c85c78cd8743a6e1680dcc79054b57ce Author: Adam Jackson <ajax@redhat.com> Date: Thu Apr 21 16:37:11 2011 -0400 fb: Fix memcpy abuse The memcpy fast path implicitly assumes that the copy walks left-to-right. That's not something memcpy guarantees, and newer glibc on some processors will indeed break that assumption. Since we walk a line at a time, check the source and destination against the width of the blit to determine whether we can be sloppy enough to allow memcpy. (Having done this, we can remove the check for !reverse as well.) On an Intel Core i7-2630QM with an NVIDIA GeForce GTX 460M running in NoAccel, the broken code and various fixes for -copywinwin{10,100,500} gives (edited to fit in 80 columns): 1: Disable the fastpath entirely 2: Replace memcpy with memmove 3: This fix 4: The code before this fix 1 2 3 4 Operation ------ --------------- --------------- --------------- ------------ 258000 269000 ( 1.04) 544000 ( 2.11) 552000 ( 2.14) Copy 10x10 21300 23000 ( 1.08) 43700 ( 2.05) 47100 ( 2.21) Copy 100x100 960 962 ( 1.00) 1990 ( 2.09) 1990 ( 2.07) Copy 500x500 So it's a modest performance hit, but correctness demands it, and it's probably worth keeping the 2x speedup from having the fast path in the first place. Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> --- nx-X11/programs/Xserver/fb/fbblt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/fb/fbblt.c b/nx-X11/programs/Xserver/fb/fbblt.c index e820a85..acec23b 100644 --- a/nx-X11/programs/Xserver/fb/fbblt.c +++ b/nx-X11/programs/Xserver/fb/fbblt.c @@ -67,6 +67,7 @@ fbBlt (FbBits *srcLine, int n, nmiddle; Bool destInvarient; int startbyte, endbyte; + int careful; FbDeclareMergeRop (); #ifdef FB_24BIT @@ -78,7 +79,11 @@ fbBlt (FbBits *srcLine, } #endif - if (alu == GXcopy && pm == FB_ALLONES && !reverse && + careful = !((srcLine < dstLine && srcLine + width * (bpp>>3) > dstLine) || + (dstLine < srcLine && dstLine + width * (bpp>>3) > srcLine)) || + (bpp & 7); + + if (alu == GXcopy && pm == FB_ALLONES && !careful && !(srcX & 7) && !(dstX & 7) && !(width & 7)) { int i; CARD8 *src = (CARD8 *) srcLine; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 3b508010de68ece72d725921dbdf032efc955190 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Dec 17 22:34:43 2018 +0100 manpage: add -class (partially) fixes ArcticaProject/nx-libs#666 --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 531caa7..a7b3cdd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -216,6 +216,38 @@ connection in each new generation. If the user selects full regeneration, even the top-level window and the connection to the real server will be regenerated for each server generation. .TP 8 +.B \-class \fIstring\fP +This option specifies the default visual class of the nested server. +It is similar to the +.B \-cc +option from the set of standard options except that it will accept a string +rather than a number for the visual class specification. +The +.I string +must be one of the following six values: +.BR StaticGray , +.BR GrayScale , +.BR StaticColor , +.BR PseudoColor , +.BR TrueColor , +or +.BR DirectColor . +If both the +.B \-class +and +.B \-cc +options are specified, the last instance of either option takes precedence. +The class of the default visual of the nested server need not be the same as the +class of the default visual of the real server, but it must be supported by the +real server. +Use +.BR xdpyinfo (__appmansuffix__) +to obtain a list of supported visual classes on the real server before +starting \fBnxagent\fR. If the user chooses a static class, all the +colors in the default color map will be preallocated. If the user +chooses a dynamic class, colors in the default color map will be +available to individual clients for allocation. +.TP 8 .B \-deferglyphs \fIwhichfonts\fP specifies the types of fonts for which the server should attempt to use deferred glyph loading. \fIwhichfonts\fP can be all (all fonts), -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit b8138d97d5b9259aab1372aa47c425c99d23f5fd Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Dec 17 22:36:07 2018 +0100 manpage: add/extend -dpi/-autodpi (partially) fixes ArcticaProject/nx-libs#666 --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 575ebd0..8ef1d63 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -282,9 +282,14 @@ and to be 3/4ths the dimensions of the root window of the real server. .TP 8 .B \-dpi \fIresolution\fP -sets the resolution for all screens, in dots per inch. -To be used when the server cannot determine the screen size(s) from the -hardware. +sets the resolution for all screens, in dots per inch. If this option +is not specified \fBnxagent\fR will assume 96. There's also +.B \-autodpi +which will clone the real server's dpi. Note that the resolution specified via +.B \-dpi +is a per session setting. It cannot be changed on reconnect! This means that +clients may look "wrong" when reconnecting a session that had been +started with a different dpi than the current real xserver. .TP 8 .B dpms enables DPMS (display power management services), where supported. The @@ -468,7 +473,15 @@ auto-disconnect timeout in seconds (minimum allowed: 60) don't exit if there are no clients in rootless mode .TP 8 .B \-autodpi -detect real server's DPI and set it in the agent session; the \fI-dpi <dpi>\fR cmdline option overrides \fI-autodpi\fR +detect real server's DPI and set it in the agent session; the +.B \-dpi\fP cmdline option overrides +.B \-autodpi\fP. +Note that using +.B \-autodpi +will also adapt the DPI on reconnect which will cause +newly started clients respecting the new DPI while clients that had +been started before the reconnect still use the old DPI. This may lead +to applications looking "weird". .TP 8 .B \-nomagicpixel disable magic pixel support at session startup, can be re-enabled via nx/nx option on session -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit c8947d8aadd62c51ab7da272445d9fad4b6dd84f Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Dec 17 22:36:44 2018 +0100 manpage: reformat some lines --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 2bd74c8..3b61627 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -249,8 +249,8 @@ chooses a dynamic class, colors in the default color map will be available to individual clients for allocation. .TP 8 .B \-deferglyphs \fIwhichfonts\fP -specifies the types of fonts for which the server should attempt to use -deferred glyph loading. \fIwhichfonts\fP can be all (all fonts), +specifies the types of fonts for which the server should attempt to +use deferred glyph loading. \fIwhichfonts\fP can be all (all fonts), none (no fonts), or 16 (16 bit fonts only). .TP 8 .B \-depth \fIint\fP @@ -489,8 +489,8 @@ been started before the reconnect still use the old DPI. This may lead to applications looking "weird". .TP 8 .B \-nomagicpixel -disable magic pixel support at session startup, can be re-enabled via nx/nx option on session -resumption +disable magic pixel support at session startup, can be re-enabled via +nx/nx option on session resumption .TP 8 .B \-norender disable the use of the render extension -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit d610e9c3c878e39ae908f04843ed563b4669732f Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat Jul 22 17:34:22 2017 +0200 Keyboard.c: move keyboard file creation to extra function --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 108 ++++++++++++++------------ 1 file changed, 57 insertions(+), 51 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index c2c36ad..0b4e269 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -83,6 +83,8 @@ static int nxagentXkbGetNames(char **rules, char **model, char **layout, static void nxagentKeycodeConversionSetup(void); +void nxagentWriteKeyboardFile(unsigned int ruleslen, char *rules, char *model, char *layout, char *variant, char *options); + #endif /* XKB */ /* @@ -1557,6 +1559,56 @@ static int nxagentXkbGetNames(char **rules, char **model, char **layout, return n; } +void nxagentWriteKeyboardFile(unsigned int ruleslen, char *rules, char *model, char *layout, char *variant, char *options) +{ + if (ruleslen) + { + char *sessionpath = nxagentGetSessionPath(); + if (sessionpath) + { + char *keyboard_file_path = NULL; + FILE *keyboard_file; + if ((asprintf(&keyboard_file_path, "%s/keyboard", sessionpath) == -1)) + { + free(sessionpath); + FatalError("malloc for keyboard file path failed."); + } + free(sessionpath); + if ((keyboard_file = fopen(keyboard_file_path, "w"))) + { + if (rules) + fprintf(keyboard_file, "rules=\"%s\"\n", rules[0] == '\0' ? "," : rules); + if (model) + fprintf(keyboard_file, "model=\"%s\"\n", model[0] == '\0' ? "," : model); + if (layout) + fprintf(keyboard_file, "layout=\"%s\"\n", layout[0] == '\0' ? "," : layout); + /* FIXME: this is not correct. We need to match the number of + comma separated values between variant and layout */ + if (variant) + fprintf(keyboard_file, "variant=\"%s\"\n", variant[0] == '\0' ? "," : variant); + if (options) + fprintf(keyboard_file, "options=\"%s\"\n", options[0] == '\0' ? "," : options); + fclose(keyboard_file); + fprintf(stderr, "Info: keyboard file created: '%s'\n", keyboard_file_path); + } + else + { + int save_err = errno; + fprintf(stderr, "Error: keyboard file not created: %s\n", strerror(save_err)); + } + free(keyboard_file_path); + } + else + { + fprintf(stderr, "Warning: Failed to create keyboard file: SessionPath not defined\n"); + } + } + else + { + fprintf(stderr, "Warning: Failed to create the keyboard file\n"); + } +} + void nxagentKeycodeConversionSetup(void) { char *drules = NULL; @@ -1587,69 +1639,23 @@ void nxagentKeycodeConversionSetup(void) #ifdef DEBUG if (drulesLen != 0 && drules && dmodel) { - fprintf(stderr, "nxagentKeycodeConversionSetup: " - "Remote: [rules='%s',model='%s',layout='%s',variant='%s',options='%s'].\n", - drules, dmodel, dlayout, dvariant, doptions); + fprintf(stderr, "%s: Remote: [rules='%s',model='%s',layout='%s',variant='%s',options='%s'].\n", + __func__, drules, dmodel, dlayout, dvariant, doptions); } else { - fprintf(stderr, "nxagentKeycodeConversionSetup: " - "Failed to retrieve remote rules.\n"); + fprintf(stderr, "%s: Failed to retrieve remote rules.\n", __func__); } #endif - if (drulesLen != 0) - { - char *sessionpath = nxagentGetSessionPath(); - if (sessionpath) - { - char *keyboard_file_path = NULL; - FILE *keyboard_file; - if ((asprintf(&keyboard_file_path, "%s/keyboard", sessionpath) == -1)) - { - free(sessionpath); - FatalError("malloc for keyboard file path failed."); - } - free(sessionpath); - if ((keyboard_file = fopen(keyboard_file_path, "w"))) - { - if (drules) - fprintf(keyboard_file, "rules=\"%s\"\n", drules[0] == '\0' ? "," : drules); - if (dmodel) - fprintf(keyboard_file, "model=\"%s\"\n", dmodel[0] == '\0' ? "," : dmodel); - if (dlayout) - fprintf(keyboard_file, "layout=\"%s\"\n", dlayout[0] == '\0' ? "," : dlayout); - if (dvariant) - fprintf(keyboard_file, "variant=\"%s\"\n", dvariant[0] == '\0' ? "," : dvariant); - if (doptions) - fprintf(keyboard_file, "options=\"%s\"\n", doptions[0] == '\0' ? "," : doptions); - fclose(keyboard_file); - fprintf(stderr, "Info: keyboard file created: '%s'\n", keyboard_file_path); - } - else - { - int save_err = errno; - fprintf(stderr, "Error: keyboard file not created: %s\n", strerror(save_err)); - } - free(keyboard_file_path); - } - else - { - fprintf(stderr, "Warning: SessionPath not defined\n"); - } - } - else - { - fprintf(stderr, "Warning: Failed to create the keyboard file\n"); - } + nxagentWriteKeyboardFile(drulesLen, drules, dmodel, dlayout, dvariant, doptions); if (drules && dmodel && (strcmp(drules, "evdev") == 0 || strcmp(dmodel, "evdev") == 0)) { #ifdef DEBUG - fprintf(stderr, "nxagentKeycodeConversionSetup: " - "Activating KeyCode conversion.\n"); + fprintf(stderr, "%s: Activating KeyCode conversion.\n", __func__); #endif fprintf(stderr, "Info: Keycode conversion auto-determined as on\n"); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit d0d6c1bdba457c9e6cc5eaddbe8d94e5b2dd74ad Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat Dec 1 23:59:36 2018 +0100 Keyboard.c: rename variables to better reflect their meaning --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 50 +++++++++++++-------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 3410e09..b525a2a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -819,20 +819,20 @@ XkbError: #endif { - char *drules = NULL; - char *dmodel = NULL; - char *dlayout = NULL; - char *dvariant = NULL; - char *doptions = NULL; + char *remoterules = NULL; + char *remotemodel = NULL; + char *remotelayout = NULL; + char *remotevariant = NULL; + char *remoteoptions = NULL; - unsigned int drulesLen = nxagentXkbGetNames(&drules, &dmodel, &dlayout, - &dvariant, &doptions); + unsigned int remoteruleslen = nxagentXkbGetNames(&remoterules, &remotemodel, &remotelayout, + &remotevariant, &remoteoptions); #ifdef DEBUG - if (drulesLen && drules && dmodel) + if (remoteruleslen && remoterules && remotemodel) { fprintf(stderr, "%s: Remote: [rules='%s',model='%s',layout='%s',variant='%s',options='%s'].\n", - __func__, drules, dmodel, dlayout, dvariant, doptions); + __func__, remoterules, remotemodel, remotelayout, remotevariant, remoteoptions); } else { @@ -840,12 +840,12 @@ XkbError: } #endif - nxagentWriteKeyboardFile(drulesLen, drules, dmodel, dlayout, dvariant, doptions); - nxagentKeycodeConversionSetup(drules, dmodel); + nxagentWriteKeyboardFile(remoteruleslen, remoterules, remotemodel, remotelayout, remotevariant, remoteoptions); + nxagentKeycodeConversionSetup(remoterules, remotemodel); - if (drules) + if (remoterules) { - XFree(drules); + XFree(remoterules); } } @@ -1687,21 +1687,21 @@ void nxagentResetKeycodeConversion(void) if (result != 0) { - char *drules = NULL; - char *dmodel = NULL; - char *dlayout = NULL; - char *dvariant = NULL; - char *doptions = NULL; - unsigned int drulesLen; + char *remoterules = NULL; + char *remotemodel = NULL; + char *remotelayout = NULL; + char *remotevariant = NULL; + char *remoteoptions = NULL; + unsigned int remoteruleslen; - drulesLen = nxagentXkbGetNames(&drules, &dmodel, &dlayout, - &dvariant, &doptions); + remoteruleslen = nxagentXkbGetNames(&remoterules, &remotemodel, &remotelayout, + &remotevariant, &remoteoptions); - if (drulesLen && drules && dmodel) - nxagentKeycodeConversionSetup(drules, dmodel); + if (remoteruleslen && remoterules && remotemodel) + nxagentKeycodeConversionSetup(remoterules, remotemodel); - if (drules) - XFree(drules); + if (remoterules) + XFree(remoterules); } else { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit fb31220f248e82a36ae49be5c5d3abef5a791373 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat Dec 1 18:17:40 2018 +0100 Keyboard.c: reformat nxagentKeycodeConversionSetup --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 37 +++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 0871a58..dcb58de 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -1644,35 +1644,34 @@ void nxagentKeycodeConversionSetup(char * rules, char * model) { fprintf(stderr, "Info: Keycode conversion is off\n"); nxagentKeycodeConversion = False; - return; } else if (nxagentOption(KeycodeConversion) == KeycodeConversionOn) { fprintf(stderr, "Info: Keycode conversion is on\n"); nxagentKeycodeConversion = True; - return; - } - - if (rules && model && - (strcmp(rules, "evdev") == 0 || - strcmp(model, "evdev") == 0)) - { - #ifdef DEBUG - fprintf(stderr, "%s: Activating KeyCode conversion.\n", __func__); - #endif - - fprintf(stderr, "Info: Keycode conversion auto-determined as on\n"); - nxagentKeycodeConversion = True; } else { - #ifdef DEBUG - fprintf(stderr, "%s: Deactivating KeyCode conversion.\n", __func__); - #endif + if (rules && model && + (strcmp(rules, "evdev") == 0 || + strcmp(model, "evdev") == 0)) + { + #ifdef DEBUG + fprintf(stderr, "%s: Activating KeyCode conversion.\n", __func__); + #endif - fprintf(stderr, "Info: Keycode conversion auto-determined as off\n"); + fprintf(stderr, "Info: Keycode conversion auto-determined as on\n"); + nxagentKeycodeConversion = True; + } + else + { + #ifdef DEBUG + fprintf(stderr, "%s: Deactivating KeyCode conversion.\n", __func__); + #endif - nxagentKeycodeConversion = False; + fprintf(stderr, "Info: Keycode conversion auto-determined as off\n"); + nxagentKeycodeConversion = False; + } } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 21a0ce3672e53346c90aad2a9f5953d453e55a05 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat Dec 1 22:37:40 2018 +0100 nxagent: fix references to default rules in manpage we have changed that to base some time ago. --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 3b61627..892248d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -620,12 +620,12 @@ settings. .I <model>/<layout> use the given model and layout. You can not modify keyboard rules, variant or options. Instead preset values are used. These are -\fIxfree86\fR for rules and empty strings for variant and options. +\fIbase\fR for rules and empty strings for variant and options. .RE .TP 8 .PP -If \fIkeyboard\fR is omitted the internal defaults of \fBnxagent\fR will be used (rules: \fIxfree86\fR, layout: \fIus\fR, model: \fIpc102\fR, empty variant and options). +If \fIkeyboard\fR is omitted the internal defaults of \fBnxagent\fR will be used (rules: \fIbase\fR, layout: \fIus\fR, model: \fIpc102\fR, empty variant and options). .TP 8 .B keyconv=<string> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 1de6ca599f6f410308c7fe2ddd700197f66662fd Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat Jul 22 19:03:19 2017 +0200 nxagent: add keyboard=clone configuration option Specifying -keyboard clone (or keyboard=clone in options) will clone XKB keyboard from the remote x server. This way many keyboard problems will hopefully never return... Should be the default but is not (yet) for compatibility reasons. Fixes ArcticaProject/nx-libs#373 (except the "do autoconf if no keyboard is provided" feature.) References: ArcticaProject/nx-libs#240 ArcticaProject/nx-libs#368 --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 39 +++++++++++++++++++++--- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 3 +- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 11 +++++-- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 1da6a01..89e51b6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -761,7 +761,9 @@ XkbError: layout. */ - if (nxagentKeyboard && (strcmp(nxagentKeyboard, "query") != 0)) + if (nxagentKeyboard && + (strcmp(nxagentKeyboard, "query") != 0) && + (strcmp(nxagentKeyboard, "clone") != 0)) { for (i = 0; nxagentKeyboard[i] != '/' && nxagentKeyboard[i] != 0; i++); @@ -822,21 +824,48 @@ XkbError: unsigned int remoteruleslen = nxagentXkbGetNames(&remoterules, &remotemodel, &remotelayout, &remotevariant, &remoteoptions); - #ifdef DEBUG if (remoteruleslen && remoterules && remotemodel) { + #ifdef DEBUG fprintf(stderr, "%s: Remote: [rules='%s',model='%s',layout='%s',variant='%s',options='%s'].\n", __func__, remoterules, remotemodel, remotelayout, remotevariant, remoteoptions); + #endif + + /* + * Keyboard has always been tricky with nxagent. For that + * reason X2Go offers "auto" keyboard configuration. You can + * specify it in the client side session configuration. In + * "auto" mode x2goserver expects nxagent to write the + * remote keyboard config to a file on startup and + * x2goserver would then pick that file and pass it to + * setxkbmap. This functionality is obsoleted by the "clone" + * stuff but we still need it because x2goserver does not + * know about that yet. Once x2go starts using clone we can + * drop this here. + */ + nxagentWriteKeyboardFile(remoteruleslen, remoterules, remotemodel, remotelayout, remotevariant, remoteoptions); + + /* Only setup keycode conversion if we are NOT in clone mode */ + if (nxagentKeyboard && (strcmp(nxagentKeyboard, "clone") == 0)) + { + free(rules); rules = strdup(remoterules); + free(model); model = strdup(remotemodel); + free(layout); layout = strdup(remotelayout); + free(variant); variant = strdup(remotevariant); + free(options); options = strdup(remoteoptions); + } + else + { + nxagentKeycodeConversionSetup(remoterules, remotemodel); + } } + #ifdef DEBUG else { fprintf(stderr, "%s: Failed to retrieve remote rules.\n", __func__); } #endif - nxagentWriteKeyboardFile(remoterules, remotemodel, remotelayout, remotevariant, remoteoptions); - nxagentKeycodeConversionSetup(remoterules, remotemodel); - if (remoterules) { XFree(remoterules); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 4b1ae03..a61b425 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -598,7 +598,8 @@ Bool nxagentReconnectSession(void) if (nxagentOption(ResetKeyboardAtResume) == 1 && (nxagentKeyboard == NULL || nxagentOldKeyboard == NULL || strcmp(nxagentKeyboard, nxagentOldKeyboard) != 0 || - strcmp(nxagentKeyboard, "query") == 0)) + strcmp(nxagentKeyboard, "query") == 0 || + strcmp(nxagentKeyboard, "clone") == 0)) { if (nxagentResetKeyboard() == 0) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 892248d..84669ff 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -525,8 +525,8 @@ don't reset keyboard device if the session is resumed this is only relevant if you also specify \-keyboard=query. In that case \fBnxagent\fR will lock the keyboard settings and clients will get an error when trying to change keyboard settings via -XKEYBOARD. With \-noxkblock the lock is not applied and clients can -change the keyboard settings through XKEYBOARD. +XKEYBOARD. With \-noxkblock the lock is not applied and clients are +allowed change the keyboard settings through XKEYBOARD. .TP 8 .B \-tile WxH size of image tiles (minimum allowed: 32x32) @@ -603,7 +603,7 @@ start or resume a session in fullscreen mode (default: off) .TP 8 .B keyboard=<string> or kbtype=<string> -.BR query | <model>/<layout> +.BR query | clone | <model>/<layout> .RS 8 .TP 8 @@ -617,6 +617,11 @@ this platform. Note that in this case XKEYBOARD will always report the default layout which will most likely not match the experienced settings. .TP 8 +.I clone +ask the real X server for the keyboard settings using XKEYBOARD +protocol functions and clone them. This is the recommended setting. For +compatibility reasons it is not the default. +.TP 8 .I <model>/<layout> use the given model and layout. You can not modify keyboard rules, variant or options. Instead preset values are used. These are -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 4dfe84eafb3838e1b54f81450369c0b8e3bb8350 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Dec 3 21:52:33 2018 +0100 Keyboard.c: remove non-fitting comment Describes a check we are not doing here anymore... --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 9efafdf..1da6a01 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -708,12 +708,6 @@ N/A #ifdef XKB - /* - * First of all the validity - * of XkbBaseDirectory global - * variable is checked. - */ - if (noXkbExtension) { #ifdef TEST fprintf(stderr, "nxagentKeyboardProc: No XKB extension.\n"); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit d5c9733b24a55acb812a4cb11f39551c766c17d7 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Dec 3 22:03:58 2018 +0100 nxagent: simplify keycode conversion setup --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 19 +++++-------------- nx-X11/programs/Xserver/hw/nxagent/Keyboard.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 20b68b5..5c35d71 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -1691,10 +1691,14 @@ void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, char *vari void nxagentKeycodeConversionSetup(void) { + nxagentKeycodeConversion = False; + + if (nxagentXkbInfo.Opcode == -1) + return; + if (nxagentOption(KeycodeConversion) == KeycodeConversionOff) { fprintf(stderr, "Info: Keycode conversion is off\n"); - nxagentKeycodeConversion = False; } else if (nxagentOption(KeycodeConversion) == KeycodeConversionOn) { @@ -1721,23 +1725,10 @@ void nxagentKeycodeConversionSetup(void) #endif fprintf(stderr, "Info: Keycode conversion auto-determined as off\n"); - nxagentKeycodeConversion = False; } } } -void nxagentResetKeycodeConversion(void) -{ - if (nxagentXkbInfo.Opcode != -1) - { - nxagentKeycodeConversionSetup(); - } - else - { - nxagentKeycodeConversion = False; - } -} - Bool nxagentGetRemoteXkbExtension(void) { Bool result; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h index b6ec51e..dbfb477 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h @@ -117,7 +117,7 @@ void nxagentEnableXkbExtension(void); void nxagentTuneXkbWrapper(void); -void nxagentResetKeycodeConversion(void); +void nxagentKeycodeConversionSetup(void); Bool nxagentGetRemoteXkbExtension(void); #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index bd4fccd..91445a3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -620,7 +620,7 @@ Bool nxagentReconnectSession(void) } else { - nxagentResetKeycodeConversion(); + nxagentKeycodeConversionSetup(); } nxagentXkbState.Initialized = 0; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit a70ec920dd33a04b74af876444602c587fe9ec80 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Dec 3 23:35:56 2018 +0100 Keyboard.c: add static keyword where appropriate --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 5c35d71..cfe73ac 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -78,11 +78,11 @@ is" without express or implied warranty. #include <errno.h> -void nxagentXkbGetNames(void); +static void nxagentXkbGetNames(void); void nxagentKeycodeConversionSetup(void); -void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, char *variant, char *options); +static void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, char *variant, char *options); #endif /* XKB */ @@ -1545,7 +1545,7 @@ void nxagentXkbClearNames(void) free(nxagentRemoteOptions); nxagentRemoteOptions = NULL; } -void nxagentXkbGetNames(void) +static void nxagentXkbGetNames(void) { Atom atom; #ifdef _XSERVER64 @@ -1627,7 +1627,7 @@ void nxagentXkbGetNames(void) return; } -void writeKeyboardfileData(FILE *out, char *rules, char *model, char *layout, char *variant, char *options) +static void writeKeyboardfileData(FILE *out, char *rules, char *model, char *layout, char *variant, char *options) { /* How to set "empty" values with setxkbmap, result of trial and error: @@ -1645,7 +1645,7 @@ void writeKeyboardfileData(FILE *out, char *rules, char *model, char *layout, ch fprintf(out, "options=\",%s\"\n", options ? options : ""); } -void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, char *variant, char *options) +static void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, char *variant, char *options) { if (rules && rules[0] != '\0') { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 522106e207e7230da5e62fb88f2e47742fdf1b21 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat Jul 22 22:21:05 2017 +0200 nxagent: bypass X2go's keyboard configuration hack If X2go runs in auto keyboard mode it will pass keyboard=null/null to the agent and set the keyboard afterwards with setxkbmap. This patch lets nxagent handle that situation internally (null/null will be interpreted as clone) and disables X2go's mechanism (by creating a dir that effectively blocks it; see x2gosetkeyboard) This is only activated if the agent is run as "x2goagent". Fixes ArcticaProject/nx-libs#368 --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 111 ++++++++++++++++------- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 10 ++ nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 3 +- 3 files changed, 92 insertions(+), 32 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index cfe73ac..af27c6e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -57,6 +57,7 @@ is" without express or implied warranty. #include "Events.h" #include "Options.h" #include "Error.h" +#include "Init.h" #include "compext/Compext.h" @@ -82,6 +83,7 @@ static void nxagentXkbGetNames(void); void nxagentKeycodeConversionSetup(void); +static void nxagentWriteKeyboardDir(void); static void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, char *variant, char *options); #endif /* XKB */ @@ -751,6 +753,15 @@ XkbError: fprintf(stderr, "nxagentKeyboardProc: nxagentKeyboard is [%s].\n", nxagentKeyboard ? nxagentKeyboard : "NULL"); #endif + if (nxagentX2go == 1 && nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0)) + { + #ifdef TEST + fprintf(stderr, "%s: changing nxagentKeyboard from [null/null] to [clone].\n", __func__); + #endif + free(nxagentKeyboard); + nxagentKeyboard = strdup("clone"); + } + /* from nxagent changelog: 2.0.22: @@ -846,19 +857,6 @@ XkbError: __func__, nxagentRemoteRules, nxagentRemoteModel, nxagentRemoteLayout, nxagentRemoteVariant, nxagentRemoteOptions); #endif - /* - * Keyboard has always been tricky with nxagent. For that - * reason X2Go offers "auto" keyboard configuration. You can - * specify it in the client side session configuration. In - * "auto" mode x2goserver expects nxagent to write the - * remote keyboard config to a file on startup and - * x2goserver would then pick that file and pass it to - * setxkbmap. This functionality is obsoleted by the "clone" - * stuff but we still need it because x2goserver does not - * know about that yet. Once x2go starts using clone - * we can drop this here. - */ - nxagentWriteKeyboardFile(nxagentRemoteRules, nxagentRemoteModel, nxagentRemoteLayout, nxagentRemoteVariant, nxagentRemoteOptions); /* Only setup keycode conversion if we are NOT in clone mode */ if (nxagentKeyboard && (strcmp(nxagentKeyboard, "clone") == 0)) @@ -868,10 +866,33 @@ XkbError: free(layout); layout = strdup(nxagentRemoteLayout); free(variant); variant = strdup(nxagentRemoteVariant); free(options); options = strdup(nxagentRemoteOptions); + /* + * when cloning we do not want X2Go to set the keyboard + * via a keyboard file generated by nxagent. The defined + * method for switching that off is the creation of a dir + * instead of a file. Which is achieved by passing NULL to + * nxagentWriteKeyboardFile. + */ + if (nxagentX2go == 1) + nxagentWriteKeyboardDir(); } else { nxagentKeycodeConversionSetup(); + /* + * Keyboard has always been tricky with nxagent. For that + * reason X2Go offers "auto" keyboard configuration. You can + * specify it in the client side session configuration. In + * "auto" mode x2goserver expects nxagent to write the + * remote keyboard config to a file on startup and + * x2goserver would then pick that file and pass it to + * setxkbmap. This functionality is obsoleted by the "clone" + * stuff but we still need it because x2goserver does not + * know about that yet. Once x2go starts using clone + * we can drop this here. + */ + if (nxagentX2go == 1) + nxagentWriteKeyboardFile(nxagentRemoteRules, nxagentRemoteModel, nxagentRemoteLayout, nxagentRemoteVariant, nxagentRemoteOptions); } } #ifdef DEBUG @@ -1645,6 +1666,49 @@ static void writeKeyboardfileData(FILE *out, char *rules, char *model, char *lay fprintf(out, "options=\",%s\"\n", options ? options : ""); } +static char* getKeyboardFilePath(void) +{ + char *keyboard_file_path = NULL; + char *sessionpath = nxagentGetSessionPath(); + if (sessionpath) + { + if ((asprintf(&keyboard_file_path, "%s/keyboard", sessionpath) == -1)) + { + free(sessionpath); + FatalError("malloc for keyboard file path failed."); + } + free(sessionpath); + } + else + { + fprintf(stderr, "Warning: Failed to determine keyboard file path: SessionPath not defined\n"); + } + return keyboard_file_path; +} + +static void nxagentWriteKeyboardDir(void) +{ + char *keyboard_file_path = getKeyboardFilePath(); + + if (keyboard_file_path) + { + /* + * special case: if rules is NULL create a directory insteas of + * a file. This is the defined method to disable x2gosetkeyboard. + */ + if (mkdir(keyboard_file_path, 0555) < 0) + { + int save_err = errno; + fprintf(stderr, "Warning: Failed to create keyboard blocking directory '%s': %s\n", keyboard_file_path, strerror(save_err)); + } + else + { + fprintf(stderr, "Info: keyboard blocking directory created: '%s'\n", keyboard_file_path); + } + free(keyboard_file_path); + } +} + static void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, char *variant, char *options) { if (rules && rules[0] != '\0') @@ -1653,21 +1717,14 @@ static void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, cha writeKeyboardfileData(stderr, rules, model, layout, variant, options); #endif - char *sessionpath = nxagentGetSessionPath(); - if (sessionpath) + char *keyboard_file_path = getKeyboardFilePath(); + + if (keyboard_file_path) { - char *keyboard_file_path = NULL; FILE *keyboard_file; - if ((asprintf(&keyboard_file_path, "%s/keyboard", sessionpath) == -1)) - { - free(sessionpath); - FatalError("malloc for keyboard file path failed."); - } - free(sessionpath); if ((keyboard_file = fopen(keyboard_file_path, "w"))) { writeKeyboardfileData(keyboard_file, rules, model, layout, variant, options); - fclose(keyboard_file); fprintf(stderr, "Info: keyboard file created: '%s'\n", keyboard_file_path); } @@ -1678,14 +1735,6 @@ static void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, cha } free(keyboard_file_path); } - else - { - fprintf(stderr, "Warning: Failed to create keyboard file: SessionPath not defined\n"); - } - } - else - { - fprintf(stderr, "Warning: Failed to create the keyboard file\n"); } } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 91445a3..a921df6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -458,6 +458,16 @@ Bool nxagentReconnectSession(void) nxagentProcessOptions(nxagentOptionsFilenameOrString); + if (nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0)) + { + #ifdef TEST + fprintf(stderr, "nxagentReconnect: changing nxagentKeyboard from [null/null] to [clone].\n"); + #endif + + free(nxagentKeyboard); + nxagentKeyboard = strdup("clone"); + } + if (nxagentReconnectDisplay(reconnectLossyLevel[DISPLAY_STEP]) == 0) { failedStep = DISPLAY_STEP; diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 938c2eb..737d360 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -623,7 +623,8 @@ protocol functions and clone them. This is the recommended setting. For compatibility reasons it is not the default. .TP 8 .I <model>/<layout> -use the given model and layout. You can not modify keyboard rules, +use the given model and layout. A value of \fInull/null\fR is equivalent to +\fIclone\fR. You can not modify keyboard rules, variant or options this way. Instead preset values are used. These are \fIbase\fR for rules and empty strings for variant and options. .TP 8 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit d98255968330e904e02cd129482f83f31e937fa6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 19 12:39:59 2018 +0100 nxagent.1 man page: Grammar fix. --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 737d360..c438c47 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -526,7 +526,7 @@ this is only relevant if you also specify \-keyboard=query. In that case \fBnxagent\fR will lock the keyboard settings and clients will get an error when trying to change keyboard settings via XKEYBOARD. With \-noxkblock the lock is not applied and clients are -allowed change the keyboard settings through XKEYBOARD. +allowed to change the keyboard settings through XKEYBOARD. .TP 8 .B \-tile WxH size of image tiles (minimum allowed: 32x32) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 4a7faa8bd0b8918900f442d097a6e946415d1ea7 Author: Ulrich Sibiller <uli42@gmx.de> Date: Thu Jan 10 22:35:02 2019 +0100 Window.c: move WM_STATE handling to separate function --- nx-X11/programs/Xserver/hw/nxagent/Window.c | 36 +++++++++++++++-------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index 82f4991..c404d0a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -1822,6 +1822,18 @@ Bool nxagentChangeWindowAttributes(WindowPtr pWin, unsigned long mask) return 1; } +void nxagentSetWMState(WindowPtr pWin, CARD32 desired) +{ + Atom prop = MakeAtom("WM_STATE", strlen("WM_STATE"), True); + nxagentWMStateRec wmState = {.state = desired, .icon = None}; + if (ChangeWindowProperty(pWin, prop, prop, 32, 0, 2, &wmState, 1) != Success) + { + #ifdef WARNING + fprintf(stderr, "%s: Changing WM_STATE failed.\n", __func__); + #endif + } +} + Bool nxagentRealizeWindow(WindowPtr pWin) { if (nxagentScreenTrap == 1) @@ -1843,14 +1855,7 @@ Bool nxagentRealizeWindow(WindowPtr pWin) /* add by dimbor */ if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) { - Atom prop = MakeAtom("WM_STATE", strlen("WM_STATE"), True); - nxagentWMStateRec wmState; - wmState.state = 1; /* NormalState */ - wmState.icon = None; - if (ChangeWindowProperty(pWin, prop, prop, 32, 0, 2, &wmState, 1) != Success) - { - fprintf(stderr, "nxagentRealizeWindow: Adding WM_STATE fail.\n"); - } + nxagentSetWMState(pWin, NormalState); } /* @@ -1878,7 +1883,7 @@ Bool nxagentRealizeWindow(WindowPtr pWin) #ifdef TEST if (nxagentOption(Rootless) && nxagentLastWindowDestroyed) { - fprintf(stderr, "nxagentRealizeWindow: Window realized. Stopped termination for rootless session.\n"); + fprintf(stderr, "%s: Window realized. Stopped termination for rootless session.\n", __func__); } #endif @@ -1899,14 +1904,11 @@ Bool nxagentUnrealizeWindow(WindowPtr pWin) /* add by dimbor */ if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) { - Atom prop = MakeAtom("WM_STATE", strlen("WM_STATE"), True); - nxagentWMStateRec wmState; - wmState.state = 3; /* WithdrawnState */ - wmState.icon = None; - if (ChangeWindowProperty(pWin, prop, prop, 32, 0, 2, &wmState, 1) != Success) - { - fprintf(stderr, "nxagentUnRealizeWindow: Changing WM_STATE failed.\n"); - } + /* + * The original _comment_ was WithdrawnState, while the _value_ + * was 3, which is IconicState. + */ + nxagentSetWMState(pWin, IconicState); } XUnmapWindow(nxagentDisplay, nxagentWindow(pWin)); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 8dea30751d5917482527489ca292714a7874f42c Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 11 23:25:39 2019 +0100 Screen.c: move identical line out of both parts of an if clause --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index d8cf695..1af6215 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1011,6 +1011,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, resetAgentPosition = True; } + nxagentChangeOption(BorderWidth, 0); + if (nxagentOption(Fullscreen)) { nxagentChangeOption(X, 0); @@ -1019,7 +1021,6 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, nxagentChangeOption(Width, WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); nxagentChangeOption(Height, HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); - nxagentChangeOption(BorderWidth, 0); if (nxagentReconnectTrap == False || nxagentResizeDesktopAtStartup) { @@ -1052,8 +1053,6 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, } else { - nxagentChangeOption(BorderWidth, 0); - if (nxagentReconnectTrap == False) { nxagentChangeOption(RootX, 0); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 3c92b5db9d3d90967410c4dc1d1f8a45554c724b Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Jan 13 23:47:53 2019 +0100 Screen.c: fix size calculation in rootless mode There's no need to reduce the size to 75% in rootless mode. We always want to have the full size then. Fixes ArcticaProject/nx-libs#757 (Part 2/2) --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index cfe0fd9..bd0236a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1080,12 +1080,26 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, if (nxagentOption(Width) > w) { - nxagentChangeOption(Width, w * 3 / 4); + if (nxagentOption(Rootless)) + { + nxagentChangeOption(Width, w); + } + else + { + nxagentChangeOption(Width, w * 3 / 4); + } } if (nxagentOption(Height) > h) { - nxagentChangeOption(Height, h * 3 / 4); + if (nxagentOption(Rootless)) + { + nxagentChangeOption(Height, h); + } + else + { + nxagentChangeOption(Height, h * 3 / 4); + } } /* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit c4c39bc949549795c39ecbb24967256119c1f342 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 11 22:39:34 2019 +0100 Extensions.c: Cleanup nxagentRandRInitSizes() --- nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 77 +++++++++++-------------- 1 file changed, 33 insertions(+), 44 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c index 3639922..785724c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c @@ -269,40 +269,30 @@ int nxagentRandRGetInfo(ScreenPtr pScreen, Rotation *pRotations) static int nxagentRandRInitSizes(ScreenPtr pScreen) { - RRScreenSizePtr pSize; + const int refresh_rate = 60; + RRScreenSizePtr pSize = NULL; - int width; - int height; - - int maxWidth; - int maxHeight; + /* + Index[0]: default size + Index[nsizes-1]: current size + Index[nsizes-2]: max size + */ -/* + /* int w[] = {0, 160, 320, 640, 800, 1024, 1152, 1280, 1280, 1280, 1280, 1280, 1280, 1360, 1440, 1600, 1600, 1680, 1920, 1920, 0, 0}; int h[] = {0, 120, 240, 480, 600, 768, 864, 600, 720, 800, 854, 960, 1024, 768, 900, 900, 1200, 1050, 1080, 1200, 0, 0}; -*/ + */ int w[] = {0, 320, 640, 640, 800, 800, 1024, 1024, 1152, 1280, 1280, 1280, 1360, 1440, 1600, 1600, 1680, 1920, 1920, 0, 0}; int h[] = {0, 240, 360, 480, 480, 600, 600, 768, 864, 720, 800, 1024, 768, 900, 900, 1200, 1050, 1080, 1200, 0, 0}; - int i; - int nSizes; - - int mmWidth; - int mmHeight; - - /* - * Register all the supported sizes. The third - * parameter is the refresh rate. - */ - - maxWidth = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - maxHeight = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); + int maxWidth = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); + int maxHeight = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - nSizes = sizeof w / sizeof(int); + int nSizes = sizeof w / sizeof(int); /* * Add current and max sizes. @@ -321,7 +311,7 @@ static int nxagentRandRInitSizes(ScreenPtr pScreen) w[0] = w[1]; h[0] = h[1]; - for (i = 2; i < nSizes - 1; i++) + for (int i = 2; i < nSizes - 1; i++) { if ((w[i] <= maxWidth * 3 / 4) && (h[i] <= maxHeight * 3 / 4) && @@ -333,47 +323,46 @@ static int nxagentRandRInitSizes(ScreenPtr pScreen) } } - for (i = 0; i < nSizes; i++) + /* + * Register all the supported sizes at a fixed refresh rate. + */ + + for (int i = 0; i < nSizes; i++) { - width = w[i]; - height = h[i]; + int mmWidth, mmHeight; if (monitorResolution < 0) { - mmWidth = width * DisplayWidthMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) / + mmWidth = w[i] * DisplayWidthMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) / DisplayWidth(nxagentDisplay, DefaultScreen(nxagentDisplay)); - mmHeight = height * DisplayHeightMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) / + mmHeight = h[i] * DisplayHeightMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) / DisplayHeight(nxagentDisplay, DefaultScreen(nxagentDisplay)); } else { - mmWidth = (width * 254 + monitorResolution * 5) / (monitorResolution * 10); - mmHeight = (height * 254 + monitorResolution * 5) / (monitorResolution * 10); - - } - - if (mmWidth < 1) - { - mmWidth = 1; - } - - if (mmHeight < 1) - { - mmHeight = 1; + mmWidth = (w[i] * 254 + monitorResolution * 5) / (monitorResolution * 10); + mmHeight = (h[i] * 254 + monitorResolution * 5) / (monitorResolution * 10); } - pSize = RRRegisterSize(pScreen, width, height, mmWidth, mmHeight); + pSize = RRRegisterSize(pScreen, w[i], h[i], mmWidth < 1 ? 1 : mmWidth, mmHeight < 1 ? 1 : mmHeight); if (pSize == NULL) { return 0; } - RRRegisterRate (pScreen, pSize, 60); + RRRegisterRate (pScreen, pSize, refresh_rate); } - RRSetCurrentConfig(pScreen, RR_Rotate_0, 60, pSize); + /* + * the last registered size should be the current size + */ + + if (pSize) + { + RRSetCurrentConfig(pScreen, RR_Rotate_0, refresh_rate, pSize); + } return 1; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 889de46f759913742478d2cfe20f1f4a6c2effdc Author: Vadim <vtroshchinskiy@qindel.com> Date: Fri Jan 18 13:15:18 2019 +0100 Fix parsing ports set to unix sockets --- nxcomp/src/Loop.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index ddffcd1..8e6f20e 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -7803,6 +7803,7 @@ int ParseEnvironmentOptions(const char *env, int force) strcpy(opts, env); char *nextOpts = opts; + bool nxdisplay_found = false; // // Ensure that DISPLAY environment variable @@ -7824,14 +7825,17 @@ int ParseEnvironmentOptions(const char *env, int force) else if (strncasecmp(opts, "nx/nx,", 6) == 0) { nextOpts += 6; + nxdisplay_found = true; } else if (strncasecmp(opts, "nx,", 3) == 0) { nextOpts += 3; + nxdisplay_found = true; } else if (strncasecmp(opts, "nx:", 3) == 0) { nextOpts += 3; + nxdisplay_found = true; } else if (force == 0) { @@ -7860,7 +7864,7 @@ int ParseEnvironmentOptions(const char *env, int force) value = strrchr(nextOpts, ':'); - if (value != NULL) + if (value != NULL && nxdisplay_found ) { char *check = value + 1; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 5c99eb7d5d3121c4fff11e73b923a4c7a88263fc Author: Vadim <vtroshchinskiy@qindel.com> Date: Fri Jan 18 12:28:51 2019 +0100 Make getUnixPath() return the right value when called without an argument. This fixes the verification in validateSpec() --- nxcomp/src/ChannelEndPoint.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp index 7768df1..635dd1a 100644 --- a/nxcomp/src/ChannelEndPoint.cpp +++ b/nxcomp/src/ChannelEndPoint.cpp @@ -209,8 +209,6 @@ ChannelEndPoint::getUnixPath(char **unixPath) const { if (unixPath) *unixPath = NULL; - else - return false; long p; char *path = NULL; @@ -230,7 +228,9 @@ ChannelEndPoint::getUnixPath(char **unixPath) const { return false; } - *unixPath = strdup(path); + // Only return value wanted + if ( unixPath ) + *unixPath = strdup(path); return true; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 427ac344c53acf4cb361f24e1df771137f83ea6b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 31 14:10:36 2019 +0100 release 3.5.99.18 --- ChangeLog | 222 ++++++++++++++++++++++- VERSION | 2 +- debian/changelog | 7 + nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +- nx-libs.spec | 2 +- nxproxy/man/nxproxy.1 | 2 +- 6 files changed, 231 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index aca1810..c363e9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,224 @@ -2018-11-20 16:03:22 +0100 Mike Gabriel (b0c5dcd51) +2019-01-31 14:10:36 +0100 Mike Gabriel (b5d411337) - * release 3.5.99.17 (HEAD -> 3.6.x, tag: 3.5.99.17) + * release 3.5.99.18 (HEAD -> 3.6.x, tag: 3.5.99.18) + +2019-01-25 16:37:29 +0100 Mike Gabriel (26e483d49) + + * Merge branch 'theqvd-unix_socket_forwarding' into 3.6.x + +2019-01-18 13:15:18 +0100 Vadim (889de46f7) + + * Fix parsing ports set to unix sockets + +2019-01-18 12:28:51 +0100 Vadim (5c99eb7d5) + + * Make getUnixPath() return the right value when called without an + argument. + +2019-01-17 12:06:34 +0100 Mike Gabriel (ca8236e7f) + + * Merge branch 'uli42-pr/window_fixes' into 3.6.x + +2019-01-12 01:01:55 +0100 Ulrich Sibiller (d16a5fbb1) + + * Screen.c: fix handling of fullscreen startup + +2019-01-13 23:47:53 +0100 Ulrich Sibiller (3c92b5db9) + + * Screen.c: fix size calculation in rootless mode + +2019-01-13 23:46:49 +0100 Ulrich Sibiller (43d3b655d) + + * Screen.c: improve readability of size calculations + +2019-01-11 23:25:39 +0100 Ulrich Sibiller (8dea30751) + + * Screen.c: move identical line out of both parts of an if clause + +2019-01-11 22:39:34 +0100 Ulrich Sibiller (c4c39bc94) + + * Extensions.c: Cleanup nxagentRandRInitSizes() + +2019-01-11 21:58:50 +0100 Ulrich Sibiller (6c0098a3e) + + * Extensions.c: fix first resolution being ignored + +2019-01-11 00:59:55 +0100 Ulrich Sibiller (d175fd4c6) + + * Set default screen size to the whole screen in rootless mode + +2019-01-10 22:35:02 +0100 Ulrich Sibiller (4a7faa8bd) + + * Window.c: move WM_STATE handling to separate function + +2018-12-22 22:02:15 +0100 Mike Gabriel (4214a719a) + + * Merge branch 'uli42-pr/fix_xlibcrash' into 3.6.x + +2018-10-31 23:44:15 +0100 Ulrich Sibiller (633f4617b) + + * XlibInt: check for XlibError before accessing other dpy fields + +2018-10-31 23:43:58 +0100 Ulrich Sibiller (a61b1a72d) + + * XlibInt.c: fix wrong debug message + +2018-12-19 12:39:59 +0100 Mike Gabriel (d98255968) + + * nxagent.1 man page: Grammar fix. + +2018-12-19 12:38:59 +0100 Mike Gabriel (669af5300) + + * Merge branch 'uli42-pr/x2go_bypass' into 3.6.x + +2017-07-22 22:21:05 +0200 Ulrich Sibiller (522106e20) + + * nxagent: bypass X2go's keyboard configuration hack + +2018-12-19 12:36:28 +0100 Mike Gabriel (a8c65ab62) + + * Merge branch 'uli42-pr/improve_keyboard2' into 3.6.x + +2018-12-03 23:35:56 +0100 Ulrich Sibiller (a70ec920d) + + * Keyboard.c: add static keyword where appropriate + +2018-12-03 22:03:58 +0100 Ulrich Sibiller (d5c9733b2) + + * nxagent: simplify keycode conversion setup + +2018-12-03 21:54:15 +0100 Ulrich Sibiller (1d6c241d3) + + * nxagent: store remote keyboard in global variables + +2018-12-02 17:08:31 +0100 Ulrich Sibiller (161515d24) + + * nxagent: add additional keyboard config option rmlvo + +2017-07-22 19:03:19 +0200 Ulrich Sibiller (1de6ca599) + + * nxagent: add keyboard=clone configuration option + +2018-12-19 12:31:05 +0100 Mike Gabriel (ab3e14850) + + * Merge branch 'uli42-pr/keyboard_cleanup' into 3.6.x + +2018-12-03 21:34:40 +0100 Ulrich Sibiller (26b033b84) + + * Reconnect.c: restore old keyboard value if no new one is given + +2018-12-03 21:52:33 +0100 Ulrich Sibiller (4dfe84eaf) + + * Keyboard.c: remove non-fitting comment + +2018-12-01 22:37:40 +0100 Ulrich Sibiller (21a0ce367) + + * nxagent: fix references to default rules in manpage + +2017-07-23 02:03:58 +0200 Ulrich Sibiller (3b62184a1) + + * Keyboard.c: improve creation of keyboard config file + +2018-12-01 18:17:40 +0100 Ulrich Sibiller (fb31220f2) + + * Keyboard.c: reformat nxagentKeycodeConversionSetup + +2018-12-02 00:09:00 +0100 Ulrich Sibiller (3c4a8da12) + + * Keyboard.c: use 'variant' all over the place + +2018-12-01 23:59:36 +0100 Ulrich Sibiller (d0d6c1bdb) + + * Keyboard.c: rename variables to better reflect their meaning + +2017-07-22 18:56:13 +0200 Ulrich Sibiller (269a352ff) + + * Keyboard.c: refactor keycode conversion + +2017-07-22 17:34:22 +0200 Ulrich Sibiller (d610e9c3c) + + * Keyboard.c: move keyboard file creation to extra function + +2018-12-19 12:25:53 +0100 Mike Gabriel (70cb1926c) + + * Merge branch 'uli42-pr/xnest_manpages' into 3.6.x + +2018-12-17 22:36:44 +0100 Ulrich Sibiller (c8947d8aa) + + * manpage: reformat some lines + +2018-12-17 22:36:34 +0100 Ulrich Sibiller (b405b962f) + + * manpage: add -name + +2018-12-17 22:36:07 +0100 Ulrich Sibiller (b8138d97d) + + * manpage: add/extend -dpi/-autodpi + +2018-12-17 22:35:35 +0100 Ulrich Sibiller (338e20510) + + * manpage: add -geometry + +2018-12-17 22:35:18 +0100 Ulrich Sibiller (51664049f) + + * manpage: add -depth + +2018-12-17 22:34:43 +0100 Ulrich Sibiller (3b508010d) + + * manpage: add -class + +2018-12-17 22:34:15 +0100 Ulrich Sibiller (0b454d2d3) + + * manpage: add -full + +2018-12-17 22:33:52 +0100 Ulrich Sibiller (79e4c20a0) + + * manpage: add -sync + +2018-12-19 12:20:10 +0100 Mike Gabriel (22fea29cf) + + * Merge branch 'uli42-pr/fb_fastpath' into 3.6.x + +2018-12-18 21:39:04 +0100 Ulrich Sibiller (034228d75) + + * fb: fix fast-path blt detection + +2018-12-18 21:32:37 +0100 Ulrich Sibiller (020ef045e) + + * fb: Fix memcpy abuse + +2018-12-19 12:18:27 +0100 Mike Gabriel (8d6a4a9b7) + + * Merge branch 'uli42-pr/fix_uninit' into 3.6.x + +2018-12-18 00:17:51 +0100 Ulrich Sibiller (44c59e12d) + + * Fix uninitialized bytes + +2018-12-18 00:05:50 +0100 Ulrich Sibiller (5b0bf752a) + + * xkb: Initialize pad bytes sent in replies of geometry requests. + +2018-12-17 23:58:16 +0100 Ulrich Sibiller (a4fad8f58) + + * Fix crash due to uninitialized VModMap fields. + +2018-11-22 13:16:20 +0100 Mike Gabriel (989398afe) + + * debian/*: Adopt packaging changes from official Debian package. + +2018-11-22 11:46:01 +0100 Mike Gabriel (6d7784eb0) + + * debian/nxagent.{post,pre}*: Fix versions in dpkg-maintscript-helper + calls. + +2018-11-22 11:45:29 +0100 Mike Gabriel (afa56ea64) + + * debian/changelog: post-release fix (UNRELEASED -> unstable). + +2018-11-20 16:03:22 +0100 Mike Gabriel (3a19d8d17) + + * release 3.5.99.17 (tag: 3.5.99.17) 2018-11-14 20:21:46 +0100 Ulrich Sibiller (623a74ae1) diff --git a/VERSION b/VERSION index 77a8ced..3919e36 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.99.17 +3.5.99.18 diff --git a/debian/changelog b/debian/changelog index f163297..ea77705 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.18-0) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 31 Jan 2019 14:09:11 +0100 + nx-libs (2:3.5.99.17-0) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index c438c47..ac06806 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .ds q \N'34' -.TH nxagent 1 "Nov 2018" "Version 3.5.99.17" "NX Agent (Xserver)" +.TH nxagent 1 "Jan 2019" "Version 3.5.99.18" "NX Agent (Xserver)" .SH NAME nxagent \- nested Xserver optimized for remote computing .SH SYNOPSIS diff --git a/nx-libs.spec b/nx-libs.spec index a5170f3..585ddd1 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -10,7 +10,7 @@ %endif Name: nx-libs -Version: 3.5.99.17 +Version: 3.5.99.18 Release: 0.0build1%{?dist} Summary: NX X11 protocol compression libraries diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1 index ef40fb3..cebfd39 100644 --- a/nxproxy/man/nxproxy.1 +++ b/nxproxy/man/nxproxy.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH nxproxy 1 "Nov 2018" "Version 3.5.99.17" "NX Proxy" +.TH nxproxy 1 "Jan 2019" "Version 3.5.99.18" "NX Proxy" .SH NAME nxproxy \- NX Proxy Tool .SH SYNOPSIS -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git