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 2025 by niro, Mon Aug 13 11:28:11 2012 UTC mcore-src/trunk/mcore-tools/src/modules/basic-input/input.client.class.in revision 2196 by niro, Fri Jan 10 14:43:47 2014 UTC
    # Line 49  set_input_keyboard() Line 49  set_input_keyboard()
    49  get_input_keymap()  get_input_keymap()
    50  {  {
    51   local keymap   local keymap
    52   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]] && pidof X &> /dev/null
    53   then   then
    54   keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')   keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')
    55   else   else
    56   keymap=$(grep "Option.*XkbLayout" ${MROOT}/etc/X11/xorg.conf.d/25-layout.conf \   keymap=$(grep "Option.*XkbLayout" ${MROOT}/etc/X11/xorg.conf.d/00-keyboard.conf \
    57   | sed -e 's:\"::' -e 's:.*XkbLayout\(.*\):\1:' -e 's:[\ \t]::g')   | sed -e 's:\"::g' -e 's:.*XkbLayout\(.*\):\1:' -e 's:[\ \t]::g')
    58   fi   fi
    59   rvecho "${keymap}"   rvecho "${keymap}"
    60  }  }
    # Line 63  get_input_keymap() Line 63  get_input_keymap()
    63  set_input_keymap()  set_input_keymap()
    64  {  {
    65   local value="$1"   local value="$1"
    66   local CONFIG="${MROOT}/etc/X11/xorg.conf.d/25-layout.conf"   local CONFIG
    67    
    68   [[ -z ${value} ]] && help_input_keymap && return 1   [[ -z ${value} ]] && help_input_keymap && return 1
    69    
    70   clearconfig   # systemd support
    71     if [ -x $(type -P localectl) ]
    72     then
    73     # console keymap
    74     localectl set-keymap "${value}"
    75     # x11 keymaps
    76     localectl set-x11-keymap "${value}"
    77     else
    78     CONFIG="${MROOT}/etc/vconsole.conf"
    79     clearconfig
    80     addconfig "KEYMAP=\"${value}\""
    81     addconfig 'FONT="lat9w-16"'
    82     addconfig 'FONT_MAP="8851-1_to_uni"'
    83    
    84   addconfig 'Section "InputClass"'   CONFIG="${MROOT}/etc/X11/xorg.conf.d/00-keyboard.conf"
    85   addconfig ' Identifier "keyboard layout"'   clearconfig
    86   addconfig ' MatchIsKeyboard "on"'   addconfig 'Section "InputClass"'
    87   addconfig " Option \"XkbLayout\" \"${value}\""   addconfig ' Identifier "keyboard layout"'
    88   addconfig 'EndSection'   addconfig ' MatchIsKeyboard "on"'
    89     addconfig " Option \"XkbLayout\" \"${value}\""
    90     addconfig 'EndSection'
    91     fi
    92    
    93   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    94   then   then
    Legend:
    Removed from v.2025  
    changed lines
      Added in v.2196