From unknown Fri Mar 29 09:15:09 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#744: [X2Go-Dev] Bug#744: user-local keystrokes.cfg does not work Reply-To: Mike Gabriel , 744@bugs.x2go.org Resent-From: Mike Gabriel Resent-To: x2go-dev@lists.x2go.org Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Mon, 19 Jan 2015 08:40: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.14216565545663 (code B ref 744); Mon, 19 Jan 2015 08:40:01 +0000 Received: (at 744) by bugs.x2go.org; 19 Jan 2015 08:35:54 +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 freya.das-netzwerkteam.de (freya.das-netzwerkteam.de [88.198.48.199]) by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id E2CA45DEA2 for <744@bugs.x2go.org>; Mon, 19 Jan 2015 09:35:50 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98]) by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 7A1C3B2E; Mon, 19 Jan 2015 09:35:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 14A3F3C08E; Mon, 19 Jan 2015 09:35:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de Received: from grimnir.das-netzwerkteam.de ([127.0.0.1]) by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16uZjlqwn94b; Mon, 19 Jan 2015 09:35:49 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id B04593BBB7; Mon, 19 Jan 2015 09:35:49 +0100 (CET) Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP; Mon, 19 Jan 2015 08:35:49 +0000 Date: Mon, 19 Jan 2015 08:35:49 +0000 Message-ID: <20150119083549.Horde.SBd4zm4DEnASVOfHRsUVug1@mail.das-netzwerkteam.de> From: Mike Gabriel To: Horst Schirmeier Cc: Mihai Moldovan , 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> User-Agent: Internet Messaging Program (IMP) H5 (6.2.2) Accept-Language: en,de Organization: DAS-NETZWERKTEAM X-Originating-IP: 178.62.101.154 X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101 Firefox/32.0 Iceweasel/32.0 Content-Type: multipart/signed; boundary="=_XBQ-YrBoTt9XTHK73m5q_g1"; protocol="application/pgp-signature"; micalg=pgp-sha1 MIME-Version: 1.0 This message is in MIME format and has been PGP signed. --=_XBQ-YrBoTt9XTHK73m5q_g1 Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Control: tag -1 patch Hi Horst, On Fr 16 Jan 2015 15:11:05 CET, Horst Schirmeier wrote: > On Thu, 15 Jan 2015, Mike Gabriel wrote: >> >Do we actually WANT to make ~/.nx/foo override /etc/x2go/foo *for >> >> First: We want to allow users to override system-wide settings by >> user settings. >> >> >x2goagent*? Or do we rather want to get rid of ~/.nx and /etc/nxagent >> >entirely within x2go components (which, really, would make some sort of >> >sense, especially if $SOMETHING created ~/.nx/config/keystrokes.cfg and >> >users wonder why /etc/x2go/keystrokes.cfg does not take any effect.) >> >> This indeed is a bit of a drama, I agree. >> >> 1. We want to provide NX-X11 to people who still use NX (e.g. FreeNX). >> >> To provide this, we have to think generically here. Paths like ~/.nx >> or /etc/nxagent/ are hard-coded in NX-X11 and nxagent and I think >> that is ok. All X2Go'ish paths should be overridden via env vars or >> otherwise. >> >> In nxagent, there is some code that checks ARGV[0] (=3D=3D nxagent? =3D= =3D >> x2goagent?) and triggers the branding of start-up screens of desktop >> sessions (the gray X2GO logo). >> >> Maybe for setting paths (esp. ~/.x2go/keystrokes.cfg), some similar >> mechanism should be used? > > How about this variant? > > patch for x2go-specific keystroke configuration files, enable user-local > keystrokes.cfg > --- > ...agent_x2go-specific-keystroke-config.full.patch | 22=20=20 >=20++++++++++++++++++++++ > debian/patches/series | 1 + > debian/wrappers/x2goagent | 3 --- > 3 files changed, 23 insertions(+), 3 deletions(-) > create mode 100644=20=20 >=20debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch > > diff --git=20=20 >=20a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch= =20=20 >=20b/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.patc= h > [...] The patch looks ok. However, two things... (1) can you re-send that patch as an attachment (not as an inline=20=20 text)?=20(I have been struggling with extracting inline patches from=20=20 mail=20bodies in the past with a lot of hassle on my side, so I am=20=20 prophylactically=20asking without even having tried to apply your=20=20 sent-in=20(inline-text) patch). (2) I am tempted to merge that patch into patch 320. Would that be ok=20=20 with=20you? Mike --=20 DAS-NETZWERKTEAM mike=20gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x= fb --=_XBQ-YrBoTt9XTHK73m5q_g1 Content-Type: application/pgp-signature Content-Description: Digitale PGP-Signatur Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUvMHlAAoJEJr0azAldxsxf60P/0XL9HRYnB/qLNOYaie2RokB I07AAFrMD+uozTs9RYS+3ZHcl4GR0oItxY9bspreDJRXIHtRKtj/rUMKxa0yO/rm cqz7hIKVbv5k7w2c5GO8liykQLEyslf94bSVzmD869cEm4ZLSPit3DH+K0BfNCmG PJS3EpEGrRNCcb/UtZlKoyFs2t7v7U7low+bgPOdbd6xYZ/0aYPY5yr4OaBNM3BL VQigjKhPDs634ypjt7lnaBDKlBr1l7hFYr/bE0vtAmExipIZDsmKeS2qzlxiuD/m uvKkz7p6NsCmJIRBeRydRBD/tU7NvDK+PZUmwaO6q6YbybUqXfLD8YqDFG0a4Deh R9kkf/uqZRJcap9ko9lRk+4tsRO1tE9GB7t+zF7vnyqrtmNQkggx3p3oBPtytS86 Y0i+fG0wg0hNBTILXYReUfYAUMv71JiVQHvzA/QpiEX+7KW4G1XesJSthSpLnwdO H3rAIQwcWe3BZRg6Osm1gqNDnIVCqzUPCQuEs5n7sISY1vBJS/nZdu7+WcdFud2X 0kXBsGPgvS2RcymkOW9xJ9Kb/SzUNLdrEwU7Zjq3CrjCt22TloqBSD51MeK6VMNz owV6jdkznVXUuSJUHsN9TiSmeO6abfJOeN+B2kkrKKqTWlju7gDabEOD0ZFqWdXt 1QhAvGA1eDQcp02nKS8R =hDA5 -----END PGP SIGNATURE----- --=_XBQ-YrBoTt9XTHK73m5q_g1--