Code refactoring.

8 files changed, 146 insertions, 111 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93fb6b1c18a1..5e9df3205c0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xdm-xfreq
 	pkgdesc = A customized XDM for XFreq
 	pkgver = 0.12
-	pkgrel = 1
+	pkgrel = 2
 	url = http://github.com/cyring/xdm-xfreq
 	install = xdm-xfreq.install
 	arch = any
@@ -20,15 +20,11 @@ pkgbase = xdm-xfreq
 	depends = gawk
 	optdepends = imagemagick
 	optdepends = numlockx
-	backup = etc/xdm-xfreq/Xresources
-	backup = etc/xdm-xfreq/xdm-xfreq.rc
-	backup = etc/xdm-xfreq/xdm-config
 	backup = etc/xdm-xfreq/twm-xfreq.rc
 	backup = etc/xdm-xfreq/twm-xfreq.Xresources
 	source = xdm-config
 	source = Xsetup
 	source = Xstartup
-	source = Xresources
 	source = Xsession
 	source = xdm-xfreq.rc
 	source = xdm-xfreq-xdesktops
@@ -48,7 +44,6 @@ pkgbase = xdm-xfreq
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = SKIP
 
 pkgname = xdm-xfreq
 
diff --git a/PKGBUILD b/PKGBUILD
index c76599c9ab18..1be6ffc3e916 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,19 @@
 # Contributor: CyrIng <xfreq[at]cyring[dot]fr>
 pkgname=xdm-xfreq
 pkgver=0.12
-pkgrel=1
+pkgrel=2
 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' 'xorg-twm' 'xdg-utils' 'xterm' 'scrot' 'dmenu' 'gawk')
 optdepends=('imagemagick' 'numlockx')
