diff options
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/fr | 2 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/macintosh_vndr/us | 296 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/makefile | 4 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/mv | 2 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w | 2 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/pc | 2 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/sun_vndr/us | 2 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/sy | 4 |
8 files changed, 157 insertions, 157 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr index a1dbb5921..c58eb0deb 100644 --- a/xorg-server/xkeyboard-config/symbols/fr +++ b/xorg-server/xkeyboard-config/symbols/fr @@ -527,7 +527,7 @@ xkb_symbols "bepo" { key <AB05> { [ k, K, asciitilde ] }; // k K ~ key <AB06> { [ apostrophe, question, questiondown, dead_hook ] }; // ' ? ¿ ̉ key <AB07> { [ q, Q, dead_abovering, dead_belowdot ] }; // q Q ˚ ̣ - key <AB08> { [ g, G, mu ] }; // g G µ + key <AB08> { [ g, G, dead_greek ] }; // g G µ key <AB09> { [ h, H, dagger, doubledagger ] }; // h H † ‡ key <AB10> { [ f, F, dead_ogonek, ordfeminine ] }; // f F ̨ ª diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us index 6da1c67bf..36f4429cc 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us @@ -1,148 +1,148 @@ -// symbols definition for a Macintosh "Extended" keyboard
-
-xkb_symbols "extended" {
-
- name[Group1]= "USA";
- key <ESC> { [ Escape ] };
-
- // Alphanumeric section
- key <TLDE> { [ quoteleft, asciitilde ] };
- key <AE01> { [ 1, exclam ] };
- key <AE02> { [ 2, at ] };
- key <AE03> { [ 3, numbersign ] };
- key <AE04> { [ 4, dollar ] };
- key <AE05> { [ 5, percent ] };
- key <AE06> { [ 6, asciicircum ] };
- key <AE07> { [ 7, ampersand ] };
- key <AE08> { [ 8, asterisk ] };
- key <AE09> { [ 9, parenleft ] };
- key <AE10> { [ 0, parenright ] };
- key <AE11> { [ minus, underscore ] };
- key <AE12> { [ equal, plus ] };
-
- key <AD01> { [ q, Q ] };
- key <AD02> { [ w, W ] };
- key <AD03> { [ e, E ] };
- key <AD04> { [ r, R ] };
- key <AD05> { [ t, T ] };
- key <AD06> { [ y, Y ] };
- key <AD07> { [ u, U ] };
- key <AD08> { [ i, I ] };
- key <AD09> { [ o, O ] };
- key <AD10> { [ p, P ] };
- key <AD11> { [ bracketleft, braceleft ] };
- key <AD12> { [ bracketright, braceright ] };
- key <BKSL> { [ backslash, bar ] };
-
- key <AC01> { [ a, A ] };
- key <AC02> { [ s, S ] };
- key <AC03> { [ d, D ] };
- key <AC04> { [ f, F ] };
- key <AC05> { [ g, G ] };
- key <AC06> { [ h, H ] };
- key <AC07> { [ j, J ] };
- key <AC08> { [ k, K ] };
- key <AC09> { [ l, L ] };
- key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
-
- key <AB01> { [ z, Z ] };
- key <AB02> { [ x, X ] };
- key <AB03> { [ c, C ] };
- key <AB04> { [ v, V ] };
- key <AB05> { [ b, B ] };
- key <AB06> { [ n, N ] };
- key <AB07> { [ m, M ] };
- key <AB08> { [ comma, less ] };
- key <AB09> { [ period, greater ] };
- key <AB10> { [ slash, question ] };
-
- key <SPCE> { [ space ] };
- // End alphanumeric section
-
-
- include "eurosign(e)"
- include "keypad"
-
- key <KPEQ> { [ equal ] };
-};
-
-hidden
-xkb_symbols "oldmac" {
-
- include "macintosh_vndr/us(extended)"
-
- // Begin "Function" section
- key <FK01> { [ F1 ] };
- key <FK02> { [ F2 ] };
- key <FK03> { [ F3 ] };
- key <FK04> { [ F4 ] };
- key <FK05> { [ F5 ] };
- key <FK06> { [ F6 ] };
- key <FK07> { [ F7 ] };
- key <FK08> { [ F8 ] };
- key <FK09> { [ F9 ] };
- key <FK10> { [ F10 ] };
- key <FK11> { [ F11 ] };
- key <FK12> { [ F12 ] };
- key <FK13> { [ Print ] };
- key <FK14> { [ Scroll_Lock ] };
- key <FK15> { [ Pause ] };
- // End "Function" section
-
- // Begin "Editing" section
- key <INS> { [ Insert ] };
- key <HOME> { [ Home ] };
- key <PGUP> { [ Prior ] };
- key <DELE> { [ Delete ] };
- key <END> { [ End ] };
- key <PGDN> { [ Next ] };
-
- key <UP> { [ Up ] };
- key <LEFT> { [ Left ] };
- key <DOWN> { [ Down ] };
- key <RGHT> { [ Right ] };
- // End "Editing" section
-
- key <BKSP> { [ BackSpace ] };
- key <TAB> { [ Tab, ISO_Left_Tab ] };
- key <RTRN> { [ Return ] };
- key <CAPS> { [ Caps_Lock ] };
- key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
-
- // Begin "Modifier" section
- key <LFSH> { [ Shift_L ] };
- key <RTSH> { [ Shift_R ] };
- key <LCTL> { [ Control_L ] };
- key <RCTL> { [ Control_R ] };
- key <LALT> { [ Alt_L, Meta_L ] };
- key <RALT> { [ Alt_R, Meta_R ] };
- key <LWIN> { [ Super_L ] };
- key <RWIN> { [ Super_R ] };
- // End "Modifier" section
-
- // begin modifier mappings
- modifier_map Shift { Shift_L, Shift_R };
- modifier_map Lock { Caps_Lock, ISO_Lock };
- modifier_map Control{ Control_L, Control_R };
- modifier_map Mod2 { Num_Lock };
-
- // Fake keys for virtual<->real modifiers mapping
- key <LVL3> { [ ISO_Level3_Shift ] };
- key <MDSW> { [ Mode_switch ] };
- modifier_map Mod5 { <LVL3>, <MDSW> };
-
- key <ALT> { [ NoSymbol, Alt_L ] };
- modifier_map Mod1 { <ALT>, <LALT> };
-
- key <META> { [ NoSymbol, Meta_L ] };
- modifier_map Mod1 { <META> };
-
- key <SUPR> { [ NoSymbol, Super_L ] };
- modifier_map Mod4 { <SUPR> };
-
- key <HYPR> { [ NoSymbol, Hyper_L ] };
- modifier_map Mod4 { <HYPR> };
- // end modifier mappings
-
-};
+// symbols definition for a Macintosh "Extended" keyboard + +xkb_symbols "extended" { + + name[Group1]= "USA"; + key <ESC> { [ Escape ] }; + + // Alphanumeric section + key <TLDE> { [ quoteleft, asciitilde ] }; + key <AE01> { [ 1, exclam ] }; + key <AE02> { [ 2, at ] }; + key <AE03> { [ 3, numbersign ] }; + key <AE04> { [ 4, dollar ] }; + key <AE05> { [ 5, percent ] }; + key <AE06> { [ 6, asciicircum ] }; + key <AE07> { [ 7, ampersand ] }; + key <AE08> { [ 8, asterisk ] }; + key <AE09> { [ 9, parenleft ] }; + key <AE10> { [ 0, parenright ] }; + key <AE11> { [ minus, underscore ] }; + key <AE12> { [ equal, plus ] }; + + key <AD01> { [ q, Q ] }; + key <AD02> { [ w, W ] }; + key <AD03> { [ e, E ] }; + key <AD04> { [ r, R ] }; + key <AD05> { [ t, T ] }; + key <AD06> { [ y, Y ] }; + key <AD07> { [ u, U ] }; + key <AD08> { [ i, I ] }; + key <AD09> { [ o, O ] }; + key <AD10> { [ p, P ] }; + key <AD11> { [ bracketleft, braceleft ] }; + key <AD12> { [ bracketright, braceright ] }; + key <BKSL> { [ backslash, bar ] }; + + key <AC01> { [ a, A ] }; + key <AC02> { [ s, S ] }; + key <AC03> { [ d, D ] }; + key <AC04> { [ f, F ] }; + key <AC05> { [ g, G ] }; + key <AC06> { [ h, H ] }; + key <AC07> { [ j, J ] }; + key <AC08> { [ k, K ] }; + key <AC09> { [ l, L ] }; + key <AC10> { [ semicolon, colon ] }; + key <AC11> { [ quoteright, quotedbl ] }; + + key <AB01> { [ z, Z ] }; + key <AB02> { [ x, X ] }; + key <AB03> { [ c, C ] }; + key <AB04> { [ v, V ] }; + key <AB05> { [ b, B ] }; + key <AB06> { [ n, N ] }; + key <AB07> { [ m, M ] }; + key <AB08> { [ comma, less ] }; + key <AB09> { [ period, greater ] }; + key <AB10> { [ slash, question ] }; + + key <SPCE> { [ space ] }; + // End alphanumeric section + + + include "eurosign(e)" + include "keypad" + + key <KPEQ> { [ equal ] }; +}; + +hidden +xkb_symbols "oldmac" { + + include "macintosh_vndr/us(extended)" + + // Begin "Function" section + key <FK01> { [ F1 ] }; + key <FK02> { [ F2 ] }; + key <FK03> { [ F3 ] }; + key <FK04> { [ F4 ] }; + key <FK05> { [ F5 ] }; + key <FK06> { [ F6 ] }; + key <FK07> { [ F7 ] }; + key <FK08> { [ F8 ] }; + key <FK09> { [ F9 ] }; + key <FK10> { [ F10 ] }; + key <FK11> { [ F11 ] }; + key <FK12> { [ F12 ] }; + key <FK13> { [ Print ] }; + key <FK14> { [ Scroll_Lock ] }; + key <FK15> { [ Pause ] }; + // End "Function" section + + // Begin "Editing" section + key <INS> { [ Insert ] }; + key <HOME> { [ Home ] }; + key <PGUP> { [ Prior ] }; + key <DELE> { [ Delete ] }; + key <END> { [ End ] }; + key <PGDN> { [ Next ] }; + + key <UP> { [ Up ] }; + key <LEFT> { [ Left ] }; + key <DOWN> { [ Down ] }; + key <RGHT> { [ Right ] }; + // End "Editing" section + + key <BKSP> { [ BackSpace ] }; + key <TAB> { [ Tab, ISO_Left_Tab ] }; + key <RTRN> { [ Return ] }; + key <CAPS> { [ Caps_Lock ] }; + key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; + + // Begin "Modifier" section + key <LFSH> { [ Shift_L ] }; + key <RTSH> { [ Shift_R ] }; + key <LCTL> { [ Control_L ] }; + key <RCTL> { [ Control_R ] }; + key <LALT> { [ Alt_L, Meta_L ] }; + key <RALT> { [ Alt_R, Meta_R ] }; + key <LWIN> { [ Super_L ] }; + key <RWIN> { [ Super_R ] }; + // End "Modifier" section + + // begin modifier mappings + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock }; + modifier_map Control{ Control_L, Control_R }; + modifier_map Mod2 { Num_Lock }; + + // Fake keys for virtual<->real modifiers mapping + key <LVL3> { [ ISO_Level3_Shift ] }; + key <MDSW> { [ Mode_switch ] }; + modifier_map Mod5 { <LVL3>, <MDSW> }; + + key <ALT> { [ NoSymbol, Alt_L ] }; + modifier_map Mod1 { <ALT>, <LALT> }; + + key <META> { [ NoSymbol, Meta_L ] }; + modifier_map Mod1 { <META> }; + + key <SUPR> { [ NoSymbol, Super_L ] }; + modifier_map Mod4 { <SUPR> }; + + key <HYPR> { [ NoSymbol, Hyper_L ] }; + modifier_map Mod4 { <HYPR> }; + // end modifier mappings + +}; diff --git a/xorg-server/xkeyboard-config/symbols/makefile b/xorg-server/xkeyboard-config/symbols/makefile index 6fdc02f24..f42aeb48d 100644 --- a/xorg-server/xkeyboard-config/symbols/makefile +++ b/xorg-server/xkeyboard-config/symbols/makefile @@ -15,8 +15,8 @@ at az \ ba bd be \ bg br brai \ bt bw by \ -ca cd \ -ch cn cz \ +ca cd ch \ +cm cn cz \ de dk \ ee es et epo \ fi fo fr \ diff --git a/xorg-server/xkeyboard-config/symbols/mv b/xorg-server/xkeyboard-config/symbols/mv index ed530612c..ee9a7986b 100644 --- a/xorg-server/xkeyboard-config/symbols/mv +++ b/xorg-server/xkeyboard-config/symbols/mv @@ -73,7 +73,7 @@ xkb_symbols "basic" { // Begin modifier mappings modifier_map Shift { Shift_L }; - modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; modifier_map Mod3 { Mode_switch }; }; diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w b/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w index 6962aa971..441b3fee3 100644 --- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w +++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w @@ -430,7 +430,7 @@ xkb_symbols "base" { // begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; modifier_map Mod2 { Num_Lock }; diff --git a/xorg-server/xkeyboard-config/symbols/pc b/xorg-server/xkeyboard-config/symbols/pc index 7e13ecb25..d25970963 100644 --- a/xorg-server/xkeyboard-config/symbols/pc +++ b/xorg-server/xkeyboard-config/symbols/pc @@ -37,7 +37,7 @@ xkb_symbols "pc105" { // begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; modifier_map Mod2 { Num_Lock }; modifier_map Mod4 { Super_L, Super_R }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/us b/xorg-server/xkeyboard-config/symbols/sun_vndr/us index f2689a8a7..6bc09a2cd 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/us @@ -110,7 +110,7 @@ xkb_symbols "sunbasic" { // begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; modifier_map Mod2 { Num_Lock }; diff --git a/xorg-server/xkeyboard-config/symbols/sy b/xorg-server/xkeyboard-config/symbols/sy index 6e2932b14..1a82f0e6e 100644 --- a/xorg-server/xkeyboard-config/symbols/sy +++ b/xorg-server/xkeyboard-config/symbols/sy @@ -67,7 +67,7 @@ xkb_symbols "syc" { // Begin Modifier Mappings modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; modifier_map Mod1 { Alt_L, Alt_R }; modifier_map Mod2 { Mode_switch }; @@ -136,7 +136,7 @@ xkb_symbols "syc_phonetic" { // Begin Modifier Mappings modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; modifier_map Mod1 { Alt_L, Alt_R }; modifier_map Mod2 { Mode_switch }; |