Magellan Linux

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

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

mcore-src/trunk/mcore-tools/daemon/client/include/input.client.class revision 2060 by niro, Wed May 8 12:40:39 2013 UTC mcore-src/trunk/mcore-tools/src/modules/basic-input/input.client.class.in revision 2346 by niro, Tue Jul 15 08:31:30 2014 UTC
# Line 22  set_input_mouse() Line 22  set_input_mouse()
22  # set_input_keyboard  # set_input_keyboard
23  set_input_keyboard()  set_input_keyboard()
24  {  {
25   local value="$1"   local value="${CLASS_ARGV[0]}"
26   local rate   local rate
  local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart/keyboard"  
27    
28   case ${value} in   case ${value} in
29   slow) rate="1000 10" ;;   slow) rate="1000 10" ;;
# Line 33  set_input_keyboard() Line 32  set_input_keyboard()
32   *) help_input_keyboard && return 1 ;;   *) help_input_keyboard && return 1 ;;
33   esac   esac
34    
35   clearconfig   ${MCORE_LIBDIR}/fluxbox-autostart --add --name keyboard --exec 'nohup xset r rate ${rate} &' --comment '${value}' &&
36   addconfig "# ${value}"   ${MCORE_LIBDIR}/fluxbox-rebuild-autostart
  addconfig "[startup] { nohup xset r rate ${rate} &}"  
   
  # rebuild autostart file  
  helper_rebuild_fluxbox_autostart  
37    
38   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
39   then   then
# Line 62  get_input_keymap() Line 57  get_input_keymap()
57  # set_input_keyboard  # set_input_keyboard
58  set_input_keymap()  set_input_keymap()
59  {  {
60   local value="$1"   local value="${CLASS_ARGV[0]}"
61   local CONFIG="${MROOT}/etc/X11/xorg.conf.d/00-keyboard.conf"   local CONFIG
62    
63   [[ -z ${value} ]] && help_input_keymap && return 1   [[ -z ${value} ]] && help_input_keymap && return 1
64    
65   # systemd support   # systemd support
66   if [ -x $(type -P localectl) ]   if [ -x $(type -P localectl) ] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
67   then   then
68   # console keymap   # console keymap
69   localectl set-keymap "${value}"   localectl set-keymap "${value}"
70   # x11 keymaps   # x11 keymaps
71   localectl set-x11-keymap "${value}"   localectl set-x11-keymap "${value}"
72   else   else
73     CONFIG="${MROOT}@@SYSCONFDIR@@/vconsole.conf"
74     clearconfig
75     addconfig "KEYMAP=\"${value}\""
76     addconfig 'FONT="lat9w-16"'
77     addconfig 'FONT_MAP="8851-1_to_uni"'
78    
79     CONFIG="${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/00-keyboard.conf"
80   clearconfig   clearconfig
81   addconfig 'Section "InputClass"'   addconfig 'Section "InputClass"'
82   addconfig ' Identifier "keyboard layout"'   addconfig ' Identifier "keyboard layout"'

Legend:
Removed from v.2060  
changed lines
  Added in v.2346