Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/daemon/client/include/input.client.class

    Diff of /mcore-src/trunk/mcore-tools/daemon/client/include/input.client.class

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

    revision 2024 by niro, Wed Nov 9 13:37:54 2011 UTC revision 2025 by niro, Mon Aug 13 11:28:11 2012 UTC
    # Line 24  set_input_keyboard() Line 24  set_input_keyboard()
    24  {  {
    25   local value="$1"   local value="$1"
    26   local rate   local rate
    27   local CONFIG="${MCORE_CONFIG_PATH}/fluxbox/autostart/keyboard"   local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart/keyboard"
    28    
    29   case ${value} in   case ${value} in
    30   slow) rate="1000 10" ;;   slow) rate="1000 10" ;;
    # Line 40  set_input_keyboard() Line 40  set_input_keyboard()
    40   # rebuild autostart file   # rebuild autostart file
    41   helper_rebuild_fluxbox_autostart   helper_rebuild_fluxbox_autostart
    42    
    43   x11runas "xset r rate ${rate}"   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    44     then
    45     x11runas "xset r rate ${rate}"
    46     fi
    47  }  }
    48    
    49  get_input_keymap()  get_input_keymap()
    50  {  {
    51   local keymap   local keymap
    52   keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    53   rvecho "keymap"   then
    54     keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')
    55     else
    56     keymap=$(grep "Option.*XkbLayout" ${MROOT}/etc/X11/xorg.conf.d/25-layout.conf \
    57     | sed -e 's:\"::' -e 's:.*XkbLayout\(.*\):\1:' -e 's:[\ \t]::g')
    58     fi
    59     rvecho "${keymap}"
    60  }  }
    61    
    62  # set_input_keyboard  # set_input_keyboard
    63  set_input_keymap()  set_input_keymap()
    64  {  {
    65   local value="$1"   local value="$1"
    66   local CONFIG="/etc/X11/xorg.conf.d/25-layout.conf"   local CONFIG="${MROOT}/etc/X11/xorg.conf.d/25-layout.conf"
    67    
    68   [[ -z ${value} ]] && help_input_keymap && return 1   [[ -z ${value} ]] && help_input_keymap && return 1
    69    
    # Line 66  set_input_keymap() Line 75  set_input_keymap()
    75   addconfig " Option \"XkbLayout\" \"${value}\""   addconfig " Option \"XkbLayout\" \"${value}\""
    76   addconfig 'EndSection'   addconfig 'EndSection'
    77    
    78   x11runas "setxkbmap ${value}"   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    79     then
    80     x11runas "setxkbmap ${value}"
    81     fi
    82  }  }
    Legend:
    Removed from v.2024  
    changed lines
      Added in v.2025