Magellan Linux

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

    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 1921 by niro, Wed Nov 9 13:37:54 2011 UTC mcore-src/trunk/mcore-tools/src/modules/basic-input/input.client.class.in revision 2283 by niro, Tue Jan 14 15:07:31 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="${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} &}"  
    37    
    38   # rebuild autostart file   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    39   helper_rebuild_fluxbox_autostart   then
    40     x11runas "xset r rate ${rate}"
    41   x11runas "xset r rate ${rate}"   fi
    42  }  }
    43    
    44  get_input_keymap()  get_input_keymap()
    45  {  {
    46   local keymap   local keymap
    47   keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]] && pidof X &> /dev/null
    48   rvecho "keymap"   then
    49     keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')
    50     else
    51     keymap=$(grep "Option.*XkbLayout" ${MROOT}/etc/X11/xorg.conf.d/00-keyboard.conf \
    52     | sed -e 's:\"::g' -e 's:.*XkbLayout\(.*\):\1:' -e 's:[\ \t]::g')
    53     fi
    54     rvecho "${keymap}"
    55  }  }
    56    
    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="/etc/X11/xorg.conf.d/25-layout.conf"   local CONFIG
    62    
    63   [[ -z ${value} ]] && help_input_keymap && return 1   [[ -z ${value} ]] && help_input_keymap && return 1
    64    
    65   clearconfig   # systemd support
    66     if [ -x $(type -P localectl) ]
    67   addconfig 'Section "InputClass"'   then
    68   addconfig ' Identifier "keyboard layout"'   # console keymap
    69   addconfig ' MatchIsKeyboard "on"'   localectl set-keymap "${value}"
    70   addconfig " Option \"XkbLayout\" \"${value}\""   # x11 keymaps
    71   addconfig 'EndSection'   localectl set-x11-keymap "${value}"
    72     else
    73   x11runas "setxkbmap ${value}"   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
    81     addconfig 'Section "InputClass"'
    82     addconfig ' Identifier "keyboard layout"'
    83     addconfig ' MatchIsKeyboard "on"'
    84     addconfig " Option \"XkbLayout\" \"${value}\""
    85     addconfig 'EndSection'
    86     fi
    87    
    88     if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    89     then
    90     x11runas "setxkbmap ${value}"
    91     fi
    92  }  }
    Legend:
    Removed from v.1921  
    changed lines
      Added in v.2283