/[alx-svn]/alx-src/branches/alxconf-060/functions/config_x11.sh

Diff of /alx-src/branches/alxconf-060/functions/config_x11.sh

Parent Directory | Revision Log | View Patch Patch

-revision 325 by niro,
Tue Sep  6 07:45:00 2005 UTC
+revision 343 by niro,
Sun Oct  9 21:31:54 2005 UTC
 Line 1
- # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.8 2005-09-06 07:45:00 niro Exp $
+ # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.9 2005-10-09 21:31:54 niro Exp $
  # configures the x11 server on the host via mysql db settings
  get_x11_settings()
 Line 6 
 get_x11_settings()
  	local x i all DB_X11SETTINGS
  	# autodetect or not ?
- 	if [ $(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 	if [ $(mysqldo "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
- 		all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 		all=$(mysqldo "select cfg_graphic.module,
- 			"select cfg_graphic.module,
  				cfg_graphic.resolution,
  				cfg_graphic.depth,
  				list_monitors.vendor,
-Line 23 
 get_x11_settings()
+Line 21 
 get_x11_settings()
  			inner join cfg_graphic
  			on cfg_graphic.monitorid=list_monitors.id
  			and cfg_graphic.serial='${ALX_SERIAL}';")
- # 		echo "DEBUG: ${all}"
- 		#split'em up and put 'em in an array
+ 		# split'em up and put 'em in an array
  		declare -i i=0
  		for x in ${all}
  		do
-Line 44 
 get_x11_settings()
+Line 40 
 get_x11_settings()
  		export ALX_VREF="${DB_X11SETTINGS[6]:=NULL}"
  	else
  		# autodetect
- 		all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 		all=$(mysqldo "select module,
- 			"select module,
  				resolution,
  				depth
  			from cfg_graphic where serial='${ALX_SERIAL}'")
- # 		echo "DEBUG: ${all}"
+ 		# split'em up and put 'em in an array
- 		#split'em up and put 'em in an array
  		declare -i i=0
  		for x in ${all}
  		do
-Line 70 
 get_x11_settings()
+Line 63 
 get_x11_settings()
  		export ALX_VREF="auto"
  	fi
- 	#which input devices are we using ?
+ 	# which input devices are we using ?
- 	ALX_MOUSE=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 	ALX_MOUSE=$(mysqldo "select mouse from cfg_input where serial='${ALX_SERIAL}'")
- 			"select mouse from cfg_input where serial='${ALX_SERIAL}'")
  	export ALX_MOUSE
  }
- config_x11() {
+ 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}'"
  	local xserver
  	local xfconfig
  	local HAS_VNC
  	local HAS_REALVNC
- 	#xfree or xorg ?
+ 	# xfree or xorg ?
  	xserver="$(readlink /usr/X11R6/bin/X)"
  	case ${xserver} in
-Line 112 
 config_x11() {
+Line 94 
 config_x11() {
  			;;
  	esac
- 	#got we vnc support ?
+ 	# got we vnc support ?
  	if [ -f /usr/X11R6/lib/modules/vnc.so ]
  	then
  		HAS_VNC="yes"
-Line 127 
 config_x11() {
+Line 109 
 config_x11() {
  		HAS_REALVNC="no"
  	fi
- 	#show which server we use
+ 	# show which server we use
  	echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "
- 	#show if we have vnc
+ 	# show if we have vnc
- 	if [ "${HAS_VNC}" = "yes" ]
+ 	if [[ ${HAS_VNC} = yes ]]
  	then
  		echo "with vnc enabled ..."
- 	elif [ "${HAS_REALVNC}" = "yes" ]
+ 	elif [[ ${HAS_REALVNC} = yes ]]
  	then
  		echo "with realvnc enabled ..."
  	else
  		echo "..."
  	fi
- 	#create a new clear xfconfig file
+ 	# create a new clear xfconfig file
  	echo '# Generated with hwdetect, part of Magellan-Linux initscripts.' > ${xfconfig}
  	echo '' >> ${xfconfig}
- 	#write modules
+ 	# write modules
  	echo '' >> ${xfconfig}
  	echo 'Section "Module"' >> ${xfconfig}
  	echo '    Load        "dbe"' >> ${xfconfig}
-Line 159 
 config_x11() {
+Line 141 
 config_x11() {
  	echo '#    Load       "glx"' >> ${xfconfig}
  	echo '    Load       "dri"' >> ${xfconfig}
- 	[ "${HAS_VNC}" = "yes" ] && echo '    Load       "vnc"' >> ${xfconfig}
+ 	[[ ${HAS_VNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
- 	[ "${HAS_REALVNC}" = "yes" ] && echo '    Load       "vnc"' >> ${xfconfig}
+ 	[[ ${HAS_REALVNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
  	echo 'EndSection' >> ${xfconfig}
- 	#fonts
+ 	# fonts
  	echo '' >> ${xfconfig}
  	echo 'Section "Files"' >> ${xfconfig}
  	echo '    RgbPath	"/usr/X11R6/lib/X11/rgb"' >> ${xfconfig}
-Line 201 
 config_x11() {
+Line 183 
 config_x11() {
  	echo '#    ModulePath "/usr/X11R6/lib/modules"' >> ${xfconfig}
  	echo 'EndSection' >> ${xfconfig}
- 	#server flags
+ 	# server flags
  	echo '' >> ${xfconfig}
  	echo 'Section "ServerFlags"' >> ${xfconfig}
  	echo '#    Option "DontVTSwitch"' >> ${xfconfig}
-Line 209 
 config_x11() {
+Line 191 
 config_x11() {
  	echo '#    Option "Dont Zoom"' >> ${xfconfig}
  	echo 'EndSection' >> ${xfconfig}
- 	#keyboard
+ 	# keyboard
  	echo '' >> ${xfconfig}
  	echo 'Section "InputDevice"' >> ${xfconfig}
  	echo '    Identifier	"Keyboard1"' >> ${xfconfig}
-Line 239 
 config_x11() {
+Line 221 
 config_x11() {
  	echo '    Option "XkbLayout"	"de"' >> ${xfconfig}
  	echo 'EndSection' >> ${xfconfig}
- 	#mouse
+ 	# mouse
  	echo '' >> ${xfconfig}
  	echo 'Section "InputDevice"' >> ${xfconfig}
  	echo '    Identifier	"Mouse1"' >> ${xfconfig}
-Line 255 
 config_x11() {
+Line 237 
 config_x11() {
  	echo "    Option \"Device\"      \"${device}\"" >> ${xfconfig}
  	echo '    Option "Resolution"	"1200"' >> ${xfconfig}
- 	[ "${ALX_MOUSE}" = "IMPS/2" ] && echo '    Option "ZAxisMapping" "4 5"' >> ${xfconfig}
+ 	[[ ${ALX_MOUSE} = IMPS/2 ]] && echo '    Option "ZAxisMapping" "4 5"' >> ${xfconfig}
  	echo 'EndSection' >> ${xfconfig}
- 	#vnc keyboard && mouse
+ 	# vnc keyboard && mouse
- 	if [ "${HAS_VNC}" = "yes" ]
+ 	if [[ ${HAS_VNC} = yes ]]
  	then
  		echo '' >> ${xfconfig}
  		echo 'Section "InputDevice"' >> ${xfconfig}
-Line 275 
 config_x11() {
+Line 257 
 config_x11() {
  		echo 'EndSection' >> ${xfconfig}
  	fi
+ 	# monitor
- 	#monitor
  	if [ -x "/sbin/ddcxinfo-knoppix" ] &&
- 	   [ "${ALX_HSYNC}" = "auto" ] ||
+ 	   [[ ${ALX_HSYNC} = auto ]] ||
- 	   [ "${ALX_VREF}" = "auto" ]
+ 	   [[ ${ALX_VREF} = auto ]]
  	then
  		ddcxinfo-knoppix -monitor >> ${xfconfig}
  	else
-Line 293 
 config_x11() {
+Line 274 
 config_x11() {
  		echo 'EndSection' >> ${xfconfig}
  	fi
- 	#vga
+ 	# vga
  	echo '' >> ${xfconfig}
  	echo 'Section "Device"' >> ${xfconfig}
  	echo '    Identifier  "vga0"' >> ${xfconfig}
  	echo "    Driver      \"${ALX_MODULE}\"" >> ${xfconfig}
- 	#vnc server options
+ 	# vnc server options
- 	if [ "${HAS_VNC}" = "yes" ]
+ 	if [[ ${HAS_VNC} = yes ]]
  	then
  		echo '' >> ${xfconfig}
  		echo '    # rfb options' >> ${xfconfig}
-Line 322 
 config_x11() {
+Line 303 
 config_x11() {
  	echo 'EndSection' >> ${xfconfig}
- 	#screens
+ 	# screens
  	echo '' >> ${xfconfig}
  	echo 'Section "Screen"' >> ${xfconfig}
  	echo '    Identifier  "Screen 1"' >> ${xfconfig}
-Line 335 
 config_x11() {
+Line 316 
 config_x11() {
  	echo '        ViewPort    0 0' >> ${xfconfig}
  	echo '    EndSubsection' >> ${xfconfig}
- 	if [ "${HAS_REALVNC}" = "yes" ]
+ 	if [[ ${HAS_REALVNC} = yes ]]
  	then
  		echo '    Option "SecurityTypes" "VncAuth"' >> ${xfconfig}
  		echo '    Option "UserPasswdVerifier" "VncAuth"' >> ${xfconfig}
-Line 343 
 config_x11() {
+Line 324 
 config_x11() {
  	fi
  	echo 'EndSection' >> ${xfconfig}
- 	#server layout
+ 	# server layout
  	echo '' >> ${xfconfig}
  	echo 'Section "ServerLayout"' >> ${xfconfig}
  	echo '    Identifier  "Simple Layout"' >> ${xfconfig}
-Line 351 
 config_x11() {
+Line 332 
 config_x11() {
  	echo '    InputDevice "Mouse1" "CorePointer"' >> ${xfconfig}
  	echo '    InputDevice "Keyboard1" "CoreKeyboard"' >> ${xfconfig}
- 	#load vnc keyboard && mouse
+ 	# load vnc keyboard && mouse
- 	if [ "${HAS_VNC}" = "yes" ]
+ 	if [[ ${HAS_VNC} = yes ]]
  	then
  		echo '    InputDevice "vncMouse"    "ExtraPointer"' >> ${xfconfig}
  		echo '    InputDevice "vncKeyboard" "ExtraKeyboard"' >> ${xfconfig}
-Line 360 
 config_x11() {
+Line 341 
 config_x11() {
  	echo 'EndSection' >> ${xfconfig}
- 	#dri (here disabled, use default of xserver)
+ 	# dri (here disabled, use default of xserver)
  	echo '' >> ${xfconfig}
  	echo '# Section "DRI"' >> ${xfconfig}
  	echo '#    Mode 0666' >> ${xfconfig}

 Legend:



Removed from v.325
 


changed lines


 
Added in v.343
 Legend:



Removed from v.325
 


changed lines


 
Added in v.343
-Removed from v.325
+Added in v.343