Magellan Linux

Diff of /alx-src/trunk/alxconfig-ng/functions/config_x11.sh

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

revision 378 by niro, Sun Oct 9 21:31:54 2005 UTC revision 379 by niro, Mon Apr 14 13:28:59 2008 UTC
# Line 1  Line 1 
1  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.9 2005-10-09 21:31:54 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.10 2008-04-14 13:28:38 niro Exp $
2  # configures the x11 server on the host via mysql db settings  # configures the x11 server on the host via mysql db settings
3    
4  get_x11_settings()  get_x11_settings()
# Line 66  get_x11_settings() Line 66  get_x11_settings()
66   # which input devices are we using ?   # which input devices are we using ?
67   ALX_MOUSE=$(mysqldo "select mouse from cfg_input where serial='${ALX_SERIAL}'")   ALX_MOUSE=$(mysqldo "select mouse from cfg_input where serial='${ALX_SERIAL}'")
68   export ALX_MOUSE   export ALX_MOUSE
69    
70     ALX_MOUSE_ACCELERATION=$(mysqldo "select mouse_acceleration from cfg_input where serial='${ALX_SERIAL}'")
71     ALX_MOUSE_THRESHOLD=$(mysqldo "select mouse_threshold from cfg_input where serial='${ALX_SERIAL}'")
72     export ALX_MOUSE_ACCELERATION
73     export ALX_MOUSE_THRESHOLD
74  }  }
75    
76  config_x11()  config_x11()
# Line 334  config_x11() Line 339  config_x11()
339    
340   # load vnc keyboard && mouse   # load vnc keyboard && mouse
341   if [[ ${HAS_VNC} = yes ]]   if [[ ${HAS_VNC} = yes ]]
342   then   then
343   echo '    InputDevice "vncMouse"    "ExtraPointer"' >> ${xfconfig}   echo '    InputDevice "vncMouse"    "ExtraPointer"' >> ${xfconfig}
344   echo '    InputDevice "vncKeyboard" "ExtraKeyboard"' >> ${xfconfig}   echo '    InputDevice "vncKeyboard" "ExtraKeyboard"' >> ${xfconfig}
345   fi   fi
# Line 346  config_x11() Line 351  config_x11()
351   echo '# Section "DRI"' >> ${xfconfig}   echo '# Section "DRI"' >> ${xfconfig}
352   echo '#    Mode 0666' >> ${xfconfig}   echo '#    Mode 0666' >> ${xfconfig}
353   echo '# EndSection' >> ${xfconfig}   echo '# EndSection' >> ${xfconfig}
354    
355     echo "ALX_MOUSE_ACCELERATION=\"${ALX_MOUSE_ACCELERATION}\"" > ${SETTINGSPATH}/mouse
356     echo "ALX_MOUSE_THRESHOLD=\"${ALX_MOUSE_THRESHOLD}\"" >> ${SETTINGSPATH}/mouse
357  }  }
358    

Legend:
Removed from v.378  
changed lines
  Added in v.379