yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing keymap selection with layout

Browse Source
This commit is contained in:
Fabio Belavenuto 2022-08-15 17:16:49 -03:00
parent 26c2d52565
commit 4dde9e8b0b
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/board/arpl/overlayfs/opt/arpl/init.sh
View File

@ -62,6 +62,7 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
writeConfigKey "build" "" "${USER_CONFIG_FILE}" writeConfigKey "build" "" "${USER_CONFIG_FILE}"
writeConfigKey "sn" "" "${USER_CONFIG_FILE}" writeConfigKey "sn" "" "${USER_CONFIG_FILE}"
writeConfigKey "maxdisks" "" "${USER_CONFIG_FILE}" writeConfigKey "maxdisks" "" "${USER_CONFIG_FILE}"
writeConfigKey "layout" "qwerty" "${USER_CONFIG_FILE}"
writeConfigKey "keymap" "" "${USER_CONFIG_FILE}" writeConfigKey "keymap" "" "${USER_CONFIG_FILE}"
writeConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}" writeConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
writeConfigKey "ramdisk-hash" "" "${USER_CONFIG_FILE}" writeConfigKey "ramdisk-hash" "" "${USER_CONFIG_FILE}"
@ -120,12 +121,13 @@ if [ ${SIZEOFDISK} -ne ${ENDSECTOR} ]; then
fi fi
# Load keymap name # Load keymap name
LAYOUT="`readConfigKey "layout" "${USER_CONFIG_FILE}"`"
KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`" KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`"
# Loads a keymap if is valid # Loads a keymap if is valid
if [ -f /usr/share/keymaps/i386/qwerty/${KEYMAP}.map.gz ]; then if [ -f /usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz ]; then
echo -e "Loading keymap \033[1;32m${KEYMAP}\033[0m" echo -e "Loading keymap \033[1;32m${LAYOUT}/${KEYMAP}\033[0m"
zcat /usr/share/keymaps/i386/qwerty/${KEYMAP}.map.gz | loadkeys zcat /usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz | loadkeys
fi fi
# Decide if boot automatically # Decide if boot automatically

18
files/board/arpl/overlayfs/opt/arpl/menu.sh
View File

@ -19,6 +19,7 @@ DIRTY=0
MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`" MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`" BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
LAYOUT="`readConfigKey "layout" "${USER_CONFIG_FILE}"`"
KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`" KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`"
LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`" LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`"
SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`" SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
@ -48,9 +49,9 @@ function backtitle() {
BACKTITLE+=" (no IP)" BACKTITLE+=" (no IP)"
fi fi
if [ -n "${KEYMAP}" ]; then if [ -n "${KEYMAP}" ]; then
BACKTITLE+=" (${KEYMAP})" BACKTITLE+=" (${LAYOUT}/${KEYMAP})"
else else
BACKTITLE+=" (us)" BACKTITLE+=" (qwerty/us)"
fi fi
echo ${BACKTITLE} echo ${BACKTITLE}
} }
@ -746,19 +747,26 @@ function editUserConfig() {
############################################################################### ###############################################################################
# Shows available keymaps to user choose one # Shows available keymaps to user choose one
function keymapMenu() { function keymapMenu() {
dialog --backtitle "`backtitle`" --default-item "${LAYOUT}" --no-items \
--menu "Choose a layout" 0 0 0 "azerty" "bepo" "carpalx" "colemak" \
"dvorak" "fgGIod" "neo" "olpc" "qwerty" "qwertz" \
2>${TMP_PATH}/resp
[ $? -ne 0 ] && return
LAYOUT="`<${TMP_PATH}/resp`"
OPTIONS="" OPTIONS=""
while read KM; do while read KM; do
OPTIONS+="${KM::-7} " OPTIONS+="${KM::-7} "
done < <(cd /usr/share/keymaps/i386/qwerty; ls *.map.gz) done < <(cd /usr/share/keymaps/i386/${LAYOUT}; ls *.map.gz)
dialog --backtitle "`backtitle`" --no-items \ dialog --backtitle "`backtitle`" --no-items --default-item "${KEYMAP}" \
--menu "Choice a keymap" 0 0 0 ${OPTIONS} \ --menu "Choice a keymap" 0 0 0 ${OPTIONS} \
2>/tmp/resp 2>/tmp/resp
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
resp=`cat /tmp/resp 2>/dev/null` resp=`cat /tmp/resp 2>/dev/null`
[ -z "${resp}" ] && return [ -z "${resp}" ] && return
KEYMAP=${resp} KEYMAP=${resp}
writeConfigKey "layout" "${LAYOUT}" "${USER_CONFIG_FILE}"
writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}" writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}"
zcat /usr/share/keymaps/i386/qwerty/${KEYMAP}.map.gz | loadkeys zcat /usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz | loadkeys
} }
############################################################################### ###############################################################################