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

Parent Directory | Revision Log | Patch

	mcore-src/trunk/mcore-tools/daemon/client/include/input.client.class revision 2059 by niro, Wed May 8 12:39:51 2013 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 54  get_input_keymap()	Line 54  get_input_keymap()
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/00-keyboard.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/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}/etc/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}/etc/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"'

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2059   changed lines   Added in v.2196