From ionic@ionic.de Fri Jan 16 15:29:06 2015 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 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 , Mike Gabriel CC: 744@bugs.x2go.org Subject: Re: [X2Go-Dev] Bug#744: user-local keystrokes.cfg does not work 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" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --hlScsTL6bvgEAloqgRl9JIOqScmCxAEo9 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 16.01.2015 03:11 PM, Horst Schirmeier wrote: > How about this variant? > > patch for x2go-specific keystroke configuration files, enable user-loca= l > 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.fu= ll.patch > new file mode 100644 > index 0000000..8ab4f93 > --- /dev/null > +++ b/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.pa= tch > @@ -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 */ > +=20 > + #include > +=20 > +@@ -261,6 +262,11 @@ static void parse_keystroke_file(void) > + char *homefile =3D "/.nx/config/keystrokes.cfg"; > + char *etcfile =3D "/etc/nxagent/keystrokes.cfg"; > +=20 > ++ if (nxagentX2go) { > ++ homefile =3D "/.x2go/config/keystrokes.cfg"; > ++ etcfile =3D "/etc/x2go/keystrokes.cfg"; > ++ } > ++ > + if (nxagentKeystrokeFile !=3D NULL && access(nxagentKeystrokeFile, = R_OK) =3D=3D 0) > + { > + filename =3D 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= =3D$NX_LIBS > =20 > export LD_LIBRARY_PATH > =20 > -NXAGENT_KEYSTROKEFILE=3D/etc/x2go/keystrokes.cfg > -export NXAGENT_KEYSTROKEFILE > - > exec $NX_LIBS/../x2go/bin/$NXAPP "$@" > LGTM. Thank you! Mihai --hlScsTL6bvgEAloqgRl9JIOqScmCxAEo9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCgAGBQJUuSAwAAoJEB/WLtluJTqHyQsP/jWUDCaAG/gK+8AInX3aSXLn 8Fw3BFTZqvUZY3udK1zrHYe8G+/f5euFKwEub/gDy2XtOKXyegkgRbQaZ1GfKwif 694i2Z5GCWL07ZVTdSfGa+wQufCMe5uGV4pdl0XYDiHJcLqPAAP/Hwizgz7gYXo0 MUFgNuwKpFKjhGrtjDyoFSgz4/RpfFwqml1twhUhkS5V6WBJ8K8UC7TrmPRk096h R96H++fHRf3dzVTdlEoHjhWTFlSCG6mcLe4mGTyHPCi7c04b5HwzknVF1iPbUY+F 7dAK7t/YQ67t4r4AQ/CDeVsTjAqTZQUyC05mdX+puFt5lmVWki52W62SWb5TBL09 1tiDydha8jWoHP00dAxgpaQgBQ0d6+xIqrXU14cdYiWFFwOjeVmAtVjpmRXDerbj sq+uD1a2MbBN46uUyHO1j0bZghRAnBJrNGK9EE9AebUlcAi88ZfEdGrY0vAAwmWU MJ2GAoVecNcQNOtIEMLh88GpFJ56c+jvgZbcyDNFtpgesn7dEJC2OhpJFiA15oZB 9Mhjx2/6KmWYk7E4OjZma5RQj7KcPNj1PDFmaLmBD9u50cGzcIbuA6E2hkxIAznc vCRMCrV5x/XntgO5IqQ7G82AcxQgxVLN+CBCoA0YPqG4CuCtRvAL238kMDyXOw61 5fyyW9zYGUF7ga1StkPc =lwu+ -----END PGP SIGNATURE----- --hlScsTL6bvgEAloqgRl9JIOqScmCxAEo9--