Adapt paths of keystrokes.cfg if nxagent runs as x2goagent…

debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch

-Description: Adapt paths of keystrokes.cfg if nxagent runs as x2goagent
-Author: Horst Schirmeier <horst@schirmeier.com>
-
---- 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);

debian/patches/series

-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

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);