summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorerik <erik@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2007-06-02 11:20:12 +0000
committererik <erik@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2007-06-02 11:20:12 +0000
commit3ac34bf1d159166f5b259b74b406d543fcc87c17 (patch)
treebf316ab720ebcf6820be896012d5e2dbe9415c64 /linux
parent6a27e92c87c00b01c385add2340d08029e3e7225 (diff)
downloadneo-layout-3ac34bf1d159166f5b259b74b406d543fcc87c17.tar.gz
neo-layout-3ac34bf1d159166f5b259b74b406d543fcc87c17.tar.bz2
neo-layout-3ac34bf1d159166f5b259b74b406d543fcc87c17.zip
linux de und xmodmap aktualisiert, Fehler weg, Leerzeichen am Ende weg, README für X-Version angepasst
git-svn-id: https://svn.neo-layout.org@142 b9310e46-f624-0410-8ea1-cfbb3a30dc96
Diffstat (limited to 'linux')
-rw-r--r--linux/X/README52
-rw-r--r--linux/X/de38
-rw-r--r--linux/xmodmap/neo_de.xmodmap74
3 files changed, 87 insertions, 77 deletions
diff --git a/linux/X/README b/linux/X/README
index 9fb3ae1..ec0615a 100644
--- a/linux/X/README
+++ b/linux/X/README
@@ -1,32 +1,42 @@
-== Kleine Anleitung ==
-die Datei „de“ muss unter linux nach:
-/usr/share/X11/xkb/symbols
-(root-rechte benoetigt)
-Achtung dort befindet meist schon eine Datei mit gleichem Namen!
-Entweder vorher backup machen oder man benennt diese Datei anders. Dann
-muss man allerdings auch die nachfolgenden Befehle anpassen (den Namen,
-den man gewählt hat statt „de“)
-
-Wenn man keinen root Rechte hat, funktioniert auch:
-
-setxkbmap de neo -print | xkbcomp - -I$PWD $DISPLAY
-
-Wenn man im ordner mit der Datei "de" ist. Ansonsten muss man $PWD durch das Verzeichnis ersetzen.
-
+== Anleitung für Anwender ohne Root-Zugang ==
+ ______________________________________________________________________
+ Achtung, diese Methode funktioniert nur, wenn man schon ein System mit
+ NEO 1.0 hat. Sonst muss man die xmodmap-Variante benutzen.
+ ——————————————————————————————————————————————————————————————————————
+Wenn man keine root-Rechte hat, gibt man folgenden Befehl ein:
+ setxkbmap de neo -print | xkbcomp - -I$PWD $DISPLAY
+Dies nur, wenn man gerade im Ordner mit der Datei „de“ ist.
+Ansonsten muss man $PWD durch das Verzeichnis mit der „de“-Datei ersetzen.
+
+== Anleitung für Anwender mit Root-Zugang ==
+Wenn man für den benutzten Rechner Root-Rechte bekommen kann, muss die Datei
+„de“ unter Linux nach
+ /usr/share/X11/xkb/symbols
+kopiert werden. Achtung dort befindet meist schon eine Datei mit gleichem Namen!
+Entweder vorher ein Backup machen oder man benennt diese Datei anders. Dann muss
+man allerdings auch die nachfolgenden Befehle anpassen (den Namen, den man statt
+„de“ gewählt hat).
=== Aktivieren ===
-Zu aktivieren einfach
+Zum Aktivieren nur
setxkbmap de neo
-eintippen
+eintippen.
=== Deaktivieren ===
Zurück zu qwertz geht es mit:
- setxkbmap de
+ setxkbmap de
-=== Tipp ===
+== Tipp ==
Trägt man folgende Zeilen in die ~/.bashrc, ~/.zshrc oder vergleichbares ein,
kann man anschließend mittels abrollen der linken Hand auf der Grundreihe
zwischen qwertz und NEO wechseln.
-alias uiae='setxkbmap de'
-alias asdf='setxkbmap de neo'
+=== Ohne Root-Zugang ===
+ alias asdf='setxkbmap de neo -print | xkbcomp - -I$NEO_PWD $DISPLAY'
+ alias uiae='setxkbmap de'
+wobei $NEO_PWD durch das Verzeichnis mit der „de“-Datei ersetzt werden muss.
+
+
+=== Mit Root-Zugang ===
+ alias asdf='setxkbmap de neo'
+ alias uiae='setxkbmap de'
diff --git a/linux/X/de b/linux/X/de
index e35f941..1a25b36 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -115,11 +115,11 @@ xkb_symbols "ro_nodeadkeys" {
};
// German Dvorak keymap by Thorsten Staerk (www.staerk.de/thorsten)
-// Have acute and grave as dead keys, tilde and circumflex alive as they are needed
+// Have acute and grave as dead keys, tilde and circumflex alive as they are needed
// in many programming languages.
// to use this keymap, use a 105-key-keyboard and the command setxkbmap -model pc105 -layout dvorak -variant de
// source: http://www-lehre.informatik.uni-osnabrueck.de/~rfreund/dvorak.php
-partial alphanumeric_keys
+partial alphanumeric_keys
xkb_symbols "dvorak" {
include "us(dvorak)"
@@ -226,7 +226,7 @@ xkb_symbols "neo" {
key <AE08> { [ 8, doublelowquotemark, singlelowquotemark, guillemotright, slash, U2203 ] };
key <AE09> { [ 9, leftdoublequotemark, leftsinglequotemark, guillemotleft, asterisk, U2200 ] };
key <AE10> { [ 0, rightdoublequotemark, rightsinglequotemark, U203A, minus, notsign ] };
- key <AE11> { [ minus, endash, emdash, U2039, minus, U2228 ] };
+ key <AE11> { [ minus, endash, emdash, U2039, minus, logicalor ] };
key <AE12> { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek, dead_abovedot, dead_abovering ] };
@@ -241,7 +241,7 @@ xkb_symbols "neo" {
key <AD07> { [ h, H, less, Greek_psi, 7, Greek_PSI ] };
key <AD08> { [ g, G, greater, Greek_gamma, 8, Greek_GAMMA ] };
key <AD09> { [ f, F, equal, Greek_phi, 9, Greek_PHI ] };
- key <AD10> { [ q, Q, ampersand, q, plus, U2227 ] };
+ key <AD10> { [ q, Q, ampersand, q, plus, logicaland ] };
key <AD11> { [ ssharp, ssharp, U133, U132, schwa, SCHWA ] };
key <AD12> { [ dead_tilde, dead_macron, dead_diaeresis, dead_doubleacute, dead_belowdot, dead_belowdot ] };
@@ -259,16 +259,16 @@ xkb_symbols "neo" {
key <AC09> { [ t, T, minus, Greek_tau, 6, trademark ] };
key <AC10> { [ d, D, colon, Greek_delta, comma, Greek_DELTA ] };
key <AC11> { [ y, Y, y, Greek_upsilon, thorn, THORN ] };
-
+
// untere Reihe
key <AB01> { [ odiaeresis, Odiaeresis, numbersign, odiaeresis, Escape ] };
- key <AB02> { [ udiaeresis, Udiaeresis, dollar, Udiaeresis, Delete, U222B ] };
+ key <AB02> { [ udiaeresis, Udiaeresis, dollar, udiaeresis, Delete, integral ] };
key <AB03> { [ adiaeresis, Adiaeresis, bar, Greek_eta, Next, Next ] };
key <AB04> { [ p, P, asciitilde, Greek_pi, p, Greek_PI ] };
key <AB05> { [ z, Z, grave, Greek_zeta, z, Greek_OMEGA ] };
- key <AB06> { [ b, B, plus, Greek_beta, infinity, U2022 ] };
+ key <AB06> { [ b, B, plus, Greek_beta, infinity, enfilledcircbullet ] };
key <AB07> { [ m, M, percent, mu, 1 ] };
key <AB08> { [ comma, apostrophe, apostrophe, U3D1, 2, radical ] };
key <AB09> { [ period, ellipsis, quotedbl, Greek_theta, 3, Greek_THETA ] };
@@ -280,7 +280,7 @@ xkb_symbols "neo" {
// Keypad
// key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
-
+
key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
key <KPDV> { [ KP_Divide, KP_Divide, division, U2215 ] };
@@ -290,7 +290,7 @@ xkb_symbols "neo" {
key <KP7> { [ KP_Home, KP_7, KP_7, U226A ] };
key <KP8> { [ KP_Up, KP_8, uparrow, U2229 ] };
key <KP9> { [ KP_Prior, KP_9, KP_9, U226B ] };
- key <KPAD> { [ KP_Add, KP_Add, plusminus, U2213 ] };
+ key <KPAD> { [ KP_Add, KP_Add, plusminus, U2213 ] };
key <KP4> { [ KP_Left, KP_4, leftarrow, U2282 ] };
key <KP5> { [ KP_Begin, KP_5, dagger, U222A ] };
@@ -307,18 +307,18 @@ xkb_symbols "neo" {
// die neuen Mods
- key <CAPS> {
- type[Group1]="EIGHT_LEVEL",
- [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock, Caps_Lock, Caps_Lock, Caps_Lock ]
+ key <CAPS> {
+ type[Group1]="EIGHT_LEVEL",
+ [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock, Caps_Lock, Caps_Lock, Caps_Lock ]
};
-
+
key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] };
-
+
key <LSGT> { [ 0xfe11,0xfe11,0xfe11,0xfe11 ] };
-
+
key <RALT> { type[Group1]="TWO_LEVEL", symbols[Group1] = [ 0xfe11 ] };
-
+
modifier_map Mod3 { 0xfe11 };
};
@@ -327,7 +327,7 @@ xkb_symbols "neo" {
// Copied from macintosh_vndr/de
// olh@suse.de very close to MacOS map
-partial alphanumeric_keys
+partial alphanumeric_keys
xkb_symbols "mac" {
include "de"
@@ -345,7 +345,7 @@ xkb_symbols "mac" {
key <AD07> { [ u, U, diaeresis, Aacute ] };
key <AD08> { [ i, I, slash, Ucircumflex ] };
key <AD11> { [ udiaeresis, Udiaeresis, periodcentered, degree ] };
- key <AD12> { [ plus, asterisk, asciitilde ] };
+ key <AD12> { [ plus, asterisk, asciitilde ] };
key <AC01> { [ a, A, aring, Aring ] };
key <AC05> { [ g, G, copyright ] };
key <AC06> { [ h, H, ordfeminine ] };
@@ -355,7 +355,7 @@ xkb_symbols "mac" {
};
-partial alphanumeric_keys
+partial alphanumeric_keys
xkb_symbols "mac_nodeadkeys" {
// modify the standard German mac layout to not have any dead keys
include "de(mac)"
diff --git a/linux/xmodmap/neo_de.xmodmap b/linux/xmodmap/neo_de.xmodmap
index b7b687e..38be57a 100644
--- a/linux/xmodmap/neo_de.xmodmap
+++ b/linux/xmodmap/neo_de.xmodmap
@@ -1,9 +1,9 @@
!! ~/.xmodmap
!!
-!! created by Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>
-!! and Erik Streb <mail@erikstreb.de>
+!! created by Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>
+!! and Erik Streb <mail at erikstreb dot de>
!!
-!! The german NEO Layout Version 1.9.5
+!! The german NEO Layout Version 1.9.6
!! see http://pebbles.schattenlauf.de/layout.php for details
!!
!! To try the layout in this file, simply do xmodmap <file>.
@@ -18,43 +18,43 @@
!keycode 49 = dead_circumflex dead_caron dead_breve dead_stroke
keycode 49 = dead_circumflex dead_caron dead_breve
-keycode 10 = 1 degree notsign onesuperior
-keycode 11 = 2 paragraph 2 twosuperior
-keycode 12 = 3 section 3 threesuperior
+keycode 10 = 1 degree 1 onequarter oneeighth
+keycode 11 = 2 paragraph 2 onehalf
+keycode 12 = 3 section 3 threequarters threeeighths
keycode 13 = 4 dollar yen cent Prior Prior
-keycode 14 = 5 EuroSign sterling currency 5 implies
+keycode 14 = 5 EuroSign sterling currency fiveeighths implies
keycode 15 = 6 ordfeminine ae AE 6 ifonlyif
-keycode 16 = 7 masculine oe OE
-keycode 17 = 8 doublelowquotemark singlelowquotemark guillemotright slash
-keycode 18 = 9 leftdoublequotemark leftsinglequotemark guillemotleft asterisk
-keycode 19 = 0 rightdoublequotemark rightsinglequotemark U203A minus
+keycode 16 = 7 masculine oe OE seveneighths
+keycode 17 = 8 doublelowquotemark singlelowquotemark guillemotright slash U2203
+keycode 18 = 9 leftdoublequotemark leftsinglequotemark guillemotleft asterisk U2200
+keycode 19 = 0 rightdoublequotemark rightsinglequotemark U203A minus notsign
-keycode 20 = minus endash emdash U2039 eth ETH
+keycode 20 = minus endash emdash U2039 minus logicalor
keycode 21 = dead_acute dead_grave dead_cedilla dead_ogonek dead_abovedot dead_abovering
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! The upper row
+! The upper row
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
keycode 24 = x X at Greek_xi x Greek_XI
keycode 25 = v V underscore v BackSpace U039B
keycode 26 = l L bracketleft Greek_lambda Up Up
-keycode 27 = c C bracketright Greek_chi Tab Tab
+keycode 27 = c C bracketright Greek_chi Tab Tab
keycode 28 = w W asciicircum w Insert
keycode 29 = k K exclam Greek_kappa exclamdown copyright
keycode 30 = h H less Greek_psi 7 Greek_PSI
keycode 31 = g G greater Greek_gamma 8 Greek_GAMMA
keycode 32 = f F equal Greek_phi 9 Greek_PHI
-keycode 33 = q Q ampersand q plus
-keycode 34 = ssharp ssharp U133 U132 schwa SCHWA
+keycode 33 = q Q ampersand q plus logicaland
+keycode 34 = ssharp ssharp U133 U132 schwa SCHWA
keycode 35 = dead_tilde dead_macron dead_diaeresis dead_doubleacute dead_belowdot dead_belowdot
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! The home row (middle row)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
keycode 38 = u U backslash backslash Home Home
-keycode 39 = i I slash Greek_iota Left Left
+keycode 39 = i I slash Greek_iota Left Left
keycode 40 = a A braceleft Greek_alpha Down Down
keycode 41 = e E braceright Greek_epsilon Right Right
keycode 42 = o O asterisk Greek_omega End End
@@ -70,14 +70,14 @@ keycode 48 = y Y y Greek_upsilon thorn THORN
! The lower row
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
keycode 52 = odiaeresis Odiaeresis numbersign odiaeresis Escape
-keycode 53 = udiaeresis Udiaeresis dollar Udiaeresis Delete
+keycode 53 = udiaeresis Udiaeresis dollar udiaeresis Delete integral
keycode 54 = adiaeresis Adiaeresis bar Greek_eta Next Next
keycode 55 = p P asciitilde Greek_pi p Greek_PI
keycode 56 = z Z grave Greek_zeta z Greek_OMEGA
-keycode 57 = b B plus Greek_beta infinity
+keycode 57 = b B plus Greek_beta infinity enfilledcircbullet
keycode 58 = m M percent mu 1
-keycode 59 = comma apostrophe apostrophe U3D1 2
+keycode 59 = comma apostrophe apostrophe U3D1 2 radical
keycode 60 = period ellipsis quotedbl Greek_theta 3 Greek_THETA
keycode 61 = j J semicolon j period nabla
@@ -111,43 +111,43 @@ keycode 65 = space space space nobreakspace 0 U202F
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Keypad
+! Keypad
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! The uppest row
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!keycode 77 = Num_Lock Pointer_EnableKeys
-keycode 112 = KP_Divide KP_Divide division U2215
-keycode 63 = KP_Multiply KP_Multiply multiply U22C5 U2217
+!keycode 77 = Num_Lock Pointer_EnableKeys
+keycode 112 = KP_Divide KP_Divide division U2215
+keycode 63 = KP_Multiply KP_Multiply multiply U22C5
keycode 82 = KP_Subtract KP_Subtract U2212
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! The upper row
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 79 = KP_Home KP_7 seveneighths oneeighth
-keycode 80 = KP_Up KP_8 uparrow fiveeighths
-keycode 81 = KP_Prior KP_9 threeeighths threeeighths
-keycode 86 = KP_Add KP_Add plusminus U2213
+keycode 79 = KP_Home KP_7 KP_7 U226A
+keycode 80 = KP_Up KP_8 uparrow U2229
+keycode 81 = KP_Prior KP_9 KP_9 U226B
+keycode 86 = KP_Add KP_Add plusminus U2213
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! The middle row
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 83 = KP_Left KP_4 leftarrow onequarter
-keycode 84 = KP_Begin KP_5 dagger onehalf
-keycode 85 = KP_Right KP_6 rightarrow threequarters
+keycode 83 = KP_Left KP_4 leftarrow U2282
+keycode 84 = KP_Begin KP_5 dagger U222A
+keycode 85 = KP_Right KP_6 rightarrow U2283
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! The lower row
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 87 = KP_End KP_1 onesuperior onesuperior
-keycode 88 = KP_Down KP_2 downarrow twosuperior
-keycode 89 = KP_Next KP_3 threesuperior threesuperior
-keycode 108 = KP_Enter KP_Enter U2260 U2248
-!keysym <KPEQ> KP_Equal
+keycode 87 = KP_End KP_1 KP_1 U2264
+keycode 88 = KP_Down KP_2 downarrow U222A
+keycode 89 = KP_Next KP_3 KP_3 U2265
+keycode 108 = KP_Enter KP_Enter notequal U2248
+!keysym <KPEQ> KP_Equal
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! The lowest row
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
keycode 90 = KP_Insert KP_0 percent U2030
-keycode 91 = KP_Delete KP_Decimal period comma
+keycode 91 = KP_Delete KP_Decimal period comma