Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/modules/basic-video/graphic.client.class.in

    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

    mcore-src/trunk/mcore-tools/daemon/client/include/graphic.client.class revision 2019 by niro, Mon Aug 13 11:09:48 2012 UTC mcore-src/trunk/mcore-tools/src/modules/basic-video/graphic.client.class.in revision 2823 by niro, Fri Jul 28 10:00:23 2017 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 68  helper_graphic_rebuild_xorg_conf_d() Line 68  helper_graphic_rebuild_xorg_conf_d()
    68  help_graphic_resolution()  help_graphic_resolution()
    69  {  {
    70   mecho "set graphic.resolution [resolution]"   mecho "set graphic.resolution [resolution]"
    71   mecho " 800x600, 1024x768, 1280x1024 etc"   mecho " auto, 800x600, 1024x768, 1280x1024 etc"
    72  }  }
    73    
    74  help_graphic_refresh()  help_graphic_refresh()
    75  {  {
    76   mecho "set graphic.refresh [refresh rate]"   mecho "set graphic.refresh [refresh rate]"
    77   mecho "  60, 100 - all values are Hz"   mecho "  auto, 60, 100 - all values are Hz"
    78  }  }
    79    
    80  help_graphic_depth()  help_graphic_depth()
    81  {  {
    82   mecho "set graphic.depth [color-depth]"   mecho "set graphic.depth [color-depth]"
    83   mecho "  1, 4, 8, 15, 16, 24 - all values are bits"   mecho "  auto, 1, 4, 8, 15, 16, 24 - all values are bits"
    84  }  }
    85    
    86  help_graphic_driver()  help_graphic_driver()
    # 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
    105    
    106   CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/screen/20-resolution.conf"   CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/screen/20-resolution.conf"
      clearconfig  
      # do it for all supported color depth  
      for depth in 1 4 8 15 16 24  
      do  
      addconfig ' SubSection "Display"'  
      addconfig " Depth ${depth}"  
      addconfig " Modes \"${resolution}\""  
      addconfig ' ViewPort 0 0'  
      addconfig ' EndSubSection'  
      done  
    107    
    108   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   case ${resolution} in
    109   then   *x*)
    110   x11runas "xrandr --size ${resolution}"   clearconfig
    111   fi   # do it for all supported color depth
    112     for depth in 1 4 8 15 16 24
    113     do
    114     addconfig ' SubSection "Display"'
    115     addconfig " Depth ${depth}"
    116     addconfig " Modes \"${resolution}\""
    117     addconfig ' ViewPort 0 0'
    118     addconfig ' EndSubSection'
    119     done
    120    
    121     if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    122     then
    123     x11runas "xrandr --size ${resolution}"
    124     fi
    125     ;;
    126     auto) clearconfig ;;
    127     esac
    128    
    129   helper_graphic_rebuild_xorg_conf_d   helper_graphic_rebuild_xorg_conf_d
    130  }  }
    # Line 126  set_graphic_resolution() Line 132  set_graphic_resolution()
    132  # set_graphic_depth ${value}  # set_graphic_depth ${value}
    133  set_graphic_depth()  set_graphic_depth()
    134  {  {
    135   local depth="$1"   local depth="${CLASS_ARGV[0]}"
    136   local CONFIG   local CONFIG
    137   [[ -z ${depth} ]] && help_graphic_depth && return 1   [[ -z ${depth} ]] && help_graphic_depth && return 1
    138    
    139     CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/screen/10-depth.conf"
    140    
    141   # do it only for supported color depths   # do it only for supported color depths
    142   case "${depth}" in   case "${depth}" in
    143   1|4|8|15|16|24)   1|4|8|15|16|24)
      CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/screen/10-depth.conf"  
    144   clearconfig   clearconfig
    145   addconfig " DefaultDepth ${depth}"   addconfig " DefaultDepth ${depth}"
    146   ;;   ;;
    147     auto) clearconfig ;;
    148   *) help_graphic_depth && return 1 ;;   *) help_graphic_depth && return 1 ;;
    149   esac   esac
    150    
    # Line 150  set_graphic_depth() Line 158  set_graphic_depth()
    158  # set_graphic_refresh ${value}  # set_graphic_refresh ${value}
    159  set_graphic_refresh()  set_graphic_refresh()
    160  {  {
    161   local value="$1"   local value="${CLASS_ARGV[0]}"
    162   [[ -z ${value} ]] && help_graphic_refresh && return 1   [[ -z ${value} ]] && help_graphic_refresh && return 1
    163    
    164   #echo "${value}" > ${MROOT}/${MCORE_CONFIG_PATH}/xorg/refresh   #echo "${value}" > ${MROOT}/${MCORE_CONFIG_PATH}/xorg/refresh
    # Line 165  set_graphic_refresh() Line 173  set_graphic_refresh()
    173    
    174  set_graphic_driver()  set_graphic_driver()
    175  {  {
    176   local driver="$1"   local driver="${CLASS_ARGV[0]}"
    177   local driverdir="/usr/lib/xorg/modules/drivers"   local driverdir="@@LIBDIR@@/xorg/modules/drivers"
    178   local CONFIG   local CONFIG
    179   [[ -z ${driver} ]] && help_graphic_driver && return 1   [[ -z ${driver} ]] && help_graphic_driver && return 1
    180    
    181   if [[ -f ${MROOT}/${driverdir}/${driver}_drv.so ]]   if [[ ${driver} = auto ]]
    182     then
    183     decho "Using driver autodetection, doing nothing"
    184     elif [[ -f ${MROOT}/${driverdir}/${driver}_drv.so ]]
    185   then   then
    186   CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"   CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"
    187   clearconfig   clearconfig
    # Line 189  set_graphic_driver() Line 200  set_graphic_driver()
    200    
    201  get_graphic_driver()  get_graphic_driver()
    202  {  {
    203   local action="$1"   local action="${CLASS_ARGV[0]}"
    204   local driverdir="/usr/lib/xorg/modules/drivers"   local driverdir="@@LIBDIR@@/xorg/modules/drivers"
    205   local driver   local driver
    206   local config="${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"   local config="${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"
    207   local i   local i
    # Line 206  get_graphic_driver() Line 217  get_graphic_driver()
    217   fi   fi
    218   ;;   ;;
    219   system)   system)
    220   for i in $(find ${MROOT}/${driverdir} -mindepth 1 -maxdepth 1 -type f | sort)   driver=$(list_files_in_directory ${MROOT}/${driverdir} -mindepth 1 -maxdepth 1 | sed s':_drv.so::g')
      do  
      driver="${driver} $(basename ${i} _drv.so)"  
      done  
    221   rvecho "${driver}"   rvecho "${driver}"
    222   ;;   ;;
    223   *)   *)
    Legend:
    Removed from v.2019  
    changed lines
      Added in v.2823