Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/src/modules/basic-video/graphic.client.class.in

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

revision 2193 by niro, Fri Jan 10 14:40:31 2014 UTC revision 2665 by niro, Thu Nov 19 15:03:59 2015 UTC
# Line 25  helper_graphic_rebuild_xorg_conf_d() Line 25  helper_graphic_rebuild_xorg_conf_d()
25    
26   # rebuild 25-gfxcard.conf   # rebuild 25-gfxcard.conf
27   # always clear the config   # always clear the config
28   CONFIG="${MROOT}/etc/X11/xorg.conf.d/25-device.conf"   CONFIG="${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/25-device.conf"
29   clearconfig   clearconfig
30   addconfig "# Autogenerated by mcored"   addconfig "# Autogenerated by mcored"
31   # but only add lines if some values are found in config.d dir   # but only add lines if some values are found in config.d dir
# Line 38  helper_graphic_rebuild_xorg_conf_d() Line 38  helper_graphic_rebuild_xorg_conf_d()
38    
39   # rebuild 25-module.conf   # rebuild 25-module.conf
40   # always clear the config   # always clear the config
41   CONFIG="${MROOT}/etc/X11/xorg.conf.d/25-module.conf"   CONFIG="${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/25-module.conf"
42   clearconfig   clearconfig
43   addconfig "# Autogenerated by mcored"   addconfig "# Autogenerated by mcored"
44   # but only add lines if some values are found in config.d dir   # but only add lines if some values are found in config.d dir
# Line 51  helper_graphic_rebuild_xorg_conf_d() Line 51  helper_graphic_rebuild_xorg_conf_d()
51    
52   # rebuild 25-screen.conf   # rebuild 25-screen.conf
53   # always clear the config   # always clear the config
54   CONFIG="${MROOT}/etc/X11/xorg.conf.d/25-screen.conf"   CONFIG="${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/25-screen.conf"
55   clearconfig   clearconfig
56   addconfig "# Autogenerated by mcored"   addconfig "# Autogenerated by mcored"
57   # but only add lines if some values are found in config.d dir   # but only add lines if some values are found in config.d dir
# Line 98  help_graphic_driver() Line 98  help_graphic_driver()
98  # set_graphic_resolution ${value}  # set_graphic_resolution ${value}
99  set_graphic_resolution()  set_graphic_resolution()
100  {  {
101   local resolution="$1"   local resolution="${CLASS_ARGV[0]}"
102   local CONFIG   local CONFIG
103   local depth   local depth
104   [[ -z ${resolution} ]] && help_graphic_resolution && return 1   [[ -z ${resolution} ]] && help_graphic_resolution && return 1
# Line 126  set_graphic_resolution() Line 126  set_graphic_resolution()
126  # set_graphic_depth ${value}  # set_graphic_depth ${value}
127  set_graphic_depth()  set_graphic_depth()
128  {  {
129   local depth="$1"   local depth="${CLASS_ARGV[0]}"
130   local CONFIG   local CONFIG
131   [[ -z ${depth} ]] && help_graphic_depth && return 1   [[ -z ${depth} ]] && help_graphic_depth && return 1
132    
# Line 150  set_graphic_depth() Line 150  set_graphic_depth()
150  # set_graphic_refresh ${value}  # set_graphic_refresh ${value}
151  set_graphic_refresh()  set_graphic_refresh()
152  {  {
153   local value="$1"   local value="${CLASS_ARGV[0]}"
154   [[ -z ${value} ]] && help_graphic_refresh && return 1   [[ -z ${value} ]] && help_graphic_refresh && return 1
155    
156   #echo "${value}" > ${MROOT}/${MCORE_CONFIG_PATH}/xorg/refresh   #echo "${value}" > ${MROOT}/${MCORE_CONFIG_PATH}/xorg/refresh
# Line 165  set_graphic_refresh() Line 165  set_graphic_refresh()
165    
166  set_graphic_driver()  set_graphic_driver()
167  {  {
168   local driver="$1"   local driver="${CLASS_ARGV[0]}"
169   local driverdir="/usr/lib/xorg/modules/drivers"   local driverdir="@@LIBDIR@@/xorg/modules/drivers"
170   local CONFIG   local CONFIG
171   [[ -z ${driver} ]] && help_graphic_driver && return 1   [[ -z ${driver} ]] && help_graphic_driver && return 1
172    
173   if [[ -f ${MROOT}/${driverdir}/${driver}_drv.so ]]   if [[ ${driver} = auto ]]
174     then
175     decho "Using driver autodetection, doing nothing"
176     elif [[ -f ${MROOT}/${driverdir}/${driver}_drv.so ]]
177   then   then
178   CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"   CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"
179   clearconfig   clearconfig
# Line 189  set_graphic_driver() Line 192  set_graphic_driver()
192    
193  get_graphic_driver()  get_graphic_driver()
194  {  {
195   local action="$1"   local action="${CLASS_ARGV[0]}"
196   local driverdir="/usr/lib/xorg/modules/drivers"   local driverdir="@@LIBDIR@@/xorg/modules/drivers"
197   local driver   local driver
198   local config="${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"   local config="${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"
199   local i   local i

Legend:
Removed from v.2193  
changed lines
  Added in v.2665