summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknittl <knittl@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2008-10-10 14:54:10 +0000
committerknittl <knittl@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2008-10-10 14:54:10 +0000
commit57966b2b05a401afbd14ce0186e552044ec6b2d6 (patch)
tree3898b84b5c096e09cd1acb078a16bc48855f633d
parentfbaa12415c3514432b7ab3254e0f07b4f9779a4b (diff)
xkbmap auf aktuellen stand gebracht, vor allem keypad eingearbeitet
kommentare etwas aufgeräumt git-svn-id: https://svn.neo-layout.org@966 b9310e46-f624-0410-8ea1-cfbb3a30dc96
-rw-r--r--linux/X/de136
1 files changed, 62 insertions, 74 deletions
diff --git a/linux/X/de b/linux/X/de
index 512539c..7720403 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -222,9 +222,8 @@ xkb_symbols "neo" {
name[Group1]= "German Neostyle";
- ////////////////////////////////////////////////////
// Modifier definition
- ////////////////////////////////////////////////////
+ // -----------------------
// Mod3 (FIXME Nur CAPS+BKSL ist Caps_Lock – Nicht andersherum, siehe Ticket #30)
key.type[Group1]="THREE_LEVEL";
@@ -238,9 +237,8 @@ xkb_symbols "neo" {
modifier_map Mod3 { <LSGT>, <RALT> };
// Achtung: ^^^ Dies ist eine X-Server-Variable, nicht unser Mod3.
- ////////////////////////////////////////////////////
// Ebenen im Neo-Jargon, hier im Treiber andere Reihenfolge
- ////////////////////////////////////////////////////
+ // -------------------------------------------------------------
// Ebene 1: normal
// Ebene 2: Shift
// Ebene 3: Mod3
@@ -250,9 +248,8 @@ xkb_symbols "neo" {
// Compose (keine eigene Ebene): Mod3+Tab
// Feststelltaste (Capslock): Shift+Shift
//
- ////////////////////////////////////////////////////
// Ebenen im Xkeymap-Jargon, hier in der Treiberdatei
- ////////////////////////////////////////////////////
+ // -------------------------------------------------------
// 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)
@@ -263,25 +260,23 @@ xkb_symbols "neo" {
key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ;
- ////////////////////////////////////////////////////
// general Lock
- ////////////////////////////////////////////////////
+ // -----------------
// Einrasten über linke Win-Taste+Modifier, Lösen über nochmaliges Betätigen des Modifiers
// ShiftLock und Mod5Lock funktionieren, Mod3Lock lässt sich aber nicht mehr lösen!!!!
- // TODO ?????
+ // TODO
- ////////////////////////////////////////////////////
// Tab as Multi_key (Compose)
- ////////////////////////////////////////////////////
+ // -------------------------------
key <TAB> { [ Tab, ISO_Left_Tab, Multi_key ] };
- ////////////////////////////////////////////////////
- // The first row (number Row)
- ////////////////////////////////////////////////////
+ // number row
+ // ---------------
- // This are the Levels Xorg (with type="EIGHT_LEVEL") thinks they are
+ // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL":
// Base Shift Mod3 Shift+Mod3 Mod4 Shift+Mod4 Mod3+Mod4
+ // Mod5 Mod6
// Level1 Level2 Level3 Level4 Level5 Level6 Level7
// Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Ebene4+Shift Ebene6
@@ -289,22 +284,22 @@ xkb_symbols "neo" {
key <AE01> { [ 1, degree, onesuperior, U2081, enfilledcircbullet, NoSymbol, notsign ] };
key <AE02> { [ 2, numerosign, twosuperior, U2082, U2023, NoSymbol, logicalor ] };
- key <AE03> { [ 3, section, threesuperior, U2083, NoSymbol, NoSymbol, logicaland ] };
- key <AE04> { [ 4, guillemotright, U203A, U2113, Prior, Prior, uptack ] };
+ key <AE03> { [ 3, section, threesuperior, U2083, ISO_Left_Tab, ISO_Left_Tab,logicaland ] };
+ key <AE04> { [ 4, guillemotright, U203A, U2113, Prior, Prior, downtack ] };
key <AE05> { [ 5, guillemotleft, U2039, femalesymbol, NoSymbol, NoSymbol, U2221 ] };
key <AE06> { [ 6, EuroSign, cent, malesymbol, sterling, NoSymbol, U2225 ] };
- key <AE07> { [ 7, dollar, yen, Greek_kappa, currency, NoSymbol, notelementof ] };
- key <AE08> { [ 8, doublelowquotemark, singlelowquotemark, U27E8, KP_Divide, NoSymbol, U2204 ] };
- key <AE09> { [ 9, leftdoublequotemark, leftsinglequotemark, U27E9, KP_Multiply, NoSymbol, U2226 ] };
- key <AE10> { [ 0, rightdoublequotemark, rightsinglequotemark, NoSymbol, minus, NoSymbol, emptyset ] };
+ key <AE07> { [ 7, dollar, yen, Greek_kappa, currency, NoSymbol, U21C8 ] };
+ key <AE08> { [ 8, doublelowquotemark, singlelowquotemark, U27E8, KP_Divide, NoSymbol, U21C5 ] };
+ key <AE09> { [ 9, leftdoublequotemark, leftsinglequotemark, U27E9, KP_Multiply, NoSymbol, U220B ] };
+ key <AE10> { [ 0, rightdoublequotemark, rightsinglequotemark, U2080, minus, NoSymbol, emptyset ] };
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
- ////////////////////////////////////////////////////
+ // top row
+ // ------------
+ // xvlcwkhgfqß
key <AD01> { [ x, X, ellipsis, Greek_xi, U22EE, NoSymbol, Greek_XI ] };
key <AD02> { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, U2259 ] };
key <AD03> { [ l, L, bracketleft, Greek_lambda, Up, Up, Greek_LAMBDA ] };
@@ -318,11 +313,11 @@ xkb_symbols "neo" {
key <AD10> { [ q, Q, ampersand, U03D5, plus, NoSymbol, U211A ] };
key <AD11> { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot ] };
- key <AD12> { [ dead_tilde, dead_macron, dead_diaeresis, dead_doubleacute ] };
+ key <AD12> { [ dead_tilde, dead_macron, dead_diaeresis, dead_doubleacute, dead_stroke, NoSymbol, NoSymmol ] };
- ////////////////////////////////////////////////////
- // The home row (middle row)
- ////////////////////////////////////////////////////
+ // middle row
+ // ---------------
+ // uiaeosnrtdy
key <AC01> { [ u, U, backslash, NoSymbol, Home, Home, U222E ] };
key <AC02> { [ i, I, slash, Greek_iota, Left, Left, integral ] };
key <AC03> { [ a, A, braceleft, Greek_alpha, Down, Down, U2200 ] };
@@ -336,72 +331,65 @@ xkb_symbols "neo" {
key <AC10> { [ d, D, colon, Greek_delta, comma, NoSymbol, Greek_DELTA ] };
key <AC11> { [ y, Y, at, Greek_upsilon, period, NoSymbol, nabla ] };
- ////////////////////////////////////////////////////
- // The lower row
- ////////////////////////////////////////////////////
+ // bottom row
+ // ---------------
+ // üöäpzbm,.j
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, Next, Next, U211C ] };
key <AB04> { [ p, P, asciitilde, Greek_pi, Return, Return, Greek_PI ] };
key <AB05> { [ z, Z, grave, Greek_zeta, NoSymbol, NoSymbol, U2124 ] };
- key <AB06> { [ b, B, plus, Greek_beta, colon, NoSymbol, implies ] };
+ key <AB06> { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0 ] };
key <AB07> { [ m, M, percent, Greek_mu, 1, NoSymbol, ifonlyif ] };
- key <AB08> { [ comma, NoSymbol, quotedbl, Greek_rho, 2, NoSymbol, U21D0 ] };
+ key <AB08> { [ comma, NoSymbol, quotedbl, Greek_rho, 2, NoSymbol, U21D2 ] };
key <AB09> { [ period, NoSymbol, apostrophe, U03D1, 3, NoSymbol, Greek_THETA ] };
- key <AB10> { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, identical ] };
+ key <AB10> { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, U221D ] };
- ////////////////////////////////////////////////////
// Space key
- ////////////////////////////////////////////////////
+ // --------------
key <SPCE> { [ space, space, space, nobreakspace, 0, NoSymbol, U202F ] };
- ////////////////////////////////////////////////////
// Keypad
- ////////////////////////////////////////////////////
- ////////////////////////////////////////////////////
- // The uppest row
- ////////////////////////////////////////////////////
+ // ===========
// Num-Lock gibt es bei Neo nicht mehr:
//key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
// Die ehemalige Num-Lock-Taste erzeugt nun diverse Zeichen:
- key <NMLK> { [ equal, notequal, U2248, Pointer_EnableKeys ] };
-
- key <KPDV> { [ KP_Divide, KP_Divide, division, U2044 ] };
- key <KPMU> { [ KP_Multiply, KP_Multiply, multiply, U2219 ] };
- key <KPSU> { [ KP_Subtract, KP_Subtract, U2212, NoSymbol ] };
-
- ////////////////////////////////////////////////////
- // The upper row
- ////////////////////////////////////////////////////
- key <KP7> { [ KP_7, dagger, U2195, KP_Home ] };
- key <KP8> { [ KP_8, intersection, uparrow, KP_Up ] };
- key <KP9> { [ KP_9, U2297, U220D, KP_Prior ] };
- key <KPAD> { [ KP_Add, KP_Add, plusminus, U2213 ] };
-
- ////////////////////////////////////////////////////
- // The middle row
- ////////////////////////////////////////////////////
- key <KP4> { [ KP_4, includedin, leftarrow, KP_Left ] };
- key <KP5> { [ KP_5, EuroSign, infinity, KP_Begin ] };
- key <KP6> { [ KP_6, includes, rightarrow, KP_Right ] };
-
- ////////////////////////////////////////////////////
- // The lower row
- ////////////////////////////////////////////////////
- key <KP1> { [ KP_1, U2714, U2194, KP_End ] };
- key <KP2> { [ KP_2, union, downarrow, KP_Down ] };
- key <KP3> { [ KP_3, U2718, U21CC, KP_Next ] };
- key <KPEN> { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter ] };
+ key <NMLK> { [ Tab, ISO_Left_Tab, equal, U2248, notequal, NoSymbol, U2261 ] };
+
+ // topmost row
+ // ----------------
+ key <KPDV> { [ KP_Divide, KP_Divide, division, U2223, U2300, NoSymbol, U2044 ] };
+ key <KPMU> { [ KP_Multiply, KP_Multiply, U22C5, multiply, U2299, NoSymbol, U2297 ] };
+ key <KPSU> { [ KP_Subtract, KP_Subtract, U2212, U2216, U2296, NoSymbol, U2238 ] };
+
+ // top row
+ // ------------
+ key <KP7> { [ KP_7, U2714, U2195, U230A, KP_Home, KP_Home, U2308 ] };
+ key <KP8> { [ KP_8, U2718, U2191, U2229, KP_Up, KP_Up, U22C2 ] };
+ key <KP9> { [ KP_9, dagger, U20D7, U230B, KP_Prior, KP_Prior, U2309 ] };
+ key <KPAD> { [ KP_Add, KP_Add, plusminus, U2213, U2295, NoSymbol, U2214 ] };
+
+ // middle row
+ // ----------------
+ key <KP4> { [ KP_4, U2663, leftarrow, includedin, KP_Left, KP_Left, U2286 ] };
+ key <KP5> { [ KP_5, EuroSign, infinity, U22B6, KP_Begin, KP_Begin, U22B7 ] };
+ key <KP6> { [ KP_6, brokenbar, rightarrow, includes, KP_Right, KP_Right, U2287 ] };
+
+ // bottom row
+ // ---------------
+ key <KP1> { [ KP_1, U2666, U2194, U226A, KP_End, KP_End, U2264 ] };
+ key <KP2> { [ KP_2, U2665, downarrow, union, KP_Down, KP_Down, U22C3 ] };
+ key <KP3> { [ KP_3, U2660, U21CC, U226B, KP_Next, KP_Next, U2265 ] };
+ key <KPEN> { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter ] };
key <KPEQ> { [ KP_Equal ] };
- ////////////////////////////////////////////////////
- // The lowest row
- ////////////////////////////////////////////////////
- key <KP0> { [ KP_0, percent, U2030, KP_Insert ] };
- key <KPDL> { [ KP_Decimal, comma, period, KP_Delete ] };
+ // bottommost row
+ // -------------------
+ key <KP0> { [ KP_0, U2423, percent, U2030, KP_Insert, KP_Insert, U25A1 ] };
+ key <KPDL> { [ KP_Decimal, comma, period, apostrophe, KP_Delete, KP_Delete, quotedbl ] };
};