Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

alx-src/branches/alxconf_20060908/functions/config_x11.sh revision 1703 by niro, Mon Jan 24 23:27:07 2011 UTC alx-src/branches/alxconf-060/functions/config_x11.sh revision 1800 by niro, Thu Apr 14 19:29:35 2011 UTC
# Line 27  get_x11_settings() Line 27  get_x11_settings()
27    
28   # which input devices are we using ?   # which input devices are we using ?
29   ALX_MOUSE=$(mysqldo "select mouse from cfg_input where serial='${ALX_SERIAL}'")   ALX_MOUSE=$(mysqldo "select mouse from cfg_input where serial='${ALX_SERIAL}'")
30     ALX_MOUSE_RESOLUTION=$(mysqldo "select mouse_resolution from cfg_input where serial='${ALX_SERIAL}'")
31   export ALX_MOUSE   export ALX_MOUSE
32  }  }
33    
# Line 34  config_display_manager() Line 35  config_display_manager()
35  {  {
36   # setup slim   # setup slim
37   cat ${ALX_SKELETONS}/slim/slim.conf > /etc/slim.conf   cat ${ALX_SKELETONS}/slim/slim.conf > /etc/slim.conf
38   sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}" /etc/slim.conf   sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf
39    
40   # setup xession   # setup xession
41   sed -i "s:\(^GLOGIN=\).*:\1slim:" /etc/rc.config   sed -i "s:\(^GLOGIN=\).*:\1slim:" /etc/rc.config
# Line 200  config_x11() Line 201  config_x11()
201   *) device=/dev/mouse;;   *) device=/dev/mouse;;
202   esac   esac
203   echo "    Option \"Device\"      \"${device}\"" >> ${xfconfig}   echo "    Option \"Device\"      \"${device}\"" >> ${xfconfig}
204   echo '    Option "Resolution" "1200"' >> ${xfconfig}  
205     [[ -z ${ALX_MOUSE_RESOLUTION} ]] && ALX_MOUSE_RESOLUTION="1200"
206     echo "    Option \"Resolution\" \"${ALX_MOUSE_RESOLUTION}\"" >> ${xfconfig}
207    
208   [[ ${ALX_MOUSE} = IMPS/2 ]] && echo '    Option "ZAxisMapping" "4 5"' >> ${xfconfig}   [[ ${ALX_MOUSE} = IMPS/2 ]] && echo '    Option "ZAxisMapping" "4 5"' >> ${xfconfig}
209    

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