neo
/
neo-layout
15
15
Fork 24
Code Issues 70 Pull Requests 3 Releases Wiki Activity

erster Schritt, um die veränderten Skripte lauffähig zu machen (noch nicht vollständig richtig)

This commit is contained in:
pascal 2008-10-06 15:00:13 +00:00
parent 39fab024a3
commit 7107579365
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
linux/bin/asdf
View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh
# Copyright 2008 Bernd Steinhauser <berniyh@exherbo.org>
# Copyright 2008 Benjamin Kellermann
# Copyright 2008 Pascal Hauck
@ -28,8 +28,11 @@ PATH_XSET=${PATH_XSET:-/usr/bin/xset}
NEO_X_VARIANTE=${NEO_X_VARIANTE:-xkbmap}
NEO_XKBMAP=${NEO_XKBMAP:-de}
NEO_XKBVARIANT=${NEO_XKBVARIANT:-neo}
NEO_XMODMAP="${NEO_XMODMAP:-/usr/share/neo-layout/xmodmap/neo_de.xmodmap}"
NEO_CONSOLE_KEYMAP="${NEO_CONSOLE_KEYMAP:-/usr/share/keymaps/i386/neo/neo.map}"
NEO_XMODMAP="${NEO_XMODMAP:-$HOME/neo/neo_de.xmodmap}"
NEO_XMODMAP_XPROG="${NEO_XMODMAP:-$HOME/neo/neo_de_x-prog.xmodmap}"
NEO_XMODMAP_ALTERNATIVE="${NEO_XMODMAP:-$HOME/neo/neo_de_alternative.xmodmap}"
NEO_XMODMAP_EVDEV="${NEO_XMODMAP:-$HOME/neo/neo_de_evdev.xmodmap}"
NEO_CONSOLE_KEYMAP="${NEO_CONSOLE_KEYMAP:-$HOME/neo/neo}" # for $HOME/neo/neo.map (without the „.map“)
die() {
echo "$@" >&2
@ -39,7 +42,8 @@ die() {
set_xmodmap() {
if [ -e "${PATH_XMODMAP}" ]; then
if [ -f "$@" ]; then
"${PATH_XMODMAP}" "$@" || die "Failed to set xmodmap $@."
set_xkbmap ie
"${PATH_XMODMAP}" "$@" || set_xkbmap de; die "Failed to set xmodmap $@."
else
die "Cannot use $@ for xmodmap."
fi
@ -109,9 +113,17 @@ else
set_xkbmap "${NEO_XKBMAP}" "${NEO_XKBVARIANT}"
;;
xmodmap)
set_xkbmap ie
set_xmodmap "${NEO_XMODMAP}"
;;
xprog)
set_xmodmap "${NEO_XMODMAP_XPROG}"
;;
alternative)
set_xmodmap "${NEO_XMODMAP_ALTERNATIVE}"
;;
evdev)
set_xmodmap "${NEO_XMODMAP_EVDEV}"
;;
*)
die "Unknown Neo X variant ${NEO_X_VARIANTE}."
;;

8
linux/bin/uiae
View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh
# Copyright 2008 Bernd Steinhauser <berniyh@exherbo.org>
# Copyright 2008 Benjamin Kellermann
# Copyright 2008 Pascal Hauck
@ -28,7 +28,7 @@ PATH_XSET=${PATH_XSET:-/usr/bin/xset}
STD_X_VARIANTE=${STD_X_VARIANTE:-xkbmap}
STD_XKBMAP=${STD_XKBMAP:-de}
STD_XKBVARIANT=${STD_XKBVARIANT:-nodeadkeys}
STD_CONSOLE_KEYMAP="${STD_CONSOLE_KEYMAP:-/usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz}"
STD_CONSOLE_KEYMAP="${STD_CONSOLE_KEYMAP:-de-latin1-nodeadkeys}"
NUM_LOCK_STATUS=${NUM_LOCK_STATUS:-on}
die() {
@ -102,7 +102,7 @@ else
die "xset not found, cannot set modifiers and dead keys."
fi
case "${NEO_X_VARIANTE}" in
case "${STD_X_VARIANTE}" in
xkbmap)
set_xkbmap "${STD_XKBMAP}" "${STD_XKBVARIANT}"
;;
@ -111,7 +111,7 @@ else
set_xmodmap "${STD_XMODMAP}"
;;
*)
die "Unknown standerd X variant ${STD_X_VARIANTE}."
die "Unknown standard X variant ${STD_X_VARIANTE}."
;;
esac

17
linux/etc/neo.conf
View File

@ -1,4 +1,4 @@
# This files contains the configuration for the Neo scripts
# This files contains the configuration for the Neo scripts
# Select the neo Variant to be used when using an X Server
# Values are "xkbmap" and "xmodmap", default is xkbmap, this variable should
@ -13,13 +13,12 @@ NEO_X_VARIANTE="xkbmap"
# You can also specify the xkbmap variant to be used, the default is "neo":
#NEO_XKBVARIANT=neo
# When using xmodmap, you may specify the full path to the xmodmap to be used.
# When using a xmodmap, you may specify the full path to the xmodmap to be used.
# Default:
#NEO_XMODMAP="/usr/share/neo-layout/xmodmap/neo_de.xmodmap"
# Other examples might be:
#NEO_XMODMAP="path/to/xmodmap/neo_de_x-prog.xmodmap"
#NEO_XMODMAP="path/to/xmodmap/neo_de_evdev.xmodmap"
#NEO_XMODMAP="path/to/xmodmap/neo_de_alternative.xmodmap"
#NEO_XMODMAP="$HOME/neo/neo_de.xmodmap"
#NEO_XMODMAP_XPROG="$HOME/neo/neo_de_x-prog.xmodmap}"
#NEO_XMODMAP_ALTERNATIVE="$HOME/neo/neo_de_alternative.xmodmap}"
#NEO_XMODMAP_EVDEV="$HOME/neo/neo_de_evdev.xmodmap}"
# Standard keyboard layout to switch back to when executing "uiae":
#STD_XKBMAP=de
@ -32,10 +31,10 @@ NEO_X_VARIANTE="xkbmap"
#NUM_LOCK_STATUS=on
# For Neo without an X System set the path to the console keymap
#NEO_CONSOLE_KEYMAP="/usr/share/keymaps/i386/neo/neo.map"
#NEO_CONSOLE_KEYMAP="$HOME/neo/neo" # for $HOME/neo/neo.map (without the „.map“)
# Set the standard console keymap to switch back to
#STD_CONSOLE_KEYMAP="/usr/share/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz"
#STD_CONSOLE_KEYMAP="de-latin1-nodeadkeys"
# If you installed one of these programs in a non-standard path you may,
# uncomment the variable and change the path to the executable: