emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unicode keymaps, #173528.

Browse Source 
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
This commit is contained in:
Roy Marples 2007-05-04 15:15:11 +00:00
parent 2fd8225c6a
commit fdf07f69a1
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,6 +1,14 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts # ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2 # 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>: 03 May 2007; Roy Marples <uberlord@gentoo.org>:
Allow ip6to4 tunnels to use any derived address, #170290. Allow ip6to4 tunnels to use any derived address, #170290.

2
Makefile
View File

@ -10,7 +10,7 @@
SUBDIRS = conf.d etc init.d man net sh share src SUBDIRS = conf.d etc init.d man net sh share src
NAME = baselayout NAME = baselayout
VERSION = 2.0.0_alpha1 VERSION = 2.0.0_alpha2
PKG = $(NAME)-$(VERSION) PKG = $(NAME)-$(VERSION)

8
conf.d.Linux/keymaps
View File

@ -15,7 +15,7 @@ SET_WINDOWKEYS="no"
# The maps to load for extended keyboards. Most users will leave this as is. # The maps to load for extended keyboards. Most users will leave this as is.
EXTENDED_KEYMAPS="" EXTENDED_KEYMAPS=""
#EXTENDED_KEYMAPS="backspace keypad euro" #EXTENDED_KEYMAPS="backspace keypad euro2"
# Tell dumpkeys(1) to interpret character action codes to be # 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` # For a list of valid sets, run `dumpkeys --help`
DUMPKEYS_CHARSET="" DUMPKEYS_CHARSET=""
# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro €
# To fix this, set to "yes"
FIX_EURO="no"

18
init.d.Linux/keymaps
View File

@ -27,7 +27,7 @@ start() {
;; ;;
esac esac
local WINDOWKEYS_KEYMAP= local WINDOWKEYS_KEYMAP= LOADKEYS_UNI=
checkconfig || return 1 checkconfig || return 1
@ -37,14 +37,22 @@ start() {
fi fi
# Turn on unicode if user wants it # 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" ebegin "Loading key mappings"
if [ -x /bin/loadkeys ] ; then if [ -x /bin/loadkeys ] ; then
[ "${SET_WINDOWKEYS}" = "yes" ] && WINDOWKEYS_KEYMAP="windowkeys" [ "${SET_WINDOWKEYS}" = "yes" ] && WINDOWKEYS_KEYMAP="windowkeys"
loadkeys -q ${WINDOWKEYS_KEYMAP} ${KEYMAP} \ loadkeys -q ${LOADKEYS_UNI} ${WINDOWKEYS_KEYMAP} ${KEYMAP} \
${EXTENDED_KEYMAPS} > /dev/null ${EXTENDED_KEYMAPS}
eend $? "Error loading key mappings" 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 else
eend 1 "/bin/loadkeys not found" eend 1 "/bin/loadkeys not found"
return 1 return 1
@ -61,7 +69,7 @@ start() {
termencoding="%G" termencoding="%G"
termmsg="UTF-8" termmsg="UTF-8"
else else
termencoding="(K" termencoding="%@"
termmsg="ASCII" termmsg="ASCII"
fi fi
local n=1 ttydev= local n=1 ttydev=