-backup=(etc/xdm-xfreq/Xresources
-	etc/xdm-xfreq/xdm-xfreq.rc
-	etc/xdm-xfreq/xdm-config
-	etc/xdm-xfreq/twm-xfreq.rc
+backup=(etc/xdm-xfreq/twm-xfreq.rc
 	etc/xdm-xfreq/twm-xfreq.Xresources)
 install=xdm-xfreq.install
 source=(xdm-config
 	Xsetup
 	Xstartup
-	Xresources
 	Xsession
 	xdm-xfreq.rc
 	xdm-xfreq-xdesktops
@@ -37,13 +33,14 @@ md5sums=('SKIP'
 	 'SKIP'
 	 'SKIP'
 	 'SKIP'
-	 'SKIP'
 	 'SKIP')
 
 package() {
-  mkdir -p ${pkgdir}/etc/xdm-xfreq
-  cp Xresources xdm-xfreq.rc xdm-config twm-xfreq.rc twm-xfreq.Xresources ${pkgdir}/etc/xdm-xfreq
+  mkdir -p ${pkgdir}/etc/xdm-xfreq/theme
+  cp chocolate.rc ${pkgdir}/etc/xdm-xfreq/theme
+  cp xdm-xfreq.rc xdm-config twm-xfreq.rc twm-xfreq.Xresources ${pkgdir}/etc/xdm-xfreq
   chmod 0755 ${pkgdir}/etc/xdm-xfreq/xdm-xfreq.rc
+  ln -s ${pkgdir}/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 ${pkgdir}/etc/X11/xdm/xdm-xfreq
   chmod 0755 ${pkgdir}/etc/X11/xdm/xdm-xfreq/{Xsession,Xsetup,Xstartup}
diff --git a/Xresources b/Xresources
deleted file mode 100644
index 8e0358fb2514..000000000000
--- a/Xresources
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "/var/run/xdm-xfreq-xdesktops"
-
-*Foreground:#cc4c00
-*Background:#2a0308
-
-Xcursor.theme:whiteglass
-
-!xlogin*login.translations: #override \
-!        Ctrl<Key>R: abort-display()\n\
-!        <Key>F1: set-session-argument(failsafe) finish-field()\n\
-!        <Key>Delete: delete-character()\n\
-!        <Key>Left: move-backward-character()\n\
-!        <Key>Right: move-forward-character()\n\
-!        <Key>Home: move-to-begining()\n\
-!        <Key>End: move-to-end()\n\
-!        Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()\n\
-!        <Key>KP_Enter: set-session-argument() finish-field()\n\
-!        Ctrl<Key>Return: set-session-argument(failsafe) finish-field()\n\
-!        <Key>Return: set-session-argument() finish-field()
-
-!xlogin*greeting: Welcome to CLIENTHOST
-
-!xlogin*width:560
-!xlogin*height:192
-!xlogin.Login.namePrompt:Login:
-!xlogin.Login.passwdPrompt:Password:
-!xlogin.Login.allowNullPasswd:false
-!xlogin.Login.echoPasswd:false
-!xlogin.Login.echoPasswdChar:*
-xlogin*fail:Access denied
-!xlogin.Login.failTimeout:10
-xlogin*greetFont:-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*
-xlogin*greetFace:DejaVuSans-8
-xlogin*face:Sans-9
-xlogin*font:-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
-xlogin*promptFont:-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
-xlogin.Login.promptFace:DejaVuSans-9
-xlogin*failFont:-*-arial-*-i-*-*-*-*-*-*-*-*-*-*
-xlogin.Login.failFace:DejaVuSans-9:bold:italic
-xlogin*sepWidth:0
-xlogin*borderWidth:1
-xlogin*frameWidth:1
-xlogin*innerFramesWidth:2
-xlogin*shdColor:#404040
-xlogin*hiColor:#737373
-xlogin*background:#2a0308
-xlogin*foreground:white
-xlogin*greetColor:#cc4c00
-xlogin*failColor:yellow
-!xlogin*logoFileName:/usr/share/xdm/pixmaps/xorg.xpm
-xlogin*useShape:true
-xlogin*logoPadding:0
-
-!Xmessage*geometry:2304x32+0-0
-Xmessage*message.scrollVertical:never
-Xmessage*message.scrollHorizontal:never
-Xmessage*borderWidth:0
-Xmessage*Text.borderWidth:0
-Xmessage*Command.highlightThickness:1
-Xmessage*Command.internalWidth:12
-Xmessage*Command.internalHeight:4
-Xmessage*Command.shapeStyle:rectangle
-Xmessage*font:-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
-Xmessage*Text.face:DejaVuSans-9
-
-!XClock*geometry:256x32-0-0
-XClock*analog:false
-XClock*strftime:%a %e %b %H:%M:%S
-XClock*update:1
-XClock*borderWidth:0
-!XClock*Command.internalHeight:8
-!XClock.width:64
-XClock*face:DejaVuSans-10
-
-!Chooser*geometry:256x128+0+0
-Chooser*allowShellResize:false
-Chooser*viewport.forceBars:false
-Chooser*label.font:-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
-Chooser*label.face:DejaVuSans-9
-Chooser*label.label:XDMCP Host Menu from CLIENTHOST
-Chooser*list.face:DejaVuSans-9
-Chooser*Command.Face:DejaVuSans-9
diff --git a/chocolate.rc b/chocolate.rc
new file mode 100755
index 000000000000..c7c525a0d286
--- /dev/null
+++ b/chocolate.rc
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+# General
+FOREGROUND="#cc4c00"
+BACKGROUND="#2a0308"
+## WALLPAPER="/etc/wallpaper.jpg"
+
+# Greeter
+GREETFONT="-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*"
+GREETFACE="DejaVuSans-8"
+
+GREETFOREGROUND="#cc4c00"
+
+
+# Login
+LOGINFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
+LOGINFACE="Sans-9"
+
+PROMPTFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
+PROMPTFACE="DejaVuSans-9"
+
+FAILFONT="-*-arial-*-i-*-*-*-*-*-*-*-*-*-*"
+FAILFACE="DejaVuSans-9:bold:italic"
+FAILTEXT="Access denied"
+FAILTIMEOUT="10"
+
+LOGINBACKGROUND="#2a0308"
+LOGINFOREGROUND="white"
+LOGINSHDCOLOR="#404040"
+LOGINHICOLOR="#737373"
+FAILFOREGROUND="yellow"
+
+# Chooser
+LABELFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
+LABELFACE="DejaVuSans-9"
+LISTFACE="DejaVuSans-9"
+CMDFACE="DejaVuSans-9"
+
+# Logo
+## LOGOFILENAME="/usr/share/xdm/pixmaps/xorg.xpm"
+LOGOPADDING="0"
+
+# Menu
+MENUFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
+MENUFACE="DejaVuSans-9"
+MENUGEOMETRY="$(( $WIDTH - 256 ))x32+0-0"
+
+# Clock
+CLOCKFACE="DejaVuSans-10"
+CLOCKFORMAT="%a %e %b %H:%M:%S"
+CLOCKUPDATE="1"
+CLOCKGEOMETRY="256x32-0-0"
+
+# Notification
+NOTIFYTIMEOUT="15"
+NOTIFYGEOMETRY="+24-64"
+
+# XFreq
+XFREQFOREGROUND="0x994c00"
+XFREQBACKGROUND=$BACKGROUND
diff --git a/xdm-config b/xdm-config
index 0d5a69a3e2b5..24bf9dedf875 100644
--- a/xdm-config
+++ b/xdm-config
@@ -2,9 +2,9 @@ DisplayManager.authDir:		/var/lib/xdm
 DisplayManager.errorLogFile:	/var/log/xdm.log
 DisplayManager.pidFile:		/var/run/xdm.pid
 DisplayManager.keyFile:		/etc/X11/xdm/xdm-keys
-DisplayManager.servers:		:0 local /usr/bin/X :0 vt1
+DisplayManager.servers:		:0 local /usr/bin/X :0 vt11
 DisplayManager.accessFile:	/etc/X11/xdm/Xaccess
-DisplayManager*resources:	/etc/xdm-xfreq/Xresources
+DisplayManager*resources:	/var/run/xdm-xfreq-xdesktops
 DisplayManager.willing:		su nobody -s /bin/sh -c /etc/X11/xdm/Xwilling
 DisplayManager*authorize:	true
 
diff --git a/xdm-xfreq-xdesktops b/xdm-xfreq-xdesktops
index 6667c7e18717..c7a1dc374d0e 100755
--- a/xdm-xfreq-xdesktops
+++ b/xdm-xfreq-xdesktops
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+source /etc/xdm-xfreq/xdm-xfreq.rc
+
 declare -i X=0
 case $# in
 3)
@@ -54,6 +56,65 @@ case $# in
 		echo "    <Key>Return: set-session-argument($A) finish-field()" >> /var/run/xdm-xfreq-xdesktops
 		echo "" >> /var/run/xdm-xfreq-xdesktops
 		echo $G >> /var/run/xdm-xfreq-xdesktops
+
+		echo "*Foreground:"$FOREGROUND >> /var/run/xdm-xfreq-xdesktops
+		echo "*Background:"$BACKGROUND >> /var/run/xdm-xfreq-xdesktops
+
+		echo "xlogin*greetFont:"$GREETFONT >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*greetFace:"$GREETFACE >> /var/run/xdm-xfreq-xdesktops
+
+		echo "xlogin*font:"$LOGINFONT >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*face:"$LOGINFACE >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*promptFont:"$PROMPTFONT >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin.Login.promptFace:"$PROMPTFACE >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*failFont:"$FAILFONT >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin.Login.failFace:"$FAILFACE >> /var/run/xdm-xfreq-xdesktops
+
+		echo "xlogin*greetColor:"$GREETFOREGROUND >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*background:"$LOGINBACKGROUND >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*foreground:"$LOGINFOREGROUND >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*shdColor:"$LOGINSHDCOLOR >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*hiColor:"$LOGINHICOLOR >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*failColor:"$FAILFOREGROUND >> /var/run/xdm-xfreq-xdesktops
+
+		echo "xlogin*fail:"$FAILTEXT >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin.Login.failTimeout:"$FAILTIMEOUT >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*sepWidth:0" >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*borderWidth:1" >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*frameWidth:1" >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*innerFramesWidth:2" >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*useShape:true" >> /var/run/xdm-xfreq-xdesktops
+
+		if [[ -v LOGOFILENAME ]]; then
+			echo "xlogin*logoFileName:"$LOGOFILENAME >> /var/run/xdm-xfreq-xdesktops
+		fi
+		echo "xlogin*logoPadding:"$LOGOPADDING >> /var/run/xdm-xfreq-xdesktops
+
+		echo "Chooser*label.font:"$LABELFONT >> /var/run/xdm-xfreq-xdesktops
+		echo "Chooser*label.face:"$LABELFACE >> /var/run/xdm-xfreq-xdesktops
+		echo "Chooser*list.face:"$LISTFACE >> /var/run/xdm-xfreq-xdesktops
+		echo "Chooser*Command.Face:"$CMDFACE >> /var/run/xdm-xfreq-xdesktops
+		echo "Chooser*allowShellResize:false" >> /var/run/xdm-xfreq-xdesktops
+		echo "Chooser*viewport.forceBars:false" >> /var/run/xdm-xfreq-xdesktops
+		echo "Chooser*label.label:XDMCP Host Menu from CLIENTHOST" >> /var/run/xdm-xfreq-xdesktops
+
+		echo "Xmessage*font:"$MENUFONT >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*Text.face:"$MENUFACE >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*message.scrollVertical:never" >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*message.scrollHorizontal:never" >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*borderWidth:0" >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*Text.borderWidth:0" >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*Command.highlightThickness:1" >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*Command.internalWidth:12" >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*Command.internalHeight:4" >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*Command.shapeStyle:rectangle" >> /var/run/xdm-xfreq-xdesktops
+
+		echo "XClock*face:"$CLOCKFACE >> /var/run/xdm-xfreq-xdesktops
+		echo "XClock*strftime:"$CLOCKFORMAT >> /var/run/xdm-xfreq-xdesktops
+		echo "XClock*update:"$CLOCKUPDATE >> /var/run/xdm-xfreq-xdesktops
+		echo "XClock*analog:false" >> /var/run/xdm-xfreq-xdesktops
+		echo "XClock*borderWidth:0" >> /var/run/xdm-xfreq-xdesktops
+
 		exit 0
 	else
 		echo "$(basename $0): cannot access $P: No such directory."
diff --git a/xdm-xfreq.install b/xdm-xfreq.install
index 0037ef26ec02..897a1d8c6303 100644
--- a/xdm-xfreq.install
+++ b/xdm-xfreq.install
@@ -3,9 +3,8 @@ cat << EOF
 To enable and start the Display Manager, execute:
   systemctl enable xdm-xfreq
   systemctl start xdm-xfreq
-The theme can be customized in the following files:
-  /etc/xdm-xfreq/Xresources
-  /etc/xdm-xfreq/xdm-xfreq.rc
+Theme is linked from the following file:
+  /etc/xdm-xfreq/xdm-theme.rc -> /etc/xdm-xfreq/theme/your-theme.rc
 EOF
 }
 
diff --git a/xdm-xfreq.rc b/xdm-xfreq.rc
index 0bf5f79009c5..7aeca28d4c7a 100755
--- a/xdm-xfreq.rc
+++ b/xdm-xfreq.rc
@@ -2,9 +2,12 @@
 
 read WIDTH HEIGHT <<< $(xdpyinfo | awk -F'[ x]+' '/dimensions:/{print $3, $4}')
 
+source /etc/xdm-xfreq/xdm-theme.rc
+
+
 # Keyboard NumLock ON
-# XDM_XFREQ_KEYB_LED_PATH=numlockx
-# XDM_XFREQ_KEYB_LED_ARGS=""
+XDM_XFREQ_KEYB_LED_PATH=numlockx
+XDM_XFREQ_KEYB_LED_ARGS=""
 
 # Screen settings
 XDM_XFREQ_SCREEN_SET_PATH=xset
@@ -12,20 +15,22 @@ XDM_XFREQ_SCREEN_SET_ARGS="dpms"
 
 # Background color
 XDM_XFREQ_BG_COLOR_PATH=xsetroot
-XDM_XFREQ_BG_COLOR_ARGS="-solid #2a0308"
+XDM_XFREQ_BG_COLOR_ARGS="-solid $BACKGROUND"
 
 # Background picture
-# XDM_XFREQ_BG_WALLPAPER_PATH=display
-# XDM_XFREQ_BG_WALLPAPER_ARGS="-backdrop -window root /etc/xdm-xfreq/wallpaper.jpg"
+if [[ -v WALLPAPER ]]; then
+	XDM_XFREQ_BG_WALLPAPER_PATH=display
+	XDM_XFREQ_BG_WALLPAPER_ARGS="-backdrop -window root $WALLPAPER"
+fi
 
 # Clock settings
 XDM_XFREQ_CLOCK_PATH=xclock
-XDM_XFREQ_CLOCK_ARGS="-geometry 256x32-0-0 -twentyfour"
+XDM_XFREQ_CLOCK_ARGS="-twentyfour -geometry $CLOCKGEOMETRY"
 XDM_XFREQ_CLOCK_PID="/var/run/xdm-xfreq-clock.pid"
 
 # Buttons and Notify settings
 XDM_XFREQ_BUTTONS_PATH=xmessage
-XDM_XFREQ_BUTTONS_ARGS="-geometry $(( $WIDTH - 256 ))x32+0-0"
+XDM_XFREQ_BUTTONS_ARGS="-geometry $MENUGEOMETRY"
 XDM_XFREQ_BUTTONS_PID="/var/run/xdm-xfreq-buttons.pid"
 XDM_XFREQ_BUTTONS_MENU="-buttons \:\):99,PowerOff:11,Halt:12,Reboot:13,Sleep:14,Rescue:15"
 XDM_XFREQ_BUTTONS_PWROFF="-buttons PowerOff?:11,Cancel?:12 -default Cancel? -timeout 6"
@@ -35,7 +40,7 @@ XDM_XFREQ_BUTTONS_RESCUE="-buttons Rescue?:11,Cancel?:12 -default Cancel? -timeo
 XDM_XFREQ_BUTTONS_SUBMENU="-buttons \<\<:99,Screenshot:11,ScreenSaver=5min:20,ScreenSaver=7min:21,ScreenSaver=10min:22,ScreenSaver=12min:23,ScreenSaver=15min:24,ScreenSaver=20min:25"
 
 XDM_XFREQ_NOTIFY_PATH=xmessage
-XDM_XFREQ_NOTIFY_ARGS="-geometry +24-64 -timeout 15 -buttons"
+XDM_XFREQ_NOTIFY_ARGS="-geometry $NOTIFYGEOMETRY -timeout $NOTIFYTIMEOUT -buttons"
 
 # Screenshot
 XDM_XFREQ_SCREENSHOT_PATH=scrot
@@ -51,7 +56,7 @@ XDM_XFREQ_SCREENSAVER[5]=1500
 
 # XFreq
 XDM_XFREQ_GUI_PATH=xfreq-gui
-XDM_XFREQ_GUI_ARGS="-D 0 -f 0x994c00 -l 1 -w 1 -n 1 -N 1 -I 0x1000 -U 0x21 -g 0:0x0+24-48,1:0x0-24+16,2:0x0+24+16,3:0x0+540+16,4:0x0-24-48,5:0x0+540-48"
+XDM_XFREQ_GUI_ARGS="-D 0 -f $XFREQFOREGROUND -b $XFREQBACKGROUND -l 1 -w 1 -n 1 -N 1 -I 0x1000 -U 0x21 -g 0:0x0+24-48,1:0x0-24+16,2:0x0+24+16,3:0x0+540+16,4:0x0-24-48,5:0x0+540-48"
 XDM_XFREQ_GUI_PID=/var/run/xdm-xfreq-gui.pid
 
 # PowerOff