1 |
# $Id$ |
# $Id$ |
2 |
# configures the x11 server on the host via mysql db settings |
# configures the x11 server on the host via mysql db settings |
3 |
|
|
|
get_x11_settings() |
|
|
{ |
|
|
local x i all DB_X11SETTINGS |
|
|
# autodetect |
|
|
all=$(mysqldo "select module, |
|
|
resolution, |
|
|
depth, |
|
|
refresh_rate |
|
|
from cfg_graphic where serial='${ALX_SERIAL}'") |
|
|
|
|
|
# split'em up and put 'em in an array |
|
|
declare -i i=0 |
|
|
for x in ${all} |
|
|
do |
|
|
DB_X11SETTINGS[${i}]="${x}" |
|
|
((i++)) |
|
|
done |
|
|
|
|
|
# and now put them in usable var names and export them systemwide |
|
|
export ALX_MODULE="${DB_X11SETTINGS[0]:=NULL}" |
|
|
export ALX_RESOLUTION="${DB_X11SETTINGS[1]:=NULL}" |
|
|
export ALX_DEPTH="${DB_X11SETTINGS[2]:=NULL}" |
|
|
export ALX_REFRESH_RATE="${DB_X11SETTINGS[3]:=NULL}" |
|
|
|
|
|
# which input devices are we using ? |
|
|
ALX_MOUSE=$(mysqldo "select mouse from cfg_input where serial='${ALX_SERIAL}'") |
|
|
ALX_MOUSE_RESOLUTION=$(mysqldo "select mouse_resolution from cfg_input where serial='${ALX_SERIAL}'") |
|
|
export ALX_MOUSE |
|
|
} |
|
|
|
|
4 |
config_display_manager() |
config_display_manager() |
5 |
{ |
{ |
6 |
# setup slim |
# setup slim |
7 |
cat ${ALX_SKELETONS}/slim/slim.conf > /etc/slim.conf |
cat ${ALX_SKELETONS}/slim/slim.conf > /etc/slim.conf |
8 |
sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf |
sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf |
9 |
|
|
|
# setup xession |
|
|
sed -i "s:\(^GLOGIN=\).*:\1slim:" /etc/rc.config |
|
|
|
|
10 |
# windowmanager |
# windowmanager |
11 |
echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc |
local CONFIG="${ALX_UNPRIV_HOME}/.xinitrc" |
12 |
} |
clearconfig |
13 |
|
addconfig "exec startfluxbox" |
|
clearconfig() |
|
|
{ |
|
|
local xfconfig="/etc/X11/xorg.conf" |
|
|
:> ${xfconfig} |
|
|
} |
|
|
|
|
|
addconfig() |
|
|
{ |
|
|
local value="$@" |
|
|
local xfconfig="/etc/X11/xorg.conf" |
|
|
|
|
|
echo "${value}" >> ${xfconfig} |
|
14 |
} |
} |
15 |
|
|
16 |
config_x11() |
config_x11() |
17 |
{ |
{ |
18 |
|
local has_tigervnc |
19 |
|
local CONFIG |
20 |
|
|
21 |
# get our settings from the db |
# get our settings from the db |
22 |
get_x11_settings |
evaluate_table cfg_graphic |
23 |
|
evaluate_table cfg_input |
24 |
|
|
25 |
# setup displaymanager |
# setup displaymanager |
26 |
config_display_manager |
config_display_manager |
27 |
|
|
|
local xserver=Xorg |
|
|
local HAS_TIGERVNC |
|
|
|
|
28 |
# got we vnc support ? |
# got we vnc support ? |
29 |
if [ -f /usr/X11R6/lib/xorg/modules/extensions/libvnc.so ] |
if [ -f /usr/lib/xorg/modules/extensions/libvnc.so ] |
30 |
then |
then |
31 |
HAS_TIGERVNC="yes" |
has_tigervnc="yes" |
32 |
else |
else |
33 |
HAS_TIGERVNC="no" |
has_tigervnc="no" |
34 |
fi |
fi |
35 |
|
|
36 |
# show which server we use |
# show which server we use |
37 |
echo -en ${COLOREDSTAR}"Configuring Xorg x11-server " |
rc_echo -en ${COLOREDSTAR}"Configuring Xorg x11-server " |
38 |
|
|
39 |
# show if we have vnc |
# show if we have vnc |
40 |
if [[ ${HAS_TIGERVNC} = yes ]] |
if [[ ${has_tigervnc} = yes ]] |
41 |
then |
then |
42 |
echo "with tigervnc enabled ..." |
rc_echo "with tigervnc enabled ..." |
43 |
else |
else |
44 |
echo "..." |
rc_echo "..." |
45 |
fi |
fi |
46 |
|
|
47 |
# create a new clear xfconfig file |
# set_input_keyboard |
48 |
|
CONFIG="/etc/X11/xorg.conf.d/25-layout.conf" |
49 |
clearconfig |
clearconfig |
50 |
addconfig '# Generated with alxconfig-ng.' |
addconfig 'Section "InputClass"' |
51 |
addconfig |
addconfig ' Identifier "keyboard layout"' |
52 |
|
addconfig ' MatchIsKeyboard "on"' |
53 |
# write modules |
addconfig ' Option "XkbLayout" "de"' |
|
addconfig |
|
|
addconfig 'Section "Module"' |
|
|
addconfig ' Load "dbe"' |
|
|
addconfig ' SubSection "extmod"' |
|
|
addconfig ' Option "omit xfree86-dga"' |
|
|
addconfig ' EndSubSection' |
|
|
addconfig ' Load "freetype"' |
|
|
addconfig '# Load "glx"' |
|
|
addconfig ' Load "dri"' |
|
|
|
|
|
[[ ${HAS_TIGERVNC} = yes ]] && addconfig ' Load "vnc"' |
|
|
|
|
|
addconfig 'EndSection' |
|
|
|
|
|
# fonts |
|
|
addconfig |
|
|
addconfig 'Section "Files"' |
|
|
# only add existing font pathes |
|
|
[[ -f /usr/share/fonts/local/fonts.dir ]] && addconfig ' FontPath "/usr/share/fonts/local/"' |
|
|
[[ -f /usr/share/fonts/misc/fonts.dir ]] && addconfig ' FontPath "/usr/share/fonts/misc/"' |
|
|
[[ -f /usr/share/fonts/75dpi/fonts.dir ]] && addconfig ' FontPath "/usr/share/fonts/75dpi/:unscaled"' |
|
|
[[ -f /usr/share/fonts/100dpi/fonts.dir ]] && addconfig ' FontPath "/usr/share/fonts/100dpi/:unscaled"' |
|
|
[[ -f /usr/share/fonts/TrueType/fonts.dir ]] && addconfig ' FontPath "/usr/share/fonts/TrueType/"' |
|
|
[[ -f /usr/share/fonts/freefont/fonts.dir ]] && addconfig ' FontPath "/usr/share/fonts/freefont/"' |
|
|
[[ -f /usr/share/fonts/75dpi/fonts.dir ]] && addconfig ' FontPath "/usr/share/fonts/75dpi/"' |
|
|
[[ -f /usr/share/fonts/100dpi/fonts.dir ]] && addconfig ' FontPath "/usr/share/fonts/100dpi/"' |
|
|
addconfig 'EndSection' |
|
|
|
|
|
# server flags |
|
|
addconfig |
|
|
addconfig 'Section "ServerFlags"' |
|
|
addconfig '# Option "DontVTSwitch"' |
|
|
addconfig '# Option "DontZap"' |
|
|
addconfig '# Option "Dont Zoom"' |
|
54 |
addconfig 'EndSection' |
addconfig 'EndSection' |
55 |
|
|
56 |
# keyboard |
# graphic driver |
57 |
addconfig |
CONFIG="/etc/X11/xorg.conf.d/25-device.conf" |
58 |
addconfig 'Section "InputDevice"' |
clearconfig |
59 |
addconfig ' Identifier "Keyboard1"' |
addconfig 'Section "Device"' |
60 |
addconfig ' Driver "kbd"' |
addconfig ' Identifier "Card0"' |
61 |
addconfig ' Option "AutoRepeat" "500 30"' |
addconfig " Driver \"${cfg_graphic_module}\"" |
|
addconfig '# Option "Xleds" "1 2 3"' |
|
|
addconfig ' Option "XkbRules" "xorg"' |
|
|
addconfig ' Option "XkbModel" "pc105"' |
|
|
addconfig ' Option "XkbLayout" "de"' |
|
62 |
addconfig 'EndSection' |
addconfig 'EndSection' |
63 |
|
|
64 |
# mouse |
# vnc module |
65 |
addconfig |
if [[ ${has_tigervnc} = yes ]] |
66 |
addconfig 'Section "InputDevice"' |
then |
67 |
addconfig ' Identifier "Mouse1"' |
CONFIG="/etc/X11/xorg.conf.d/25-module.conf" |
68 |
addconfig ' Driver "mouse"' |
clearconfig |
69 |
addconfig " Option \"Protocol\" \"${ALX_MOUSE}\"" |
addconfig 'Section "Module"' |
70 |
local device |
addconfig ' Load "vnc"' |
71 |
case ${ALX_MOUSE} in |
addconfig 'EndSection' |
72 |
IMPS/2|PS/2) device=/dev/psaux;; |
fi |
|
Auto) device=/dev/mouse;; |
|
|
*) device=/dev/mouse;; |
|
|
esac |
|
|
addconfig " Option \"Device\" \"${device}\"" |
|
|
[[ -z ${ALX_MOUSE_RESOLUTION} ]] && ALX_MOUSE_RESOLUTION="1200" |
|
|
addconfig " Option \"Resolution\" \"${ALX_MOUSE_RESOLUTION}\"" |
|
|
[[ ${ALX_MOUSE} = IMPS/2 ]] && addconfig ' Option "ZAxisMapping" "4 5"' |
|
|
addconfig 'EndSection' >> ${xfconfig} |
|
73 |
|
|
74 |
# monitor |
# monitor |
75 |
addconfig |
CONFIG="/etc/X11/xorg.conf.d/25-monitor.conf" |
76 |
|
clearconfig |
77 |
addconfig 'Section "Monitor"' |
addconfig 'Section "Monitor"' |
78 |
addconfig ' Identifier "Monitor0"' |
addconfig ' Identifier "Monitor0"' |
79 |
addconfig ' Option "DPMS"' |
addconfig ' Option "DPMS"' |
80 |
|
|
81 |
# add hsync, vrefresh |
# add hsync, vrefresh |
82 |
if [[ -x /sbin/ddcxinfo-knoppix ]] |
if [[ -x /sbin/ddcxinfo-knoppix ]] |
86 |
# fallback |
# fallback |
87 |
[[ ${hsync} = 0-0 ]] && hsync="28-96" |
[[ ${hsync} = 0-0 ]] && hsync="28-96" |
88 |
[[ ${vsync} = 0-0 ]] && vsync="50-60" |
[[ ${vsync} = 0-0 ]] && vsync="50-60" |
89 |
|
|
90 |
addconfig |
addconfig |
91 |
addconfig " HorizSync ${hsync}" |
addconfig " HorizSync ${hsync}" |
92 |
addconfig " VertRefresh ${vsync}" |
addconfig " VertRefresh ${vsync}" |
93 |
fi |
fi |
94 |
|
|
95 |
# add cvt modelines |
# add cvt modelines |
96 |
addconfig |
addconfig |
97 |
local cvt="/usr/X11R6/bin/cvt" |
local cvt="/usr/bin/cvt" |
98 |
local modeline |
local modeline |
99 |
modeline=$("${cvt}" "${ALX_RESOLUTION%x*}" "${ALX_RESOLUTION#*x}" "${ALX_REFRESH_RATE}" | sed -e 's:^:\t:g' -e 's:_.*\":\":') |
modeline=$("${cvt}" "${cfg_graphic_resolution%x*}" "${cfg_graphic_resolution#*x}" "${cfg_graphic_refresh_rate}" | sed -e 's:^:\t:g' -e 's:_.*\":\":') |
100 |
addconfig "${modeline}" |
addconfig "${modeline}" |
101 |
# add ddcxinfo-knoppix modelines (fallback) |
# add ddcxinfo-knoppix modelines (fallback) |
102 |
if [[ -x /sbin/ddcxinfo-knoppix ]] |
if [[ -x /sbin/ddcxinfo-knoppix ]] |
106 |
fi |
fi |
107 |
addconfig 'EndSection' |
addconfig 'EndSection' |
108 |
|
|
109 |
# vga |
# screen |
110 |
addconfig |
CONFIG="/etc/X11/xorg.conf.d/25-screen.conf" |
111 |
addconfig 'Section "Device"' |
clearconfig |
|
addconfig ' Identifier "vga0"' |
|
|
# check for openchrome and use it if available |
|
|
if [[ ${ALX_MODULE} = via ]] && [ -f /usr/X11R6/lib/xorg/modules/drivers/openchrome_drv.so ] |
|
|
then |
|
|
ALX_MODULE="openchrome" |
|
|
fi |
|
|
addconfig " Driver \"${ALX_MODULE}\"" |
|
|
addconfig 'EndSection' |
|
|
|
|
|
# screens |
|
|
addconfig |
|
112 |
addconfig 'Section "Screen"' |
addconfig 'Section "Screen"' |
113 |
addconfig ' Identifier "Screen 1"' |
addconfig ' Identifier "Screen0"' |
114 |
addconfig ' Device "vga0"' |
addconfig ' Monitor "Monitor0"' |
115 |
addconfig ' Monitor "Monitor0"' |
addconfig " DefaultDepth ${cfg_graphic_depth}" |
116 |
addconfig " DefaultDepth ${ALX_DEPTH}" |
addconfig ' SubSection "Display"' |
117 |
addconfig ' Subsection "Display"' |
addconfig " Depth ${cfg_graphic_depth}" |
118 |
addconfig " Depth ${ALX_DEPTH}" |
addconfig " Modes \"${cfg_graphic_resolution}\"" |
119 |
addconfig " Modes \"${ALX_RESOLUTION}\"" |
addconfig ' ViewPort 0 0' |
120 |
addconfig ' ViewPort 0 0' |
addconfig ' EndSubSection' |
121 |
addconfig ' EndSubsection' |
# vnc auth |
122 |
if [[ ${HAS_TIGERVNC} = yes ]] |
if [[ ${has_tigervnc} = yes ]] |
123 |
then |
then |
124 |
addconfig ' Option "SecurityTypes" "VncAuth"' |
addconfig ' Option "SecurityTypes" "VncAuth"' |
125 |
addconfig ' Option "UserPasswdVerifier" "VncAuth"' |
addconfig ' Option "UserPasswdVerifier" "VncAuth"' |
126 |
addconfig ' Option "PasswordFile" "/root/.vnc/passwd"' |
addconfig ' Option "PasswordFile" "/root/.vnc/passwd"' |
127 |
fi |
fi |
128 |
addconfig 'EndSection' |
addconfig 'EndSection' |
129 |
|
|
130 |
# server layout |
# disable screen blanks, use xscreensaver for it |
131 |
addconfig |
CONFIG="/etc/X11/xorg.conf.d/25-server.conf" |
132 |
addconfig 'Section "ServerLayout"' >> ${xfconfig} |
clearconfig |
133 |
addconfig ' Identifier "Simple Layout"' >> ${xfconfig} |
addconfig 'Section "ServerFlags"' |
134 |
addconfig ' Screen "Screen 1"' >> ${xfconfig} |
addconfig ' Option "BlankTime" "0"' |
135 |
addconfig ' InputDevice "Mouse1" "CorePointer"' >> ${xfconfig} |
addconfig ' Option "StandbyTime" "0"' |
136 |
addconfig ' InputDevice "Keyboard1" "CoreKeyboard"' >> ${xfconfig} |
addconfig ' Option "SuspendTime" "0"' |
137 |
addconfig 'EndSection' >> ${xfconfig} |
addconfig ' Option "OffTime" "0"' |
138 |
|
addconfig 'EndSection' |
139 |
# dri |
|
140 |
addconfig |
# fixes |
141 |
addconfig 'Section "DRI"' >> ${xfconfig} |
# disable LVDS-1 on zotacs or enable it if hdmi was requested |
142 |
addconfig ' Mode 0666' >> ${xfconfig} |
if [[ $(alx-hwdetection system) = zotac ]] |
143 |
addconfig 'EndSection' >> ${xfconfig} |
then |
144 |
|
CONFIG="/etc/X11/xorg.conf.d/30-fix-zotac.conf" |
145 |
|
clearconfig |
146 |
|
addconfig 'Section "Monitor"' |
147 |
|
addconfig ' Identifier "LVDS1"' |
148 |
|
if [[ ${cfg_graphic_hdmi} = enable ]] |
149 |
|
then |
150 |
|
# add cvt modelines |
151 |
|
addconfig |
152 |
|
local cvt="/usr/bin/cvt" |
153 |
|
local modeline |
154 |
|
modeline=$("${cvt}" "${cfg_graphic_resolution%x*}" "${cfg_graphic_resolution#*x}" "${cfg_graphic_refresh_rate}" | sed -e 's:^:\t:g' -e 's:_.*\":\":') |
155 |
|
addconfig "${modeline}" |
156 |
|
else |
157 |
|
addconfig ' Option "Ignore" "True"' |
158 |
|
fi |
159 |
|
addconfig 'EndSection' |
160 |
|
else |
161 |
|
# clear this file |
162 |
|
if [ -f /etc/X11/xorg.conf.d/30-fix-zotac.conf ] |
163 |
|
then |
164 |
|
rm /etc/X11/xorg.conf.d/30-fix-zotac.conf |
165 |
|
fi |
166 |
|
fi |
167 |
} |
} |