aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorOleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>2015-02-10 19:19:25 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 19:40:49 +0100
commit1681f1110ece0e5ad0accda009f106a2081c660c (patch)
treec556f39eef0fee3845b050a4e51195249945ec91 /nx-X11/programs/Xserver
parent471223907081355a288a315b33a2b70eb4c8fb1e (diff)
downloadnx-libs-1681f1110ece0e5ad0accda009f106a2081c660c.tar.gz
nx-libs-1681f1110ece0e5ad0accda009f106a2081c660c.tar.bz2
nx-libs-1681f1110ece0e5ad0accda009f106a2081c660c.zip
Detect nxagent/x2goagent flavour (200_nxagent_check-binary-x2go-flavour.full.patch).
Whether the agent runs in X2Go or NX mode is decide by the name of the binary that executes the code. Binary name equal to nxagent -> (Free)NX flavour Binary name equal to x2goagent -> X2Go flavour
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.c28
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.h2
2 files changed, 30 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index acd5d419c..1794f1551 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -177,6 +177,29 @@ int nxagentSaveUnder;
int nxagentDoFullGeneration = 1;
+ /*
+ * 1 if agent running as X2goAgent
+ * 0 if NX Agent
+ */
+int nxagentX2go;
+
+/*
+ * Checking if agent is x2go agent
+ */
+
+void checkX2goAgent()
+{
+ extern const char *__progname;
+ if( strcasecmp(__progname,"x2goagent") == 0)
+ {
+ fprintf(stderr, "\nrunning as X2Go Agent\n");
+ nxagentX2go=1;
+ }
+ else
+ nxagentX2go=0;
+}
+
+
/*
* Called at X server's initialization.
*/
@@ -193,6 +216,11 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
#endif
/*
+ * Check if we running as X2Go Agent
+ */
+ checkX2goAgent();
+
+ /*
* Print our pid and version information.
*/
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.h b/nx-X11/programs/Xserver/hw/nxagent/Init.h
index 2dc0f5c02..b516c7b34 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h
@@ -37,6 +37,8 @@ extern int nxagentDoFullGeneration;
extern int nxagentBackingStore;
extern int nxagentSaveUnder;
+extern int nxagentX2go;
+
extern ServerGrabInfoRec nxagentGrabServerInfo;
#endif /* __Init_H__ */