[X2Go-Dev] Bug#744: Bug#744: user-local keystrokes.cfg does not work

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