Diff of /alx-src/branches/alxconf_20060908/functions/config_x11.sh

Parent Directory | Revision Log | Patch

	revision 1647 by niro, Thu Dec 30 13:43:24 2010 UTC	revision 1703 by niro, Mon Jan 24 23:27:07 2011 UTC
#	Line 30  get_x11_settings()	Line 30  get_x11_settings()
30	export ALX_MOUSE	export ALX_MOUSE
31	}	}
32
33		config_display_manager()
34		{
35		# setup slim
36		cat ${ALX_SKELETONS}/slim/slim.conf > /etc/slim.conf
37		sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}" /etc/slim.conf
38
39		# setup xession
40		sed -i "s:\(^GLOGIN=\).*:\1slim:" /etc/rc.config
41
42		# windowmanager
43		echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc
44		}
45
46	config_x11()	config_x11()
47	{	{
48	# get our settings from the db	# get our settings from the db
49	get_x11_settings	get_x11_settings
50
51		# setup displaymanager
52		config_display_manager
53
54	local xserver	local xserver
55	local xfconfig	local xfconfig
56	local HAS_VNC	local HAS_VNC
#	Line 215  config_x11()	Line 231  config_x11()
231	# add hsync, vrefresh	# add hsync, vrefresh
232	if [[ -x /sbin/ddcxinfo-knoppix ]]	if [[ -x /sbin/ddcxinfo-knoppix ]]
233	then	then
234		local hsync="$(ddcxinfo-knoppix -hsync)"
235		local vsync="$(ddcxinfo-knoppix -vsync)"
236		# fallback
237		[[ ${hsync} = 0-0 ]] && hsync="28-96"
238		[[ ${vsync} = 0-0 ]] && vsync="50-60"
239
240	echo '' >> ${xfconfig}	echo '' >> ${xfconfig}
241	echo "    HorizSync $(ddcxinfo-knoppix -hsync)"  >> ${xfconfig}	echo "    HorizSync ${hsync}"  >> ${xfconfig}
242	echo "    VertRefresh $(ddcxinfo-knoppix -vsync)"  >> ${xfconfig}	echo "    VertRefresh ${vsync}"  >> ${xfconfig}
243	fi	fi
244
245	# add cvt modelines	# add cvt modelines

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.1647   changed lines   Added in v.1703