--- alx-src/trunk/alxconfig-ng/functions/config_x11.sh	2005/03/08 20:42:05	219
+++ alx-src/trunk/alxconfig-ng/functions/config_x11.sh	2005/04/12 20:54:19	241
@@ -1,5 +1,5 @@
+# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.6 2005-04-12 20:54:19 niro Exp $
 # configures the x11 server on the host via mysql db settings
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.2 2005-03-08 20:42:05 niro Exp $
 
 get_x11_settings()
 {
@@ -7,7 +7,7 @@
 	
 	# autodetect or not ?
 	if [ $(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"select monitorid from cfg_graphic where serial='${ALX_SERIAL}") -gt 0 ]
+		"select monitorid from cfg_graphic where serial='${ALX_SERIAL}'") -gt 0 ]
 	then
 		# settings from db
 
@@ -24,7 +24,7 @@
 			on cfg_graphic.monitorid=list_monitors.id
 			and cfg_graphic.serial='${ALX_SERIAL}';")
 		
-		echo "DEBUG: ${all}"
+# 		echo "DEBUG: ${all}"
 
 		#split'em up and put 'em in an array
 		declare -i i=0
@@ -50,7 +50,7 @@
 				depth
 			from cfg_graphic where serial='${ALX_SERIAL}'")
 
-		echo "DEBUG: ${all}"
+# 		echo "DEBUG: ${all}"
 
 		#split'em up and put 'em in an array
 		declare -i i=0
@@ -76,20 +76,20 @@
 	export ALX_MOUSE
 }
 
-write_x11_config() {
+config_x11() {
 
 	# get our settings from the db
 	get_x11_settings
 	
 	# DEBUG
-	echo "MODULE:     '${ALX_MODULE}'"
-	echo "RESOLUTION: '${ALX_RESOLUTION}'"
-	echo "DEPTH:      '${ALX_DEPTH=}'"
-	echo "VENDOR:     '${ALX_VENDOR}'"
-	echo "MODEL:      '${ALX_MODEL}'"
-	echo "HSYNC:      '${ALX_HSYNC}'"
-	echo "VREF:       '${ALX_VREF}'"
-	echo "MOUSE:      '${ALX_MOUSE}'"
+# 	echo "MODULE:     '${ALX_MODULE}'"
+# 	echo "RESOLUTION: '${ALX_RESOLUTION}'"
+# 	echo "DEPTH:      '${ALX_DEPTH=}'"
+# 	echo "VENDOR:     '${ALX_VENDOR}'"
+# 	echo "MODEL:      '${ALX_MODEL}'"
+# 	echo "HSYNC:      '${ALX_HSYNC}'"
+# 	echo "VREF:       '${ALX_VREF}'"
+# 	echo "MOUSE:      '${ALX_MOUSE}'"
 	
 	local xserver
 	local xfconfig
@@ -240,7 +240,7 @@
 		Auto) device=/dev/mouse;;
 		*) device=/dev/mouse;;
 	esac
-
+	echo "    Option \"Device\"      \"${device}\"" >> ${xfconfig}
 	echo '    Option "Resolution"	"1200"' >> ${xfconfig}
 
 	[ "${ALX_MOUSE}" = "IMPS/2" ] && echo '    Option "ZAxisMapping" "4 5"' >> ${xfconfig}