From unknown Tue Apr 28 07:58:02 2026 X-Loop: owner@bugs.x2go.org Subject: Bug#744: [X2Go-Dev] Bug#744: user-local keystrokes.cfg does not work Reply-To: Horst Schirmeier , 744@bugs.x2go.org Resent-From: Horst Schirmeier Resent-To: x2go-dev@lists.x2go.org Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Mon, 19 Jan 2015 08:55:01 +0000 Resent-Message-ID: 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.14216574786993 (code B ref 744); Mon, 19 Jan 2015 08:55:01 +0000 Received: (at 744) by bugs.x2go.org; 19 Jan 2015 08:51:18 +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,URIBL_BLOCKED autolearn=ham version=3.3.2 Received: from quickstop.soohrt.org (quickstop.soohrt.org [85.131.246.152]) by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id 9AE625DEA2 for <744@bugs.x2go.org>; Mon, 19 Jan 2015 09:51:16 +0100 (CET) Received: (qmail 17994 invoked by uid 1014); 19 Jan 2015 08:51:15 -0000 Date: Mon, 19 Jan 2015 09:51:15 +0100 From: Horst Schirmeier To: Mike Gabriel Cc: Mihai Moldovan , 744@bugs.x2go.org Message-ID: <20150119085114.GT22378@quickstop.soohrt.org> References: <20150115151045.GI22378@quickstop.soohrt.org> <54B829B7.4030902@ionic.de> <20150115225649.Horde.HcPP3grdrOF4uhHQn4l8_w4@mail.das-netzwerkteam.de> <20150116141105.GO22378@quickstop.soohrt.org> <20150119083549.Horde.SBd4zm4DEnASVOfHRsUVug1@mail.das-netzwerkteam.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="63aIh6YiuHX+oBFP" Content-Disposition: inline In-Reply-To: <20150119083549.Horde.SBd4zm4DEnASVOfHRsUVug1@mail.das-netzwerkteam.de> User-Agent: Mutt/1.5.21 (2010-09-15) --63aIh6YiuHX+oBFP Content-Type: multipart/mixed; boundary="ftQmbtOmUf2cr8rB" Content-Disposition: inline --ftQmbtOmUf2cr8rB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Mike, On Mon, 19 Jan 2015, Mike Gabriel wrote: > The patch looks ok. However, two things... >=20 > (1) can you re-send that patch as an attachment (not as an inline > text)? (I have been struggling with extracting inline patches from > mail bodies in the past with a lot of hassle on my side, so I am > prophylactically asking without even having tried to apply your > sent-in (inline-text) patch). Sure. > (2) I am tempted to merge that patch into patch 320. Would that be > ok with you? 320 is generally useful for nxagent and could be merged into its codebase one day. Mine is x2go specific. This objection aside, feel free to merge the patches, sure! :) Horst --=20 PGP-Key 0xD40E0E7A --ftQmbtOmUf2cr8rB Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-patch-for-x2go-specific-keystroke-configuration-file.patch" Content-Transfer-Encoding: quoted-printable =46rom fccaa20d36e401d17f958ad1028682c837f2be16 Mon Sep 17 00:00:00 2001 =46rom: Horst Schirmeier Date: Fri, 16 Jan 2015 14:00:09 +0100 Subject: [PATCH] patch for x2go-specific keystroke configuration files, ena= ble 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-conf= ig.full.patch diff --git a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full= =2Epatch b/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.p= atch 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 */ +=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 "$@" --=20 2.2.1.62.g3f15098 --ftQmbtOmUf2cr8rB-- --63aIh6YiuHX+oBFP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlS8xYIACgkQB6mkGNQODnp9NgCeIpzhgUFeoAU+7hBMaLkyh1lQ zWwAn20+F/D8Z+S1yNnQBmN5jstYjO33 =Fpij -----END PGP SIGNATURE----- --63aIh6YiuHX+oBFP--