From 522cf0089e4db707346c25d826c33e92ef09db8a Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 7 Oct 2015 21:33:55 +0200
Subject: X2Go Agent: Add x2goagent.features file that informs X2Go clients
 about the new RandR based Xinerama feature.

---
 Makefile                 |  9 +++++++++
 debian/x2goagent.install |  1 +
 x2goagent.features       | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 x2goagent.features

diff --git a/Makefile b/Makefile
index 14f6e4266..c9a52ac02 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ USRLIBDIR   ?= $(LIBDIR)
 INCLUDEDIR  ?= $(PREFIX)/include
 NXLIBDIR    ?= $(PREFIX)/lib/nx
 X2GOLIBDIR  ?= $(PREFIX)/lib/x2go
+X2GODATADIR  ?= $(PREFIX)/share/x2go
 CONFIGURE   ?= ./configure
 
 NX_VERSION_MAJOR=$(shell ./version.sh 1)
@@ -163,6 +164,10 @@ install-full:
 	$(INSTALL_FILE) etc/nxagent.keyboard $(DESTDIR)$(ETCDIR_NX)/
 	$(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR_X2GO)/
 
+	# x2goagent.features file for X2Go
+	$(INSTALL_DIR) $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/
+	$(INSTALL_FILE) x2goagent.features $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/
+
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go
 	$(INSTALL_SYMLINK) $(ETCDIR_X2GO)/rgb $(DESTDIR)$(PREFIX)/share/x2go/rgb
 
@@ -191,6 +196,10 @@ uninstall-full:
 	$(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent
 	$(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
 
+	# x2goagent.features file for X2Go
+	$(RM_FILE) $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/x2goagent.features
+	$(RM_DIR)  $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/
+
 	if test -d nx-X11; then \
 	    if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \
 	    if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \
diff --git a/debian/x2goagent.install b/debian/x2goagent.install
index 9ef17d9c6..0603507ef 100644
--- a/debian/x2goagent.install
+++ b/debian/x2goagent.install
@@ -5,5 +5,6 @@ usr/share/x2go/rgb
 usr/share/man/man1/x2goagent.1*
 etc/x2go/rgb
 usr/share/x2go/versions/VERSION.x2goagent
+usr/share/x2go/x2gofeature.d/x2goagent.features
 etc/x2go/keystrokes.cfg
 etc/x2go/x2goagent.keyboard
diff --git a/x2goagent.features b/x2goagent.features
new file mode 100644
index 000000000..12d62e01c
--- /dev/null
+++ b/x2goagent.features
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Copyright (C) 2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# silently bail out if X2Go Server is not installed
+if ! which x2gopath 1>/dev/null; then
+    exit 0
+fi
+
+X2GO_LIB_PATH="$(x2gopath libexec)";
+
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+
+X2GO_FEATURE=$1
+
+# check for X2Go Agent features
+case "$X2GO_FEATURE" in
+
+    "X2GOAGENT_RANDRXINERAMA") echo "ok"; exit 0;;
+    *) exit -1;;
+
+esac
-- 
cgit v1.2.3