erste Fehlerbehebung (noch nicht komplett)

git-svn-id: https://svn.neo-layout.org@1433 b9310e46-f624-0410-8ea1-cfbb3a30dc96

5 files changed, 109 insertions, 78 deletions

diff --git a/linux/console/bin/erzeuge_neo-belegung b/linux/console/bin/erzeuge_neo-belegung
index 4cb0e47..bb6c8a8 100755
--- a/linux/console/bin/erzeuge_neo-belegung
+++ b/linux/console/bin/erzeuge_neo-belegung
@@ -1,17 +1,17 @@
 #!/bin/sh
 
-#dumpkeys --long-info > dump || exit 1
+dumpkeys --long-info > dump || exit 1
 
 cat console.ersetze.vorprogramm > console.ersetze
 ./mach_kurzreferenz.vorprogramm >> console.ersetze
-#rm dump
+rm dump
 
 echo -e "Schritt 3 von 4: Erstellung einer Referenz\c" >&2
 ./mach_kurzreferenz > kurzreferenz
-echo -e "\rSchritt 3 von 4: Erstellung einer Referenz  [ \033[32m ok \033[30m ]" >&2
+echo -e "\rSchritt 3 von 4: Erstellung einer Referenz  [ \033[32m ok \033[0m ]" >&2
 
 echo -e "Schritt 4 von 4: Erzeugung der keymap\c" >&2
 ./mach_console
 rm kurzreferenz
 rm console.ersetze
-echo -e "\rSchritt 4 von 4: Erzeugung der keymap       [ \033[32m ok \033[30m ]" >&2
\ No newline at end of file
+echo -e "\rSchritt 4 von 4: Erzeugung der keymap       [ \033[32m ok \033[0m ]" >&2
\ No newline at end of file
diff --git a/linux/console/bin/mach_console b/linux/console/bin/mach_console
index 996e6fc..aaf5eff 100755
--- a/linux/console/bin/mach_console
+++ b/linux/console/bin/mach_console
@@ -1,7 +1,7 @@
 #!/bin/sh
 LC_COLLATE=C
 
