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 2269 by niro, Tue Jan 14 10:34:57 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
27   local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart/keyboard"   local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart/keyboard"
28    
# Line 62  get_input_keymap() Line 62  get_input_keymap()
62  # set_input_keyboard  # set_input_keyboard
63  set_input_keymap()  set_input_keymap()
64  {  {
65   local value="$1"   local value="${CLASS_ARGV[0]}"
66   local CONFIG="${MROOT}/etc/X11/xorg.conf.d/00-keyboard.conf"   local CONFIG
67    
68   [[ -z ${value} ]] && help_input_keymap && return 1   [[ -z ${value} ]] && help_input_keymap && return 1
69    
# Line 75  set_input_keymap() Line 75  set_input_keymap()
75   # x11 keymaps   # x11 keymaps
76   localectl set-x11-keymap "${value}"   localectl set-x11-keymap "${value}"
77   else   else
78     CONFIG="${MROOT}@@SYSCONFDIR@@/vconsole.conf"
79     clearconfig
80     addconfig "KEYMAP=\"${value}\""
81     addconfig 'FONT="lat9w-16"'
82     addconfig 'FONT_MAP="8851-1_to_uni"'
83    
84     CONFIG="${MROOT}@@SYSCONFDIR@@/X11/xorg.conf.d/00-keyboard.conf"
85   clearconfig   clearconfig
86   addconfig 'Section "InputClass"'   addconfig 'Section "InputClass"'
87   addconfig ' Identifier "keyboard layout"'   addconfig ' Identifier "keyboard layout"'

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