Synergy server.

6 files changed, 44 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10c07addcd38..8147fa734a00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Dec 28 18:36:37 UTC 2015
+# Sun Jan  3 11:21:18 UTC 2016
 pkgbase = xdm-xfreq
 	pkgdesc = A customized XDM for XFreq
-	pkgver = 0.16
+	pkgver = 0.17
 	pkgrel = 1
 	url = http://github.com/cyring/xdm-xfreq
 	install = xdm-xfreq.install
@@ -19,6 +19,7 @@ pkgbase = xdm-xfreq
 	depends = scrot
 	depends = dmenu
 	depends = gawk
+	optdepends = psmisc
 	optdepends = imagemagick
 	optdepends = numlockx
 	backup = etc/xdm-xfreq/xdm-xfreq.rc
@@ -26,6 +27,7 @@ pkgbase = xdm-xfreq
 	source = Xsetup
 	source = Xstartup
 	source = Xsession
+	source = Xreset
 	source = xdm-xfreq.rc
 	source = xdm-xfreq-xdesktops
 	source = xdm-xfreq.service
@@ -40,6 +42,7 @@ pkgbase = xdm-xfreq
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = xdm-xfreq
 
diff --git a/PKGBUILD b/PKGBUILD
index 71d160aaefeb..1065b354fd62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,21 @@
 # Maintainer: CyrIng <xfreq[at]cyring[dot]fr>
 # Contributor: CyrIng <xfreq[at]cyring[dot]fr>
 pkgname=xdm-xfreq
-pkgver=0.16
+pkgver=0.17
 pkgrel=1
 pkgdesc="A customized XDM for XFreq"
 arch=(any)
 license=('GPL')
 url="http://github.com/cyring/xdm-xfreq"
 depends=('xfreq-git' 'xorg-xdm' 'xorg-xclock' 'xorg-xmessage' 'xorg-xsetroot' 'xorg-xdpyinfo' 'xdg-utils' 'xterm' 'scrot' 'dmenu' 'gawk')
-optdepends=('imagemagick' 'numlockx')
+optdepends=('psmisc' 'imagemagick' 'numlockx')
 backup=(etc/xdm-xfreq/xdm-xfreq.rc)
 install=xdm-xfreq.install
 source=(xdm-config
 	Xsetup
 	Xstartup
 	Xsession
+	Xreset
 	xdm-xfreq.rc
 	xdm-xfreq-xdesktops
 	xdm-xfreq.service
@@ -28,6 +29,7 @@ md5sums=('SKIP'
 	 'SKIP'
 	 'SKIP'
 	 'SKIP'
+	 'SKIP'
 	 'SKIP')
 
 package() {
@@ -37,8 +39,8 @@ package() {
   chmod 0755 ${pkgdir}/etc/xdm-xfreq/xdm-xfreq.rc
   ln -s /etc/xdm-xfreq/theme/chocolate.rc ${pkgdir}/etc/xdm-xfreq/xdm-theme.rc
   mkdir -p ${pkgdir}/etc/X11/xdm/xdm-xfreq
-  cp Xsession Xsetup Xstartup xdm-config ${pkgdir}/etc/X11/xdm/xdm-xfreq
-  chmod 0755 ${pkgdir}/etc/X11/xdm/xdm-xfreq/{Xsession,Xsetup,Xstartup}
+  cp Xsession Xsetup Xstartup Xreset xdm-config ${pkgdir}/etc/X11/xdm/xdm-xfreq
+  chmod 0755 ${pkgdir}/etc/X11/xdm/xdm-xfreq/{Xsession,Xsetup,Xstartup,Xreset}
   install -Dm755 ${srcdir}/xdm-xfreq-xdesktops ${pkgdir}/usr/lib/systemd/scripts/xdm-xfreq-xdesktops
   install -Dm0644 ${srcdir}/xdm-xfreq.service ${pkgdir}/usr/lib/systemd/system/xdm-xfreq.service
 }
diff --git a/Xreset b/Xreset
new file mode 100755
index 000000000000..5a81528fdec9
--- /dev/null
+++ b/Xreset
@@ -0,0 +1,11 @@
+#!/bin/sh
+source /etc/xdm-xfreq/xdm-xfreq.rc
+
+if [[ -v XDM_SYNERGYS_STATE ]]; then
+	killall $XDM_SYNERGYS_BIN > /dev/null 2>&1
+fi
+
+chmod 622 /dev/console
+chown root /dev/console
+
+/usr/bin/sessreg -d -w /var/log/wtmp -u /var/run/utmp 	-x /etc/X11/xdm/Xservers -l $DISPLAY -h "" $USER
diff --git a/Xstartup b/Xstartup
index 5bda7ae89d3f..f761815acaf3 100755
--- a/Xstartup
+++ b/Xstartup
@@ -15,6 +15,18 @@ if [ -r $XDM_XFREQ_CLOCK_PID ]; then
 	rm $XDM_XFREQ_CLOCK_PID
 fi
 
+if [[ -v XDM_SYNERGYS_STATE ]]; then
+	pidof $XDM_SYNERGYS_BIN > $XDM_SYNERGYS_PID
+	declare -i STATE=$?
+	if (( $STATE == 1 )); then
+		${XDM_SYNERGYS_AUTH}${USER} > /dev/null 2>&1
+		declare -i RC=$?
+		if (( $RC == 0 )); then
+			$XDM_SYNERGYS_PRE $USER $XDM_SYNERGYS_BIN $XDM_SYNERGYS_ARGS
+		fi
+	fi
+fi
+
 chown $USER /dev/console
 exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/run/utmp" \
         -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/xdm-config b/xdm-config
index 990d2b725e9f..74e2c155394f 100644
--- a/xdm-config
+++ b/xdm-config
@@ -10,11 +10,11 @@ DisplayManager*authorize:	true
 
 DisplayManager._0.setup:	/etc/X11/xdm/xdm-xfreq/Xsetup
 DisplayManager._0.startup:	/etc/X11/xdm/xdm-xfreq/Xstartup
-DisplayManager._0.reset:	/etc/X11/xdm/TakeConsole
+!DisplayManager._0.reset:	/etc/X11/xdm/TakeConsole
 
 DisplayManager*chooser:         /usr/lib/X11/xdm/chooser
 DisplayManager*session:         /etc/X11/xdm/xdm-xfreq/Xsession
-DisplayManager*reset:           /etc/X11/xdm/Xreset
+DisplayManager*reset:           /etc/X11/xdm/xdm-xfreq/Xreset
 
 DisplayManager*authComplain:    true
 DisplayManager*loginmoveInterval:	10
diff --git a/xdm-xfreq.rc b/xdm-xfreq.rc
index 912d53b5c7ec..ed3b28be99a8 100755
--- a/xdm-xfreq.rc
+++ b/xdm-xfreq.rc
@@ -75,6 +75,14 @@ XDM_XFREQ_SLEEP_CMD="systemctl suspend"
 # Rescue level
 XDM_XFREQ_RESCUE_CMD="systemctl rescue"
 
+# Synergy server (Uncomment the following State variable to enable Synergy)
+# XDM_SYNERGYS_STATE="Enable"
+XDM_SYNERGYS_AUTH="xhost +local:"
+XDM_SYNERGYS_BIN="synergys"
+XDM_SYNERGYS_PRE="sudo -u"
+XDM_SYNERGYS_ARGS="-d WARNING --daemon"
+XDM_SYNERGYS_PID=/var/run/xdm-synergys.pid
+
 # Users settings
 USERTMPFS="/var/run/user/$(id --user)"
 if [ -d $USERTMPFS ]; then