From 5037ebe76c12058b435de812e65a742484ea09d7 Mon Sep 17 00:00:00 2001
From: pascal <pascal@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Tue, 6 Apr 2010 11:48:45 +0000
Subject: Stichprobe auf dead_dasia → bei alten Systemen
 neo_de_alternative.xmodmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@2282 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 linux/Makefile | 3 ++-
 linux/bin/asdf | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/linux/Makefile b/linux/Makefile
index 88bab29..c44bead 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -31,7 +31,8 @@ xmodmap/neo_de_alternative.xmodmap:xmodmap/neo_de.xmodmap
 	-e 's/keycode\ 108/keysym\ KP_Enter/g' \
 	-e 's/dead_stroke/NoSymbol/g' \
 	-e 's/dead_doublegrave/U02F5/g' \
-	-e 's/dead_dasia/U1FFE/g' $< > $@
+	-e 's/\x09dead_psili/\x09dead_abovecomma/g' \
+	-e 's/\x09dead_dasia/\x09dead_abovereversedcomma/g' $< > $@
 
 xmodmap/neo_de.xmodmap.referenz:xmodmap/neo_de.xmodmap
 	cd xmodmap; ./erzeuge_neo_de_referenz > neo_de.xmodmap.referenz
diff --git a/linux/bin/asdf b/linux/bin/asdf
index 5184395..60e3a37 100755
--- a/linux/bin/asdf
+++ b/linux/bin/asdf
@@ -26,6 +26,7 @@ NEO_XMODMAP=${NEO_XMODMAP:-$HOME/neo/neo_de.xmodmap}
 NEO_XMODMAP_XPROG=${NEO_XMODMAP_XPROG:-$HOME/neo/neo_de_x-prog.xmodmap}
 NEO_XMODMAP_ALTERNATIVE=${NEO_XMODMAP_ALTERNATIVE:-$HOME/neo/neo_de_alternative.xmodmap}
 NEO_CONSOLE_KEYMAP=${NEO_CONSOLE_KEYMAP:-$HOME/neo/neo.map}
+KEYSYMDEF=${KEYSYMDEF:-/usr/include/X11/keysymdef.h}
 
 die() {
 	$ECHO_e "${red}$@${normal}" >&2
@@ -159,6 +160,10 @@ else
 			set_xkbmap "${NEO_XKBMAP}" "${NEO_XKBVARIANT}"
 			;;
 		xmodmap)
+			if [ `grep -c 'dead_dasia' ${KEYSYMDEF}` -eq 0 ]; then
+				$ECHO_e "${red}Das System scheint älter zu sein, weiche auf neo_de_alternative aus.${normal}"
+				NEO_XMODMAP=${NEO_XMODMAP_ALTERNATIVE}
+			fi
 			[ $quiet ] || echo "Das Laden der Xmodmap kann einige Sekunden dauern…"
 			set_xmodmap "${NEO_XMODMAP}"
 			;;
-- 
cgit v1.2.3