From fdf07f69a1642983dae79ac0f6744df52395ad26 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 4 May 2007 15:15:11 +0000
Subject: Fix unicode keymaps, #173528. Some fonts show the currency symbol
 instead of the Euro when doing AltGr-E, so we provide an easy setting to fix
 this. Release alpha2

---
 init.d.Linux/keymaps | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'init.d.Linux/keymaps')

diff --git a/init.d.Linux/keymaps b/init.d.Linux/keymaps
index 0de5833e..1e0f28fa 100755
--- a/init.d.Linux/keymaps
+++ b/init.d.Linux/keymaps
@@ -27,7 +27,7 @@ start() {
 			;;
 	esac
 
-	local WINDOWKEYS_KEYMAP=
+	local WINDOWKEYS_KEYMAP= LOADKEYS_UNI=
 
 	checkconfig || return 1
 
@@ -37,14 +37,22 @@ start() {
 	fi
 
 	# Turn on unicode if user wants it
-	[ "${UNICODE}" = "yes" ] && kbd_mode -u
+	if [ "${UNICODE}" = "yes" ] ; then
+		kbd_mode -u
+		LOADKEYS_UNI="--unicode"
+	fi
 
 	ebegin "Loading key mappings"
 	if [ -x /bin/loadkeys ] ; then
 		[ "${SET_WINDOWKEYS}" = "yes" ] && WINDOWKEYS_KEYMAP="windowkeys"
-		loadkeys -q ${WINDOWKEYS_KEYMAP} ${KEYMAP} \
-			${EXTENDED_KEYMAPS} > /dev/null
+		loadkeys -q ${LOADKEYS_UNI} ${WINDOWKEYS_KEYMAP} ${KEYMAP} \
+			${EXTENDED_KEYMAPS}
 		eend $? "Error loading key mappings"
+
+		if [ "${FIX_EURO}" = "yes" ] ; then
+			# Fix some fonts displaying the Euro, #173528.
+			echo "altgr keycode 18 = U+20AC" | loadkeys -q
+		fi
 	else
 		eend 1 "/bin/loadkeys not found"
 		return 1
@@ -61,7 +69,7 @@ start() {
 		termencoding="%G"
 		termmsg="UTF-8"
 	else
-		termencoding="(K"
+		termencoding="%@"
 		termmsg="ASCII"
 	fi
 	local n=1 ttydev=
-- 
cgit v1.2.3