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

---
 ChangeLog            |  8 ++++++++
 Makefile             |  2 +-
 conf.d.Linux/keymaps |  8 +++++++-
 init.d.Linux/keymaps | 18 +++++++++++++-----
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 345e5bfa..0ea37212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
 
+* baselayout-2.0.0_alpha2 (05 May 2007)
+
+  05 May 2007; Roy Marples <uberlord@gentoo.org>:
+
+    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.
+
   03 May 2007; Roy Marples <uberlord@gentoo.org>:
 
     Allow ip6to4 tunnels to use any derived address, #170290.
diff --git a/Makefile b/Makefile
index 96e81cf5..791a0fce 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 SUBDIRS = conf.d etc init.d man net sh share src
 
 NAME = baselayout
-VERSION = 2.0.0_alpha1
+VERSION = 2.0.0_alpha2
 
 PKG = $(NAME)-$(VERSION)
 
diff --git a/conf.d.Linux/keymaps b/conf.d.Linux/keymaps
index eb68fbe2..a9a992ed 100644
--- a/conf.d.Linux/keymaps
+++ b/conf.d.Linux/keymaps
@@ -15,7 +15,7 @@ SET_WINDOWKEYS="no"
 # The maps to load for extended keyboards.  Most users will leave this as is.
 
 EXTENDED_KEYMAPS=""
-#EXTENDED_KEYMAPS="backspace keypad euro"
+#EXTENDED_KEYMAPS="backspace keypad euro2"
 
 
 # Tell dumpkeys(1) to interpret character action codes to be 
@@ -24,3 +24,9 @@ EXTENDED_KEYMAPS=""
 # For a list of valid sets, run `dumpkeys --help`
 
 DUMPKEYS_CHARSET=""
+
+
+# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro €
+# To fix this, set to "yes"
+
+FIX_EURO="no"
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