Code refactoring

4 files changed, 25 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e149acb95f2..fdd09f4beafa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,14 +10,15 @@ pkgbase = xdm-xfreq
 	depends = xorg-xdm
 	depends = xorg-xclock
 	depends = xorg-xmessage
+	depends = xorg-xsetroot
 	depends = xorg-xdpyinfo
+	depends = xorg-twm
+	depends = xdg-utils
+	depends = scrot
+	depends = dmenu
 	depends = gawk
-	optdepends = scrot
 	optdepends = imagemagick
-	optdepends = xorg-xsetroot
-	optdepends = xorg-twm
 	optdepends = numlockx
-	optdepends = xdg-utils
 	backup = etc/xdm-xfreq/Xresources
 	backup = etc/xdm-xfreq/xdm-xfreq.rc
 	backup = etc/xdm-xfreq/xdm-config
diff --git a/PKGBUILD b/PKGBUILD
index 89a50b0b5157..8915dec2ad1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ 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-xdpyinfo' 'gawk')
-optdepends=('scrot' 'imagemagick' 'xorg-xsetroot' 'xorg-twm' 'numlockx' 'xdg-utils')
+depends=('xfreq-git' 'xorg-xdm' 'xorg-xclock' 'xorg-xmessage' 'xorg-xsetroot' 'xorg-xdpyinfo' 'xorg-twm' 'xdg-utils' 'scrot' 'dmenu' 'gawk')
+optdepends=('imagemagick' 'numlockx')
 backup=(etc/xdm-xfreq/Xresources
 	etc/xdm-xfreq/xdm-xfreq.rc
 	etc/xdm-xfreq/xdm-config
diff --git a/Xsetup b/Xsetup
index b04e2d6c5bfb..6294715c10da 100755
--- a/Xsetup
+++ b/Xsetup
@@ -1,6 +1,14 @@
 #!/bin/sh
 source /etc/xdm-xfreq/xdm-xfreq.rc
 
+function PopUp ()
+{
+	$XDM_XFREQ_BUTTONS_PATH $XDM_XFREQ_BUTTONS_ARGS $* "" &
+	PID=$!
+	echo $PID > $XDM_XFREQ_BUTTONS_PID
+	wait $PID
+}
+
 if [[ -v XDM_XFREQ_KEYB_LED_PATH ]]; then
 	$XDM_XFREQ_KEYB_LED_PATH $XDM_XFREQ_KEYB_LED_ARGS
 fi
@@ -20,13 +28,14 @@ fi
 if [[ -v XDM_XFREQ_BUTTONS_PATH ]]; then
   (
     declare -i LOOP=1
+    declare -i RC=0
     while (( LOOP == 1 ))
       do
-	$XDM_XFREQ_BUTTONS_PATH $XDM_XFREQ_BUTTONS_ARGS $XDM_XFREQ_BUTTONS_MENU "";
-	declare -i RC=$?
+	PopUp $XDM_XFREQ_BUTTONS_MENU
+	RC=$?
 	case $RC in
 	99)
-		$XDM_XFREQ_BUTTONS_PATH $XDM_XFREQ_BUTTONS_ARGS $XDM_XFREQ_BUTTONS_SUBMENU ""
+		PopUp $XDM_XFREQ_BUTTONS_SUBMENU
 		RC=$?
 		case $RC in
 		11)
@@ -48,7 +57,7 @@ if [[ -v XDM_XFREQ_BUTTONS_PATH ]]; then
 		esac
 	;;
 	11)
-		$XDM_XFREQ_BUTTONS_PATH $XDM_XFREQ_BUTTONS_ARGS $XDM_XFREQ_BUTTONS_PWROFF ""
+		PopUp $XDM_XFREQ_BUTTONS_PWROFF
 		RC=$?
 		case $RC in
 		11)
@@ -62,7 +71,7 @@ if [[ -v XDM_XFREQ_BUTTONS_PATH ]]; then
 		esac
 	;;
 	12)
-		$XDM_XFREQ_BUTTONS_PATH $XDM_XFREQ_BUTTONS_ARGS $XDM_XFREQ_BUTTONS_HALT ""
+		PopUp $XDM_XFREQ_BUTTONS_HALT
 		RC=$?
 		case $RC in
 		11)
@@ -76,7 +85,7 @@ if [[ -v XDM_XFREQ_BUTTONS_PATH ]]; then
 		esac
 	;;
 	13)
-		$XDM_XFREQ_BUTTONS_PATH $XDM_XFREQ_BUTTONS_ARGS $XDM_XFREQ_BUTTONS_REBOOT ""
+		PopUp $XDM_XFREQ_BUTTONS_REBOOT
 		RC=$?
 		case $RC in
 		11)
@@ -93,7 +102,7 @@ if [[ -v XDM_XFREQ_BUTTONS_PATH ]]; then
 		$XDM_XFREQ_SLEEP_CMD
 	;;
 	15)
-		$XDM_XFREQ_BUTTONS_PATH $XDM_XFREQ_BUTTONS_ARGS $XDM_XFREQ_BUTTONS_RESCUE ""
+		PopUp $XDM_XFREQ_BUTTONS_RESCUE
 		RC=$?
 		case $RC in
 		11)
@@ -113,7 +122,7 @@ if [[ -v XDM_XFREQ_BUTTONS_PATH ]]; then
 	;;
 	esac
       done
-  ) & echo $! > $XDM_XFREQ_BUTTONS_PID
+  ) &
 fi
 
 if [[ -v XDM_XFREQ_GUI_PATH ]]; then
diff --git a/Xstartup b/Xstartup
index c000890365ef..5bda7ae89d3f 100755
--- a/Xstartup
+++ b/Xstartup
@@ -7,8 +7,7 @@ if [ -r $XDM_XFREQ_GUI_PID ]; then
 	rm $XDM_XFREQ_GUI_PID
 fi
 if [ -r $XDM_XFREQ_BUTTONS_PID ]; then
-#	kill $(cat $XDM_XFREQ_BUTTONS_PID) > /dev/null 2>&1
-	killall $XDM_XFREQ_BUTTONS_PATH
+	kill $(cat $XDM_XFREQ_BUTTONS_PID) > /dev/null 2>&1
 	rm $XDM_XFREQ_BUTTONS_PID
 fi
 if [ -r $XDM_XFREQ_CLOCK_PID ]; then