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

Parent Directory | Revision Log | Patch

	revision 2058 by niro, Wed May 8 12:22:16 2013 UTC	revision 2060 by niro, Wed May 8 12:40:39 2013 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/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	}	}

---

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

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