-schreiben () {
+schreiben1 () {
 	if [[ $2 == [a-z] ]]; then
 		printf "                   keycode %3s = %-22s\n" $1 $2
 		printf "           altgr   keycode %3s = %-22s\n" $1 $4
@@ -16,15 +16,30 @@ schreiben () {
 	fi
 }
 
+schreiben2 () {
+	if [[ $2 == [a-z] ]]; then
+		printf "                   keycode %3s = %-22s\n" $1 $2
+		printf "           altgr   keycode %3s = %-22s\n" $1 $4
+		printf "   shift   altgr   keycode %3s = %-22s\n" $1 $7
+	else
+		printf "                   keycode %3s = %-22s%-22s%-22s%-22s\n" $1 $2 $3 $4 $7
+	fi
+	printf "           shiftl  keycode %3s = %-22s\n" $1 $8
+	printf "   shift   shiftl  keycode %3s = %-22s\n" $1 $5
+	if [[ $6 ]]; then
+		printf "   altgr   shiftl  keycode %3s = %-22s\n" $1 $6
+	fi
+}
+
 lesen() {
-# Aufruf: lesen <Anzahl> <Zeilennummer in der Kurzreferenz> <Keycode der ersten Taste>
+# Aufruf: lesen <Anzahl> <Zeilennummer in der Kurzreferenz> <Keycode der ersten Taste> <Tastaturfeld>
 	typeset -i zeile keycode
 	zeile=$2
 	keycode=$3
 	for i in $(seq 1 $1)
 	do
 		a=`head -$zeile kurzreferenz | tail -1`
-		schreiben $keycode $a
+		schreiben$4 $keycode $a
 		zeile=zeile+1
 		keycode=keycode+1
 	done
@@ -34,72 +49,72 @@ cat console.sondertasten
 echo
 echo
 echo "! ----Space key-------------------------------------------------------------"
-lesen 1 2 57
+lesen 1 2 57 1
 
 echo
 echo "! ----dead keys-------------------------------------------------------------"
-lesen 1 3 41
-lesen 1 4 13
-lesen 1 5 27
+lesen 1 3 41 1
+lesen 1 4 13 1
+lesen 1 5 27 1
 
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Row 1 (number row)"
 echo "! --------------------------------------------------------------------------"
-lesen 11 6 2
+lesen 11 6 2 1
 
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Row 2 (upper row)"
 echo "! --------------------------------------------------------------------------"
-lesen 11 17 16
+lesen 11 17 16 1
 
 
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Row 3 (home row, middle row)"
 echo "! --------------------------------------------------------------------------"
-lesen 11 28 30
+lesen 11 28 30 1
 
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Row 4 (lower row)"
 echo "! --------------------------------------------------------------------------"
-lesen 10 39 44
+lesen 10 39 44 1
 
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Keypad Row 1 (uppest row)"
 echo "! --------------------------------------------------------------------------"
-lesen 1 49 69
-lesen 1 50 98
-lesen 1 51 55
-lesen 1 52 74
+lesen 1 49 69 2
+lesen 1 50 98 2
+lesen 1 51 55 2
+lesen 1 52 74 2
 
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Keypad Row 2 (upper row)"
 echo "! --------------------------------------------------------------------------"
-lesen 3 53 71
-lesen 1 56 78
+lesen 3 53 71 2
+lesen 1 56 78 2
 
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Keypad Row 3 (home row, middle row)"
 echo "! --------------------------------------------------------------------------"
-lesen 3 57 75
+lesen 3 57 75 2
 
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Keypad Row 4 (lower row)"
 echo "! --------------------------------------------------------------------------"
-lesen 3 60 79
+lesen 3 60 79 2
 
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Keypad Row 5 (lowest row)"
 echo "! --------------------------------------------------------------------------"
-lesen 2 64 82
+lesen 2 64 82 2
 
 cat console.more_control
 
diff --git a/linux/console/bin/mach_kurzreferenz b/linux/console/bin/mach_kurzreferenz
index 7770de5..09b289b 100755
--- a/linux/console/bin/mach_kurzreferenz
+++ b/linux/console/bin/mach_kurzreferenz
@@ -1,8 +1,8 @@
 #!/bin/sh
-xmodmap=$HOME/neo/testing/neo_de.xmodmap2
-# xmodmap=../../xmodmap/neo_de.xmodmap
 
-grep -A1000 "! main keyboard" $xmodmap | grep ^keycode | tr -s [:blank:] ' '| cut -f2 -d = > mach_kurzreferenz.hilfe
+xmodmap=../../xmodmap/neo_de.xmodmap
+
+grep -A1000 "! main keyboard" $xmodmap | sed 's/keysym/keycode/g' | grep ^keycode | tr -s [:blank:] ' '| cut -f2 -d = > mach_kurzreferenz.hilfe
 
 sed -f console.ersetze mach_kurzreferenz.hilfe
 
diff --git a/linux/console/bin/mach_kurzreferenz.vorprogramm b/linux/console/bin/mach_kurzreferenz.vorprogramm
index a75fabf..28b063c 100755
--- a/linux/console/bin/mach_kurzreferenz.vorprogramm
+++ b/linux/console/bin/mach_kurzreferenz.vorprogramm
@@ -1,14 +1,14 @@
 #!/bin/sh
-xmodmap=$HOME/neo/testing/neo_de.xmodmap2
-# xmodmap=../../xmodmap/neo_de.xmodmap
+
+xmodmap=../../xmodmap/neo_de.xmodmap
 
 echo -e "Schritt 1 von 4: Vorverarbeiten der Xmodmap\c" >&2
 
-grep -A1000 "! main keyboard" $xmodmap | grep ^keycode | tr -s [:blank:] ' '| cut -f2 -d = > mach_kurzreferenz.hilfe1
+grep -A1000 "! main keyboard" $xmodmap | sed 's/keysym/keycode/g' | grep ^keycode | tr -s [:blank:] ' '| cut -f2 -d = > mach_kurzreferenz.hilfe1
 
 sed -f console.ersetze.vorprogramm mach_kurzreferenz.hilfe1 > mach_kurzreferenz.hilfe2
 
-echo -e "\rSchritt 1 von 4: Vorverarbeiten der Xmodmap [ \033[32m ok \033[30m ]" >&2
+echo -e "\rSchritt 1 von 4: Vorverarbeiten der Xmodmap [ \033[32m ok \033[0m ]" >&2
 
 
 
@@ -43,6 +43,6 @@ echo -e "\rSchritt 2 von 4: Behandlung der keysyms     [ $(($i*100/$anzahl)) % ]
 	done
 done
 
-echo -e "\rSchritt 2 von 4: Behandlung der keysyms     [ \033[32m ok \033[30m ] " >&2
+echo -e "\rSchritt 2 von 4: Behandlung der keysyms     [ \033[32m ok \033[0m ] " >&2
 rm mach_kurzreferenz.hilfe1
 rm mach_kurzreferenz.hilfe2
diff --git a/linux/console/neo.map b/linux/console/neo.map
index ca2e032..70409c0 100644
--- a/linux/console/neo.map
+++ b/linux/console/neo.map
@@ -429,69 +429,85 @@ alt_is_meta
 ! Keypad Row 1 (uppest row)
 ! --------------------------------------------------------------------------
                    keycode  69 = Tab                   VoidSymbol            equal                 VoidSymbol            
-           shiftl  keycode  69 = U+2261                
+           shiftl  keycode  69 =                       
    shift   shiftl  keycode  69 = VoidSymbol            
-                   keycode  98 = KP_Multiply           KP_Multiply           U+22C5                U+2299                
-           shiftl  keycode  98 = U+2297                
-   shift   shiftl  keycode  98 = VoidSymbol            
-                   keycode  55 = KP_Subtract           KP_Subtract           U+2212                U+2296                
-           shiftl  keycode  55 = U+2238                
-   shift   shiftl  keycode  55 = VoidSymbol            
-                   keycode  74 = KP_7                  U+2714                U+2195                U+226A                
-           shiftl  keycode  74 = U+2308                
-   shift   shiftl  keycode  74 = VoidSymbol            
+   altgr   shiftl  keycode  69 = U+2261                
+                   keycode  98 = KP_Divide             KP_Divide             division              VoidSymbol            
+           shiftl  keycode  98 =                       
+   shift   shiftl  keycode  98 = U+2300                
+   altgr   shiftl  keycode  98 = U+2223                
+                   keycode  55 = KP_Multiply           KP_Multiply           U+22C5                VoidSymbol            
+           shiftl  keycode  55 =                       
+   shift   shiftl  keycode  55 = U+2299                
+   altgr   shiftl  keycode  55 = U+2297                
+                   keycode  74 = KP_Subtract           KP_Subtract           U+2212                VoidSymbol            
+           shiftl  keycode  74 =                       
+   shift   shiftl  keycode  74 = U+2296                
+   altgr   shiftl  keycode  74 = U+2238                
 
 ! --------------------------------------------------------------------------
 ! Keypad Row 2 (upper row)
 ! --------------------------------------------------------------------------
-                   keycode  71 = KP_8                  U+2718                U+2191                U+2229                
-           shiftl  keycode  71 = U+22C2                
-   shift   shiftl  keycode  71 = VoidSymbol            
-                   keycode  72 = KP_9                  U+2663                U+20D7                U+226B                
-           shiftl  keycode  72 = U+2309                
-   shift   shiftl  keycode  72 = VoidSymbol            
-                   keycode  73 = KP_Add                KP_Add                plusminus             U+2295                
-           shiftl  keycode  73 = U+2214                
-   shift   shiftl  keycode  73 = VoidSymbol            
-                   keycode  78 = KP_4                  U+2665                U+2190                U+2282                
-           shiftl  keycode  78 = U+2286                
-   shift   shiftl  keycode  78 = VoidSymbol            
+                   keycode  71 = KP_7                  U+2714                U+2195                VoidSymbol            
+           shiftl  keycode  71 =                       
+   shift   shiftl  keycode  71 = U+226A                
+   altgr   shiftl  keycode  71 = U+2308                
+                   keycode  72 = KP_8                  U+2718                U+2191                VoidSymbol            
+           shiftl  keycode  72 =                       
+   shift   shiftl  keycode  72 = U+2229                
+   altgr   shiftl  keycode  72 = U+22C2                
+                   keycode  73 = KP_9                  U+2663                U+20D7                VoidSymbol            
+           shiftl  keycode  73 =                       
+   shift   shiftl  keycode  73 = U+226B                
+   altgr   shiftl  keycode  73 = U+2309                
+                   keycode  78 = KP_Add                KP_Add                plusminus             VoidSymbol            
+           shiftl  keycode  78 =                       
+   shift   shiftl  keycode  78 = U+2295                
+   altgr   shiftl  keycode  78 = U+2214                
 
 ! --------------------------------------------------------------------------
 ! Keypad Row 3 (home row, middle row)
 ! --------------------------------------------------------------------------
-                   keycode  75 = KP_5                  U+20ac                brokenbar             U+22B6                
-           shiftl  keycode  75 = U+22B7                
-   shift   shiftl  keycode  75 = VoidSymbol            
-                   keycode  76 = KP_6                  U+2660                U+2192                U+2283                
-           shiftl  keycode  76 = U+2287                
-   shift   shiftl  keycode  76 = VoidSymbol            
-                   keycode  77 = KP_1                  ordfeminine           U+2194                U+2264                
-           shiftl  keycode  77 = U+230a                
-   shift   shiftl  keycode  77 = VoidSymbol            
+                   keycode  75 = KP_4                  U+2665                U+2190                VoidSymbol            
+           shiftl  keycode  75 =                       
+   shift   shiftl  keycode  75 = U+2282                
+   altgr   shiftl  keycode  75 = U+2286                
+                   keycode  76 = KP_5                  U+20ac                brokenbar             VoidSymbol            
+           shiftl  keycode  76 =                       
+   shift   shiftl  keycode  76 = U+22B6                
+   altgr   shiftl  keycode  76 = U+22B7                
+                   keycode  77 = KP_6                  U+2660                U+2192                VoidSymbol            
+           shiftl  keycode  77 =                       
+   shift   shiftl  keycode  77 = U+2283                
+   altgr   shiftl  keycode  77 = U+2287                
 
 ! --------------------------------------------------------------------------
 ! Keypad Row 4 (lower row)
 ! --------------------------------------------------------------------------
-                   keycode  79 = KP_2                  masculine             U+2193                U+222a                
-           shiftl  keycode  79 = U+22C3                
-   shift   shiftl  keycode  79 = VoidSymbol            
-                   keycode  80 = KP_3                  U+2666                U+21CC                U+2265                
-           shiftl  keycode  80 = U+230B                
-   shift   shiftl  keycode  80 = VoidSymbol            
-                   keycode  81 = KP_0                  U+2423                percent               U+2030                
-           shiftl  keycode  81 = U+25A1                
-   shift   shiftl  keycode  81 = VoidSymbol            
+                   keycode  79 = KP_1                  ordfeminine           U+2194                VoidSymbol            
+           shiftl  keycode  79 =                       
+   shift   shiftl  keycode  79 = U+2264                
+   altgr   shiftl  keycode  79 = U+230a                
+                   keycode  80 = KP_2                  masculine             U+2193                VoidSymbol            
+           shiftl  keycode  80 =                       
+   shift   shiftl  keycode  80 = U+222a                
+   altgr   shiftl  keycode  80 = U+22C3                
+                   keycode  81 = KP_3                  U+2666                U+21CC                VoidSymbol            
+           shiftl  keycode  81 =                       
+   shift   shiftl  keycode  81 = U+2265                
+   altgr   shiftl  keycode  81 = U+230B                
 
 ! --------------------------------------------------------------------------
 ! Keypad Row 5 (lowest row)
 ! --------------------------------------------------------------------------
-                   keycode  82 = comma                 period                U+002c                U+2032                
-           shiftl  keycode  82 = U+2033                
-   shift   shiftl  keycode  82 = VoidSymbol            
-                   keycode  83 = comma                 period                U+002c                U+2032                
-           shiftl  keycode  83 = U+2033                
-   shift   shiftl  keycode  83 = VoidSymbol            
+                   keycode  82 = comma                 period                U+002c                VoidSymbol            
+           shiftl  keycode  82 =                       
+   shift   shiftl  keycode  82 = U+2032                
+   altgr   shiftl  keycode  82 = U+2033                
+                   keycode  83 = comma                 period                U+002c                VoidSymbol            
+           shiftl  keycode  83 =                       
+   shift   shiftl  keycode  83 = U+2032                
+   altgr   shiftl  keycode  83 = U+2033                
 
 
 ! --------------------------------------------------------------------------