X2Go Bug report logs - #750
Update keystrokes.cfg docs for nx-libs 3.5.0.29

Full log

🔗 View this message in rfc822 format

X-Loop: owner@bugs.x2go.org
Subject: Bug#744: [X2Go-Dev] Bug#744: user-local keystrokes.cfg does not work
Reply-To: Mihai Moldovan <ionic@ionic.de>, 744@bugs.x2go.org
Resent-From: Mihai Moldovan <ionic@ionic.de>
Resent-To: x2go-dev@lists.x2go.org
Resent-CC: X2Go Developers <x2go-dev@lists.x2go.org>
X-Loop: owner@bugs.x2go.org
Resent-Date: Fri, 16 Jan 2015 14:30:02 +0000
Resent-Message-ID: <handler.744.B744.1421418547717@bugs.x2go.org>
Resent-Sender: owner@bugs.x2go.org
X-X2Go-PR-Message: followup 744
X-X2Go-PR-Package: x2goagent
X-X2Go-PR-Keywords: patch
Received: via spool by 744-submit@bugs.x2go.org id=B744.1421418547717
          (code B ref 744); Fri, 16 Jan 2015 14:30:02 +0000
Received: (at 744) by bugs.x2go.org; 16 Jan 2015 14:29:07 +0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
	ymir.das-netzwerkteam.de
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID,
	URIBL_BLOCKED autolearn=ham version=3.3.2
Received: from Root24.de (powered.by.root24.eu [5.135.3.88])
	by ymir.das-netzwerkteam.de (Postfix) with ESMTP id 2553B5DEA3
	for <744@bugs.x2go.org>; Fri, 16 Jan 2015 15:29:06 +0100 (CET)
Received: from nopileos.local (home.ionic.de [217.92.117.31])
	by mail.ionic.de (Postfix) with ESMTPSA id CBA4E4F00211;
	Fri, 16 Jan 2015 15:29:05 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ionic.de; s=default;
	t=1421418545; bh=tHmBhnCQFNcInx2hsz1HLe1udNnXKHyCBJgThNRzG3Y=;
	h=Date:From:To:CC:Subject:References:In-Reply-To:From;
	b=Xi8xonTDKMYd8oZdTwR5JQDvhQRBLG1SEclNggblgnAFVbpMh9P8wbKvrkHjgw+G7
	 j/708PKSTfi36k1aSzo19xGAOzeRQ8HAzSP9zEU5XwiPeS0IOTyihC03nhKowRxIkZ
	 Y/EFTkEitE5QaTjIGzHdjrd1nIPTp/OZsVNB59U4=
Message-ID: <54B92030.5090203@ionic.de>
Date: Fri, 16 Jan 2015 15:29:04 +0100
From: Mihai Moldovan <ionic@ionic.de>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:31.0) Gecko/20100101 Thunderbird/31.4.0
MIME-Version: 1.0
To: Horst Schirmeier <horst@schirmeier.com>, 
 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
CC: 744@bugs.x2go.org
References: <20150115151045.GI22378@quickstop.soohrt.org> <54B829B7.4030902@ionic.de> <20150115225649.Horde.HcPP3grdrOF4uhHQn4l8_w4@mail.das-netzwerkteam.de> <20150116141105.GO22378@quickstop.soohrt.org>
In-Reply-To: <20150116141105.GO22378@quickstop.soohrt.org>
Content-Type: multipart/signed; micalg=pgp-sha512;
 protocol="application/pgp-signature";
 boundary="hlScsTL6bvgEAloqgRl9JIOqScmCxAEo9"

[Message part 1 (text/plain, inline)]

On 16.01.2015 03:11 PM, Horst Schirmeier wrote:
> How about this variant?
>
> patch for x2go-specific keystroke configuration files, enable user-local
> keystrokes.cfg
> ---
>  ...agent_x2go-specific-keystroke-config.full.patch | 22 ++++++++++++++++++++++
>  debian/patches/series                              |  1 +
>  debian/wrappers/x2goagent                          |  3 ---
>  3 files changed, 23 insertions(+), 3 deletions(-)
>  create mode 100644 debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
>
> diff --git a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch b/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
> new file mode 100644
> index 0000000..8ab4f93
> --- /dev/null
> +++ b/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
> @@ -0,0 +1,22 @@
> +--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
> ++++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
> +@@ -27,6 +27,7 @@
> + #include "Options.h"
> + #include "Keystroke.h"
> + #include "Drawable.h"
> ++#include "Init.h" /* extern int nxagentX2go */
> + 
> + #include <unistd.h>
> + 
> +@@ -261,6 +262,11 @@ static void parse_keystroke_file(void)
> +   char *homefile = "/.nx/config/keystrokes.cfg";
> +   char *etcfile = "/etc/nxagent/keystrokes.cfg";
> + 
> ++  if (nxagentX2go) {
> ++    homefile = "/.x2go/config/keystrokes.cfg";
> ++    etcfile = "/etc/x2go/keystrokes.cfg";
> ++  }
> ++
> +   if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0)
> +   {
> +     filename = strdup(nxagentKeystrokeFile);
> diff --git a/debian/patches/series b/debian/patches/series
> index 98d3e5e..c65f645 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -61,6 +61,7 @@
>  301_nx-X11_use-shared-libs.full.patch
>  302_nx-X11_xkbbasedir-detection.full.patch
>  320_nxagent_configurable-keystrokes.full.patch
> +321_nxagent_x2go-specific-keystroke-config.full.patch
>  400_nxcomp-version.full+lite.patch
>  #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
>  600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
> diff --git a/debian/wrappers/x2goagent b/debian/wrappers/x2goagent
> index 129c7ca..ba07a3f 100644
> --- a/debian/wrappers/x2goagent
> +++ b/debian/wrappers/x2goagent
> @@ -29,7 +29,4 @@ test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
>  
>  export LD_LIBRARY_PATH
>  
> -NXAGENT_KEYSTROKEFILE=/etc/x2go/keystrokes.cfg
> -export NXAGENT_KEYSTROKEFILE
> -
>  exec $NX_LIBS/../x2go/bin/$NXAPP "$@"
>

LGTM. Thank you!



Mihai

[signature.asc (application/pgp-signature, attachment)]

Send a report that this bug log contains spam.