neue Version mit (hoffentlich) funktionierenden Control-Tasten

Achtung: die keymap wurde bislang nicht umfangreich getestet!!!

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

5 files changed, 74 insertions, 33 deletions

diff --git a/linux/console/bin/console.control b/linux/console/bin/console.control
new file mode 100644
index 0000000..7ab7bb5
--- /dev/null
+++ b/linux/console/bin/console.control
@@ -0,0 +1,30 @@
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+m
+n
+o
+p
+q
+r
+s
+t
+u
+v
+w
+x
+y
+z
+backslash
+bracketright
+underscore
+asciicircum
diff --git a/linux/console/bin/console.more_control b/linux/console/bin/console.more_control
new file mode 100644
index 0000000..14b5003
--- /dev/null
+++ b/linux/console/bin/console.more_control
@@ -0,0 +1,17 @@
+
+
+! --------------------------------------------------------------------------
+! additional Keys with control function (has to be edited manually!!!!)
+! --------------------------------------------------------------------------
+   control altgr   keycode  30 = Control_backslash
+   alt     altgr   keycode  30 = Control_backslash
+   control alt altgr keycode  30 = Meta_Control_backslash
+   control altgr   keycode  19 = Control_bracketright
+   alt     altgr   keycode  19 = Control_bracketright
+   control alt altgr keycode  19 = Meta_Control_bracketright
+   control altgr   keycode  17 = Control_underscore
+   alt     altgr   keycode  17 = Control_underscore
+   control alt altgr keycode  17 = Meta_Control_underscore
+   control altgr   keycode  20 = Control_asciicircum
+   alt     altgr   keycode  20 = Control_asciicircum
+   control alt altgr keycode  20 = Meta_Control_asciicircum
diff --git a/linux/console/bin/console.sondertasten b/linux/console/bin/console.sondertasten
index 6281fa9..049e1e5 100644
--- a/linux/console/bin/console.sondertasten
+++ b/linux/console/bin/console.sondertasten
@@ -17,42 +17,26 @@ compose as usual
 ! Modifier definitions
 ! --------------------------------------------------------------------------
                    keycode  42 = Shift           
+#          shift   keycode  42 = Caps_Lock       
                    keycode  54 = Shift           
+#          shift   keycode  54 = Caps_Lock       
                    keycode  58 = AltGr           
+#          altgr   keycode  58 = AltGr_Lock      
                    keycode  43 = AltGr           
+#          altgr   keycode  43 = AltGr_Lock      
                    keycode  86 = ShiftL          
+#          shiftl  keycode  86 = ShiftL_Lock     
                    keycode 100 = ShiftL          
+#          shiftl  keycode 100 = ShiftL_Lock     
 
-                   keycode   1 = Escape           Escape          
+                   keycode   1 = Escape           Escape          Escape          Escape          
+           shiftl  keycode  57 = Escape           
+   shift   shiftl  keycode  57 = Escape           
+   altgr   shiftl  keycode  57 = Escape           
            alt     keycode   1 = Meta_Escape     
    shift   altgr   keycode   1 = Meta_Escape     
 
 ! --------------------------------------------------------------------------
-! Keys with control function (has to be edited manually!!!!)
-! --------------------------------------------------------------------------
-           control keycode  33 = Control_e       
-   shift   control keycode  33 = Control_e       
-   altgr   control keycode  33 = Control_e       
-           alt     keycode  33 = Meta_e          
-   shift   alt     keycode  33 = Meta_E          
-   altgr   alt     keycode  33 = Meta_e          
-   control alt     keycode  33 = Meta_Control_e  
-           control keycode  19 = Control_c       
-   shift   control keycode  19 = Control_c       
-   altgr   control keycode  19 = Control_c       
-           alt     keycode  19 = Meta_c          
-   shift   alt     keycode  19 = Meta_C          
-   altgr   alt     keycode  19 = Meta_c          
-   control alt     keycode  19 = Meta_Control_c  
-           control keycode  50 = Control_m       
-   shift   control keycode  50 = Control_m       
-   altgr   control keycode  50 = Control_m       
-           alt     keycode  50 = Meta_m          
-   shift   alt     keycode  50 = Meta_M          
-   altgr   alt     keycode  50 = Meta_m          
-   control alt     keycode  50 = Meta_Control_m  
-
-! --------------------------------------------------------------------------
 ! function keys
 ! --------------------------------------------------------------------------
 ! ----Backspace-------------------------------------------------------------
@@ -100,10 +84,10 @@ compose as usual
            alt     keycode 106 = Incr_Console    
                    keycode 108 = Down            
 ! ----Win keys--------------------------------------------------------------
-                   keycode 125 = Decr_Console    Last_Console      Incr_Console     Compose
-                   keycode 126 = Incr_Console    Last_Console      Decr_Console     Compose
+                   keycode 125 = Decr_Console    Last_Console      Incr_Console     
+                   keycode 126 = Incr_Console    Last_Console      Decr_Console     
 ! ----menue key-------------------------------------------------------------
-                   keycode 127 = F100
+                   keycode 127 = Compose         F100
 ! ----F-keys----------------------------------------------------------------
                    keycode  59 = F1               F13              Console_13       F25             
            alt     keycode  59 = Console_1       
diff --git a/linux/console/bin/erzeuge_neo-belegung b/linux/console/bin/erzeuge_neo-belegung
index 964534c..04ce226 100755
--- a/linux/console/bin/erzeuge_neo-belegung
+++ b/linux/console/bin/erzeuge_neo-belegung
@@ -1,8 +1,8 @@
 dumpkeys --long-info > dump
 cat console.ersetze.vorprogramm > console.ersetze
 ./mach_kurzreferenz.vorprogramm >> console.ersetze
-rm dump
+#rm dump
 ./mach_kurzreferenz > kurzreferenz
 ./mach_console
 rm kurzreferenz
-rm console.ersetze
\ No newline at end of file
+rm console.ersetze
diff --git a/linux/console/bin/mach_console b/linux/console/bin/mach_console
index 408b644..a5be721 100755
--- a/linux/console/bin/mach_console
+++ b/linux/console/bin/mach_console
@@ -6,6 +6,14 @@ schreiben () {
 	printf "           shiftl  keycode %3s = %-22s\n" $1 $6
 	printf "   shift   shiftl  keycode %3s = %-22s\n" $1 $7
 	printf "   altgr   shiftl  keycode %3s = %-22s\n" $1 $8
+
+	if [ `grep ^$2$ console.control` ]; then
+		printf "           control keycode %3s = Control_%-22s\n" $1 $2
+		printf "   shift   control keycode %3s = Control_%-22s\n" $1 $2
+		printf "           alt     keycode %3s = Meta_%-22s\n" $1 $2
+		printf "   shift   alt     keycode %3s = Meta_%-22s\n" $1 $3
+		printf "   control alt     keycode %3s = Meta_Control_%-22s\n" $1 $2
+	fi
 }
 
 lesen() {
@@ -88,11 +96,13 @@ echo "! Keypad Row 5 (lowest row)"
 echo "! --------------------------------------------------------------------------"
 lesen 2 62 82
 
+cat console.more_control
+
 echo
 echo
 echo "! --------------------------------------------------------------------------"
 echo "! Strings and Compose"
 echo "! --------------------------------------------------------------------------"
-echo "string F100 = \"setleds +num\n\""
+echo "# string F100 = \"setleds +num\n\""
 
-#cat console.string_compose
\ No newline at end of file
+#cat console.string_compose