summaryrefslogtreecommitdiffstats
path: root/linux/X
diff options
context:
space:
mode:
Diffstat (limited to 'linux/X')
-rw-r--r--linux/X/TODO3
-rw-r--r--linux/X/de125
2 files changed, 68 insertions, 60 deletions
diff --git a/linux/X/TODO b/linux/X/TODO
index 7b61f40..8a1dbc2 100644
--- a/linux/X/TODO
+++ b/linux/X/TODO
@@ -50,3 +50,6 @@ Compose und Caps gehen noch nicht richtig (Compose nur rechts, Caps nur links)
== Bugreport an KDE senden ==
Falsches Zeichen erscheint bei Eingabe vom Implikationspfeil. Siehe Mail von
Erik Streb vom 13.08.2007 01:34.
+
+== uptack und downtack ==
+in der Datei /usr/include/X11/keysymdef.h sind uptack und downtack vertauscht! Fehler melden!
diff --git a/linux/X/de b/linux/X/de
index dd43033..7676432 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -236,11 +236,11 @@ xkb_symbols "neo" {
key <LSGT> { key.type[Group1]="ONE_LEVEL", [ 0xfe11 ]};
key <RALT> { key.type[Group1]="ONE_LEVEL", [ 0xfe11 ]};
- modifier_map Mod4 { <LSGT>, <RALT> };
+ modifier_map Mod4 { <LSGT>, <RALT> };
////////////////////////////////////////////////////
- // Ebenen im Neo-Jargon, hier im Treiber anders
+ // Ebenen im Neo-Jargon, hier im Treiber andere Reihenfolge
////////////////////////////////////////////////////
// Ebene 1: normal
// Ebene 2: Shift
@@ -254,13 +254,13 @@ xkb_symbols "neo" {
////////////////////////////////////////////////////
// Ebenen im Xkeymap-Jargon, hier in der Treiberdatei
////////////////////////////////////////////////////
- //
- // Die von uns genannte Ebene 6 ist auf die Xorg-Ebene 7
- // verschoben, da die X-Ebene 6 mit Shift+Mod4 zu erreichen ist.
- // Die Navigationstasten von Ebene 5 (X-Ebene – Mod4) werden, um auch
- // mit Shift+Mod4 zu funktionieren, nochmal in der X-Ebene 6
- // wiederholt. Also so:
- // Eb1, Eb2, Eb3, Eb5, Eb4, Eb4, Eb6
+ // Die von uns genannte Ebene 6 ist auf den X-Level 7
+ // verschoben, da der X-Level 6 mit Shift+Mod4 zu erreichen ist.
+ // Die Navigationstasten von Ebene 4 (mit X-Mod4 bzw. X-Level 5)
+ // werden teilweise, um auch mit Shift+Mod4 zu funktionieren,
+ // nochmal im X-Level 6 wiederholt. Also so:
+ // Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Eb4+Shift Ebene6
+ // X-Level1 X-Level2 X-Level3 X-Level4 X-Level5 X-Level6 X-Level7
////////////////////////////////////////////////////
// general Lock
@@ -282,73 +282,78 @@ xkb_symbols "neo" {
// This are the Levels Xorg (with type="EIGHT_LEVEL") thinks they are
// Base Shift Mod3 Shift+Mod3 Mod4 Shift+Mod4 Mod3+Mod4
// Level1 Level2 Level3 Level4 Level5 Level6 Level7
+ // Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Ebene4+Shift Ebene6
- key <TLDE> { [ dead_circumflex, dead_caron, dead_breve, dead_stroke, dead_belowdot, NoSymbol, dead_belowdot ] };
+ key <TLDE> { [ dead_circumflex, dead_caron, dead_breve, dead_stroke, dead_belowdot, NoSymbol, dead_belowdot ] };
- key <AE01> { [ 1, degree, onesuperior, femalesymbol, enfilledcircbullet ] };
- key <AE02> { [ 2, numerosign, twosuperior, U26A5, U2023, NoSymbol, logicalor ] };
- key <AE03> { [ 3, section, threesuperior, malesymbol, 3, NoSymbol, logicaland ] };
- key <AE04> { [ 4, guillemotright, U203A, U2113, KP_Prior, NoSymbol, KP_Prior ] };
- key <AE05> { [ 5, guillemotleft, U2039, dagger, 5, NoSymbol, implies ] };
- key <AE06> { [ 6, EuroSign, cent, 6, sterling, NoSymbol, U2225 ] };
+ key <AE01> { [ 1, degree, onesuperior, femalesymbol, enfilledcircbullet, NoSymbol, notsign ] };
+ key <AE02> { [ 2, numerosign, twosuperior, U26A5, U2023, NoSymbol, logicalor ] };
+ key <AE03> { [ 3, section, threesuperior, malesymbol, NoSymbol, NoSymbol, logicaland ] };
+ key <AE04> { [ 4, guillemotright, U203A, U2113, KP_Prior, KP_Prior, uptack ] };
+ key <AE05> { [ 5, guillemotleft, U2039, dagger, NoSymbol, NoSymbol, U2221 ] };
+ key <AE06> { [ 6, EuroSign, cent, NoSymbol, sterling, NoSymbol, U2225 ] };
- key <AE07> { [ 7, dollar, yen, U03F0, currency, NoSymbol, notelementof ] };
- key <AE08> { [ 8, doublelowquotemark, singlelowquotemark, 8, KP_Divide, NoSymbol, U2203 ] };
- key <AE09> { [ 9, leftdoublequotemark, leftsinglequotemark, 9, KP_Multiply, NoSymbol, U2200 ] };
- key <AE10> { [ 0, rightdoublequotemark, rightsinglequotemark, 0, minus, NoSymbol, logicalor ] };
+ key <AE07> { [ 7, dollar, yen, U03F0, currency, NoSymbol, notelementof ] };
+ key <AE08> { [ 8, doublelowquotemark, singlelowquotemark, NoSymbol, KP_Divide, NoSymbol, U2204 ] };
+ key <AE09> { [ 9, leftdoublequotemark, leftsinglequotemark, NoSymbol, KP_Multiply, NoSymbol, U2226 ] };
+ key <AE10> { [ 0, rightdoublequotemark, rightsinglequotemark, NoSymbol, minus, NoSymbol, emptyset ] };
- key <AE11> { [ minus, endash, emdash, U2011, minus, NoSymbol, hyphen ] };
- key <AE12> { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek, dead_abovedot, NoSymbol, dead_abovering ] };
+ key <AE11> { [ minus, endash, emdash, U2011, NoSymbol, NoSymbol, hyphen ] };
+ key <AE12> { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek, dead_abovedot, NoSymbol, dead_abovering ] };
////////////////////////////////////////////////////
// The upper row
////////////////////////////////////////////////////
- key <AD01> { [ x, X, x, Greek_xi, x, NoSymbol, Greek_XI ] };
- key <AD02> { [ v, V, underscore, v, BackSpace, NoSymbol, BackSpace ] };
- key <AD03> { [ l, L, bracketleft, Greek_lambda, KP_Up, NoSymbol, KP_Up ] };
- key <AD04> { [ c, C, bracketright, Greek_chi, KP_Delete, NoSymbol, KP_Delete ] };
- key <AD05> { [ w, W, asciicircum, Greek_omega, KP_Insert, NoSymbol, Greek_OMEGA ] };
- key <AD06> { [ k, K, exclam, Greek_kappa, exclamdown, NoSymbol, radical ] };
- key <AD07> { [ h, H, less, Greek_psi, KP_7, NoSymbol, Greek_PSI ] };
- key <AD08> { [ g, G, greater, Greek_gamma, KP_8, NoSymbol, Greek_GAMMA ] };
- key <AD09> { [ f, F, equal, U03D5, KP_9, NoSymbol, Greek_PHI ] };
- key <AD10> { [ q, Q, ampersand, Greek_phi, plus, NoSymbol, U211A ] };
- key <AD11> { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, ssharp, NoSymbol, jot ] };
- key <AD12> { [ dead_tilde, dead_macron, dead_diaeresis, dead_doubleacute ] };
+ key <AD01> { [ x, X, NoSymbol, Greek_xi, NoSymbol, NoSymbol, Greek_XI ] };
+ key <AD02> { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, U2259 ] };
+ key <AD03> { [ l, L, bracketleft, Greek_lambda, KP_Up, KP_Up, Greek_LAMBDA ] };
+ key <AD04> { [ c, C, bracketright, Greek_chi, KP_Delete, KP_Delete, U2102 ] };
+ key <AD05> { [ w, W, asciicircum, Greek_omega, KP_Insert, KP_Insert, Greek_OMEGA ] };
+
+ key <AD06> { [ k, K, exclam, Greek_kappa, exclamdown, NoSymbol, radical ] };
+ key <AD07> { [ h, H, less, Greek_psi, KP_7, NoSymbol, Greek_PSI ] };
+ key <AD08> { [ g, G, greater, Greek_gamma, KP_8, NoSymbol, Greek_GAMMA ] };
+ key <AD09> { [ f, F, equal, U03D5, KP_9, NoSymbol, Greek_PHI ] };
+ key <AD10> { [ q, Q, ampersand, Greek_phi, plus, NoSymbol, U211A ] };
+ key <AD11> { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot ] };
+
+ key <AD12> { [ dead_tilde, dead_macron, dead_diaeresis, dead_doubleacute ] };
////////////////////////////////////////////////////
// The home row (middle row)
////////////////////////////////////////////////////
- key <AC01> { [ u, U, backslash, u, KP_Home, KP_Home ] };
- key <AC02> { [ i, I, slash, Greek_iota, KP_Left, KP_Left ] };
- key <AC03> { [ a, A, braceleft, Greek_alpha, KP_Down, KP_Down ] };
- key <AC04> { [ e, E, braceright, Greek_epsilon, KP_Right, KP_Right ] };
- key <AC05> { [ o, O, asterisk, Greek_omicron, KP_End, KP_End ] };
- key <AC06> { [ s, S, question, Greek_sigma, questiondown, NoSymbol, Greek_SIGMA ] };
- key <AC07> { [ n, N, parenleft, Greek_nu, KP_4 ] };
- key <AC08> { [ r, R, parenright, Greek_rho, KP_5, NoSymbol, registered ] };
- key <AC09> { [ t, T, minus, Greek_tau, KP_6, NoSymbol, trademark ] };
- key <AC10> { [ d, D, colon, Greek_delta, comma, NoSymbol, Greek_DELTA ] };
- key <AC11> { [ y, Y, at, Greek_upsilon, y, NoSymbol, nabla ] };
+ key <AC01> { [ u, U, backslash, NoSymbol, KP_Home, KP_Home, U222E ] };
+ key <AC02> { [ i, I, slash, Greek_iota, KP_Left, KP_Left, integral ] };
+ key <AC03> { [ a, A, braceleft, Greek_alpha, KP_Down, KP_Down, U2200 ] };
+ key <AC04> { [ e, E, braceright, Greek_epsilon, KP_Right, KP_Right, U2203 ] };
+ key <AC05> { [ o, O, asterisk, Greek_omicron, KP_End, KP_End, elementof ] };
+
+ key <AC06> { [ s, S, question, Greek_sigma, questiondown, NoSymbol, Greek_SIGMA ] };
+ key <AC07> { [ n, N, parenleft, Greek_nu, KP_4, NoSymbol, U2115 ] };
+ key <AC08> { [ r, R, parenright, Greek_rho, KP_5, NoSymbol, U211D ] };
+ key <AC09> { [ t, T, minus, Greek_tau, KP_6, NoSymbol, partialderivative ] };
+ key <AC10> { [ d, D, colon, Greek_delta, NoSymbol, NoSymbol, Greek_DELTA ] };
+ key <AC11> { [ y, Y, at, Greek_upsilon, NoSymbol, NoSymbol, nabla ] };
////////////////////////////////////////////////////
// The lower row
////////////////////////////////////////////////////
- key <AB01> { [ udiaeresis, Udiaeresis, numbersign, udiaeresis, Escape ] };
- key <AB02> { [ odiaeresis, Odiaeresis, dollar, odiaeresis, Tab, Tab ] };
- key <AB03> { [ adiaeresis, Adiaeresis, bar, Greek_eta, KP_Next, KP_Next ] };
- key <AB04> { [ p, P, asciitilde, Greek_pi, KP_Enter, NoSymbol, Greek_PI ] };
- key <AB05> { [ z, Z, grave, Greek_zeta, z, NoSymbol, Greek_OMEGA ] };
- key <AB06> { [ b, B, plus, Greek_beta, KP_Decimal, KP_Decimal ] };
- key <AB07> { [ m, M, percent, mu, KP_1, NoSymbol, integral ] };
- key <AB08> { [ comma, comma, quotedbl, U03F1, 2, NoSymbol, radical ] };
- key <AB09> { [ period, ellipsis, apostrophe, Greek_theta, 3, NoSymbol, Greek_THETA ] };
- key <AB10> { [ j, J, semicolon, U3D1, period, NoSymbol, nabla ] };
+ key <AB01> { [ udiaeresis, Udiaeresis, numbersign, NoSymbol, Escape, Escape, variation ] };
+ key <AB02> { [ odiaeresis, Odiaeresis, dollar, NoSymbol, Tab, Tab, U2111 ] };
+ key <AB03> { [ adiaeresis, Adiaeresis, bar, Greek_eta, KP_Next, KP_Next, U211C ] };
+ key <AB04> { [ p, P, asciitilde, Greek_pi, KP_Enter, KP_Enter, Greek_PI ] };
+ key <AB05> { [ z, Z, grave, Greek_zeta, NoSymbol, NoSymbol, U2124 ] };
+
+ key <AB06> { [ b, B, plus, Greek_beta, KP_Decimal, NoSymbol, implies ] };
+ key <AB07> { [ m, M, percent, Greek_mu, KP_1, NoSymbol, ifonlyif ] };
+ key <AB08> { [ comma, U22EE, quotedbl, U03F1, KP_2, NoSymbol, U21D0 ] };
+ key <AB09> { [ period, ellipsis, apostrophe, Greek_theta, KP_3, NoSymbol, Greek_THETA ] };
+ key <AB10> { [ j, J, semicolon, U03D1, NoSymbol, NoSymbol, identical ] };
////////////////////////////////////////////////////
// Space key
////////////////////////////////////////////////////
- key <SPCE> { [ space, space, space, nobreakspace, KP_0, NoSymbol, U202F ] };
+ key <SPCE> { [ space, space, space, nobreakspace, KP_0, NoSymbol, U202F ] };
////////////////////////////////////////////////////
// Keypad
@@ -361,22 +366,22 @@ xkb_symbols "neo" {
key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
key <KPDV> { [ KP_Divide, KP_Divide, division, U2215 ] };
- key <KPMU> { [ KP_Multiply, KP_Multiply, multiply, U22C5 ] };
- key <KPSU> { [ KP_Subtract, KP_Subtract, U2212 ] };
+ key <KPMU> { [ KP_Multiply, KP_Multiply, multiply, U2219 ] };
+ key <KPSU> { [ KP_Subtract, KP_Subtract, U2212, NoSymbol ] };
////////////////////////////////////////////////////
// The upper row
////////////////////////////////////////////////////
key <KP7> { [ KP_Home, KP_7, U2195, U226A ] };
key <KP8> { [ KP_Up, KP_8, uparrow, intersection ] };
- key <KP9> { [ KP_Prior, KP_9, KP_9, U226B ] };
+ key <KP9> { [ KP_Prior, KP_9, U2297, U226B ] };
key <KPAD> { [ KP_Add, KP_Add, plusminus, U2213 ] };
////////////////////////////////////////////////////
// The middle row
////////////////////////////////////////////////////
key <KP4> { [ KP_Left, KP_4, leftarrow, includedin ] };
- key <KP5> { [ EuroSign, KP_5, dagger, U220A ] };
+ key <KP5> { [ EuroSign, KP_5, infinity, containsas ] };
key <KP6> { [ KP_Right, KP_6, rightarrow, includes ] };
////////////////////////////////////////////////////