From 8221930b88c919dde4c0ae5ff72c34aa148b3ac9 Mon Sep 17 00:00:00 2001 From: erik Date: Mon, 5 May 2008 13:22:14 +0000 Subject: xkeymap auf aktuellem stand, , und . auf ebene 4 weg, U+22C5 DOT OPERATOR auf Ebene 4 auf Ziffernblock durch U+2219 BULLET OPERATOR ersetzt git-svn-id: https://svn.neo-layout.org@497 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- linux/X/TODO | 3 ++ linux/X/de | 125 +++++++++++++++++++++++++++++++---------------------------- 2 files changed, 68 insertions(+), 60 deletions(-) (limited to 'linux/X') 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 { key.type[Group1]="ONE_LEVEL", [ 0xfe11 ]}; key { key.type[Group1]="ONE_LEVEL", [ 0xfe11 ]}; - modifier_map Mod4 { , }; + modifier_map Mod4 { , }; //////////////////////////////////////////////////// - // 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 { [ dead_circumflex, dead_caron, dead_breve, dead_stroke, dead_belowdot, NoSymbol, dead_belowdot ] }; + key { [ dead_circumflex, dead_caron, dead_breve, dead_stroke, dead_belowdot, NoSymbol, dead_belowdot ] }; - key { [ 1, degree, onesuperior, femalesymbol, enfilledcircbullet ] }; - key { [ 2, numerosign, twosuperior, U26A5, U2023, NoSymbol, logicalor ] }; - key { [ 3, section, threesuperior, malesymbol, 3, NoSymbol, logicaland ] }; - key { [ 4, guillemotright, U203A, U2113, KP_Prior, NoSymbol, KP_Prior ] }; - key { [ 5, guillemotleft, U2039, dagger, 5, NoSymbol, implies ] }; - key { [ 6, EuroSign, cent, 6, sterling, NoSymbol, U2225 ] }; + key { [ 1, degree, onesuperior, femalesymbol, enfilledcircbullet, NoSymbol, notsign ] }; + key { [ 2, numerosign, twosuperior, U26A5, U2023, NoSymbol, logicalor ] }; + key { [ 3, section, threesuperior, malesymbol, NoSymbol, NoSymbol, logicaland ] }; + key { [ 4, guillemotright, U203A, U2113, KP_Prior, KP_Prior, uptack ] }; + key { [ 5, guillemotleft, U2039, dagger, NoSymbol, NoSymbol, U2221 ] }; + key { [ 6, EuroSign, cent, NoSymbol, sterling, NoSymbol, U2225 ] }; - key { [ 7, dollar, yen, U03F0, currency, NoSymbol, notelementof ] }; - key { [ 8, doublelowquotemark, singlelowquotemark, 8, KP_Divide, NoSymbol, U2203 ] }; - key { [ 9, leftdoublequotemark, leftsinglequotemark, 9, KP_Multiply, NoSymbol, U2200 ] }; - key { [ 0, rightdoublequotemark, rightsinglequotemark, 0, minus, NoSymbol, logicalor ] }; + key { [ 7, dollar, yen, U03F0, currency, NoSymbol, notelementof ] }; + key { [ 8, doublelowquotemark, singlelowquotemark, NoSymbol, KP_Divide, NoSymbol, U2204 ] }; + key { [ 9, leftdoublequotemark, leftsinglequotemark, NoSymbol, KP_Multiply, NoSymbol, U2226 ] }; + key { [ 0, rightdoublequotemark, rightsinglequotemark, NoSymbol, minus, NoSymbol, emptyset ] }; - key { [ minus, endash, emdash, U2011, minus, NoSymbol, hyphen ] }; - key { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek, dead_abovedot, NoSymbol, dead_abovering ] }; + key { [ minus, endash, emdash, U2011, NoSymbol, NoSymbol, hyphen ] }; + key { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek, dead_abovedot, NoSymbol, dead_abovering ] }; //////////////////////////////////////////////////// // The upper row //////////////////////////////////////////////////// - key { [ x, X, x, Greek_xi, x, NoSymbol, Greek_XI ] }; - key { [ v, V, underscore, v, BackSpace, NoSymbol, BackSpace ] }; - key { [ l, L, bracketleft, Greek_lambda, KP_Up, NoSymbol, KP_Up ] }; - key { [ c, C, bracketright, Greek_chi, KP_Delete, NoSymbol, KP_Delete ] }; - key { [ w, W, asciicircum, Greek_omega, KP_Insert, NoSymbol, Greek_OMEGA ] }; - key { [ k, K, exclam, Greek_kappa, exclamdown, NoSymbol, radical ] }; - key { [ h, H, less, Greek_psi, KP_7, NoSymbol, Greek_PSI ] }; - key { [ g, G, greater, Greek_gamma, KP_8, NoSymbol, Greek_GAMMA ] }; - key { [ f, F, equal, U03D5, KP_9, NoSymbol, Greek_PHI ] }; - key { [ q, Q, ampersand, Greek_phi, plus, NoSymbol, U211A ] }; - key { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, ssharp, NoSymbol, jot ] }; - key { [ dead_tilde, dead_macron, dead_diaeresis, dead_doubleacute ] }; + key { [ x, X, NoSymbol, Greek_xi, NoSymbol, NoSymbol, Greek_XI ] }; + key { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, U2259 ] }; + key { [ l, L, bracketleft, Greek_lambda, KP_Up, KP_Up, Greek_LAMBDA ] }; + key { [ c, C, bracketright, Greek_chi, KP_Delete, KP_Delete, U2102 ] }; + key { [ w, W, asciicircum, Greek_omega, KP_Insert, KP_Insert, Greek_OMEGA ] }; + + key { [ k, K, exclam, Greek_kappa, exclamdown, NoSymbol, radical ] }; + key { [ h, H, less, Greek_psi, KP_7, NoSymbol, Greek_PSI ] }; + key { [ g, G, greater, Greek_gamma, KP_8, NoSymbol, Greek_GAMMA ] }; + key { [ f, F, equal, U03D5, KP_9, NoSymbol, Greek_PHI ] }; + key { [ q, Q, ampersand, Greek_phi, plus, NoSymbol, U211A ] }; + key { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot ] }; + + key { [ dead_tilde, dead_macron, dead_diaeresis, dead_doubleacute ] }; //////////////////////////////////////////////////// // The home row (middle row) //////////////////////////////////////////////////// - key { [ u, U, backslash, u, KP_Home, KP_Home ] }; - key { [ i, I, slash, Greek_iota, KP_Left, KP_Left ] }; - key { [ a, A, braceleft, Greek_alpha, KP_Down, KP_Down ] }; - key { [ e, E, braceright, Greek_epsilon, KP_Right, KP_Right ] }; - key { [ o, O, asterisk, Greek_omicron, KP_End, KP_End ] }; - key { [ s, S, question, Greek_sigma, questiondown, NoSymbol, Greek_SIGMA ] }; - key { [ n, N, parenleft, Greek_nu, KP_4 ] }; - key { [ r, R, parenright, Greek_rho, KP_5, NoSymbol, registered ] }; - key { [ t, T, minus, Greek_tau, KP_6, NoSymbol, trademark ] }; - key { [ d, D, colon, Greek_delta, comma, NoSymbol, Greek_DELTA ] }; - key { [ y, Y, at, Greek_upsilon, y, NoSymbol, nabla ] }; + key { [ u, U, backslash, NoSymbol, KP_Home, KP_Home, U222E ] }; + key { [ i, I, slash, Greek_iota, KP_Left, KP_Left, integral ] }; + key { [ a, A, braceleft, Greek_alpha, KP_Down, KP_Down, U2200 ] }; + key { [ e, E, braceright, Greek_epsilon, KP_Right, KP_Right, U2203 ] }; + key { [ o, O, asterisk, Greek_omicron, KP_End, KP_End, elementof ] }; + + key { [ s, S, question, Greek_sigma, questiondown, NoSymbol, Greek_SIGMA ] }; + key { [ n, N, parenleft, Greek_nu, KP_4, NoSymbol, U2115 ] }; + key { [ r, R, parenright, Greek_rho, KP_5, NoSymbol, U211D ] }; + key { [ t, T, minus, Greek_tau, KP_6, NoSymbol, partialderivative ] }; + key { [ d, D, colon, Greek_delta, NoSymbol, NoSymbol, Greek_DELTA ] }; + key { [ y, Y, at, Greek_upsilon, NoSymbol, NoSymbol, nabla ] }; //////////////////////////////////////////////////// // The lower row //////////////////////////////////////////////////// - key { [ udiaeresis, Udiaeresis, numbersign, udiaeresis, Escape ] }; - key { [ odiaeresis, Odiaeresis, dollar, odiaeresis, Tab, Tab ] }; - key { [ adiaeresis, Adiaeresis, bar, Greek_eta, KP_Next, KP_Next ] }; - key { [ p, P, asciitilde, Greek_pi, KP_Enter, NoSymbol, Greek_PI ] }; - key { [ z, Z, grave, Greek_zeta, z, NoSymbol, Greek_OMEGA ] }; - key { [ b, B, plus, Greek_beta, KP_Decimal, KP_Decimal ] }; - key { [ m, M, percent, mu, KP_1, NoSymbol, integral ] }; - key { [ comma, comma, quotedbl, U03F1, 2, NoSymbol, radical ] }; - key { [ period, ellipsis, apostrophe, Greek_theta, 3, NoSymbol, Greek_THETA ] }; - key { [ j, J, semicolon, U3D1, period, NoSymbol, nabla ] }; + key { [ udiaeresis, Udiaeresis, numbersign, NoSymbol, Escape, Escape, variation ] }; + key { [ odiaeresis, Odiaeresis, dollar, NoSymbol, Tab, Tab, U2111 ] }; + key { [ adiaeresis, Adiaeresis, bar, Greek_eta, KP_Next, KP_Next, U211C ] }; + key { [ p, P, asciitilde, Greek_pi, KP_Enter, KP_Enter, Greek_PI ] }; + key { [ z, Z, grave, Greek_zeta, NoSymbol, NoSymbol, U2124 ] }; + + key { [ b, B, plus, Greek_beta, KP_Decimal, NoSymbol, implies ] }; + key { [ m, M, percent, Greek_mu, KP_1, NoSymbol, ifonlyif ] }; + key { [ comma, U22EE, quotedbl, U03F1, KP_2, NoSymbol, U21D0 ] }; + key { [ period, ellipsis, apostrophe, Greek_theta, KP_3, NoSymbol, Greek_THETA ] }; + key { [ j, J, semicolon, U03D1, NoSymbol, NoSymbol, identical ] }; //////////////////////////////////////////////////// // Space key //////////////////////////////////////////////////// - key { [ space, space, space, nobreakspace, KP_0, NoSymbol, U202F ] }; + key { [ space, space, space, nobreakspace, KP_0, NoSymbol, U202F ] }; //////////////////////////////////////////////////// // Keypad @@ -361,22 +366,22 @@ xkb_symbols "neo" { key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ; key { [ KP_Divide, KP_Divide, division, U2215 ] }; - key { [ KP_Multiply, KP_Multiply, multiply, U22C5 ] }; - key { [ KP_Subtract, KP_Subtract, U2212 ] }; + key { [ KP_Multiply, KP_Multiply, multiply, U2219 ] }; + key { [ KP_Subtract, KP_Subtract, U2212, NoSymbol ] }; //////////////////////////////////////////////////// // The upper row //////////////////////////////////////////////////// key { [ KP_Home, KP_7, U2195, U226A ] }; key { [ KP_Up, KP_8, uparrow, intersection ] }; - key { [ KP_Prior, KP_9, KP_9, U226B ] }; + key { [ KP_Prior, KP_9, U2297, U226B ] }; key { [ KP_Add, KP_Add, plusminus, U2213 ] }; //////////////////////////////////////////////////// // The middle row //////////////////////////////////////////////////// key { [ KP_Left, KP_4, leftarrow, includedin ] }; - key { [ EuroSign, KP_5, dagger, U220A ] }; + key { [ EuroSign, KP_5, infinity, containsas ] }; key { [ KP_Right, KP_6, rightarrow, includes ] }; //////////////////////////////////////////////////// -- cgit v1.2.3