--- trunk/splashutils-magellan/splash	2005/03/04 18:09:01	5
+++ trunk/splashutils-magellan/splash	2005/03/04 18:22:17	6
@@ -7,11 +7,13 @@
 #
 # Author: Michal Januszewski <spock@gentoo.org>
 #
-# $Header: /root/magellan-cvs/src/splashutils-magellan/splash,v 1.1 2005-03-04 18:09:01 niro Exp $
+# $Header: /root/magellan-cvs/src/splashutils-magellan/splash,v 1.2 2005-03-04 18:22:17 niro Exp $
 
 # this is a little hack that we use to avoid a hell lot of error msgs 
 # when sourcing splash configuration files
 function box() { true; }
+function icon() { true; }
+function rect() { true; }
 
 test -f /etc/conf.d/splash && . /etc/conf.d/splash
 test -f /etc/conf.d/rc && . /etc/conf.d/rc
@@ -37,7 +39,6 @@
 themefile="/etc/splash/${SPLASH_THEME}/$res.cfg"
 test -f "${themefile}" && . "${themefile}"
 
-
 print_text() {
 	text="Booting the system... Press F2 for verbose mode"
 	[ -n "${SPLASH_BOOT_MESSAGE}" ] && text="${SPLASH_BOOT_MESSAGE}"
@@ -55,10 +56,13 @@
 	if [ -n "$text_x" -a -n "$text_y" -a -n "$text_color" -a -n "$text_size" ]
 	then
 		options="-x $text_x -y $text_y -t $text_color -s $text_size"
-		if [ -n "${SPLASH_FONT}" -a -f "/etc/splash/${SPLASH_FONT}" ]
-		then
+		if [ -n "${SPLASH_FONT}" -a -f "/etc/splash/${SPLASH_FONT}" ]; then
 			options="$options -f \"/etc/splash/${SPLASH_FONT}\""
 		fi
+		
+		if [ -n "$text_font" -a -f "/etc/splash/${SPLASH_THEME}/$text_font" ]; then
+			options="$options -f \"/etc/splash/${SPLASH_THEME}/$text_font\""
+		fi
 			
 		eval "/sbin/fbtruetype.static $options \"$text\""
 	fi
@@ -90,7 +94,21 @@
 			print_text
 		fi
 	fi
+
+elif [ "$1" == "silent" ]; then
+
+	${SPLUTIL} -c setmode -m s
+	${SPLUTIL} -c repaint -m s --theme=${SPLASH_THEME}
 	
+	if [ "$?" != 0 ]; then
+		${SPLUTIL} -c setmode -m v
+		${SPLUTIL} -c off
+	else
+		${SPLUTIL} -c on 2>/dev/null
+		paint_progress
+		print_text
+	fi
+
 elif [ "$1" == "verbose" ]; then
 
 	if [ -n "`${SPLUTIL} -c getmode 2>/dev/null | grep silent 2>/dev/null`" ]; then