From d8f81c980a46279ac619312a914b563144894512 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 13 Jul 2010 07:48:55 +0000 Subject: Renamed xkbdata.src also on trunk since the current merging of subversion will loose all the changes in xkbdata.src when the directory is renamed on the source branch. --- .../xkbdata.src/symbols/macintosh_vndr/Makefile.am | 8 -- .../xkbdata.src/symbols/macintosh_vndr/apple | 142 ------------------- xorg-server/xkbdata.src/symbols/macintosh_vndr/ch | 102 -------------- xorg-server/xkbdata.src/symbols/macintosh_vndr/de | 97 ------------- xorg-server/xkbdata.src/symbols/macintosh_vndr/dk | 79 ----------- xorg-server/xkbdata.src/symbols/macintosh_vndr/fi | 18 --- xorg-server/xkbdata.src/symbols/macintosh_vndr/fr | 110 --------------- xorg-server/xkbdata.src/symbols/macintosh_vndr/gb | 21 --- xorg-server/xkbdata.src/symbols/macintosh_vndr/is | 128 ----------------- xorg-server/xkbdata.src/symbols/macintosh_vndr/it | 64 --------- xorg-server/xkbdata.src/symbols/macintosh_vndr/jp | 35 ----- .../xkbdata.src/symbols/macintosh_vndr/latam | 38 ------ .../xkbdata.src/symbols/macintosh_vndr/makefile | 16 --- xorg-server/xkbdata.src/symbols/macintosh_vndr/nl | 17 --- xorg-server/xkbdata.src/symbols/macintosh_vndr/no | 52 ------- xorg-server/xkbdata.src/symbols/macintosh_vndr/pt | 63 --------- xorg-server/xkbdata.src/symbols/macintosh_vndr/se | 46 ------- xorg-server/xkbdata.src/symbols/macintosh_vndr/us | 151 --------------------- 18 files changed, 1187 deletions(-) delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/apple delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/ch delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/de delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/dk delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/fi delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/fr delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/gb delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/is delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/it delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/jp delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/latam delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/nl delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/no delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/pt delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/se delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/us (limited to 'xorg-server/xkbdata.src/symbols/macintosh_vndr') diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am deleted file mode 100644 index 1d43f40c2..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -symbolsdir = $(xkb_base)/symbols/macintosh_vndr - -dist_symbols_DATA = \ -apple ch de dk \ -fi fr \ -gb is it jp \ -latam nl no pt \ -se us diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple b/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple deleted file mode 100644 index fc1742c45..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple +++ /dev/null @@ -1,142 +0,0 @@ -// -// Keyboard modification for Apple keyboards -// -// $XFree86: xc/programs/xkbcomp/symbols/apple,v 1.2 2003/10/24 20:38:20 tsi Exp $ - -partial default modifier_keys -xkb_symbols "extended" { - - key { [ KP_Equal ] }; - -// The key in the PC's Insert position is sometimes engraved Help (at least -// in Switzerland and Great Britain), with Insert sometimes above. But in the -// US and Canada, it remains Insert. So this should probably be an XkbOption, -// but I have to do more research. -// Perhaps Help should be the primary symbol with Insert in the 1st shift-level -// key { [ Help, Insert ] }; -// The keys next to F12, labeled F13, F14, & F15 generate codes that XFree86 -// claims not to generate. I think they should be equivalent to the PC keys -// Print Screen / SysRq, Scroll Lock, and Pause. Linux kernel bug? -// key { [ F13 ] }; // should be keycode 93 or -// key { [ F13 ] }; // should be keycode 118 -// key { [ F14 ] }; // should be keycode 123 or -// key { [ F14 ] }; // should be keycode 119 -// key { [ F15 ] }; // should be keycode 127 or -// key { [ F15 ] }; // should be keycode 120 -}; - -partial modifier_keys -xkb_symbols "laptop" { - - include "macintosh_vndr/apple(extended)" - - // The real numlock key on the iBook (shared with F5) works internally to - // the keyboard. It illuminates the Num_Lock led and locks the fn-key to - // type only the keypad keys on the letter keys (U=4, I=5, O=6, P=*, etc.). - // The key in the Num_lock position is engraved with Clear. - override key { [ Clear ] }; - // The key engraved Delete sends BKSP. To get Delete, use Shift-Delete - override key { [ BackSpace, Delete ] }; - // These keyboards only generate a when pressing fn+Alt. This makes - // it impossible to get to the third shift level on keys that are on - // the fn-keypad, so use the Enter key (right of ) for Mode_switch, - // and use fn+Enter (Apple's code for Menu) for KP_Enter. - replace key { [ ISO_Level3_Shift ] }; - modifier_map Mod5 { ISO_Level3_Shift }; - // Linux kernel bug with Menu on macs means this doesn't work yet -// replace key { [ KP_Enter ] }; // should be keycode 117 -}; - -partial modifier_keys -xkb_symbols "laptop_bad_switch" { - // Kept for backward compatibility - include "macintosh_vndr/apple(laptop)" -}; - -// Long Aluminium Keyboards -partial function_keys -xkb_symbols "alukbd" { - // The base is a inet PC keyboard - include "pc" - - // Additional Fxx keys - key { [ F13 ] }; - key { [ F14 ] }; - key { [ F15 ] }; - key { [ F16 ] }; - key { [ F17 ] }; - key { [ F18 ] }; - key { [ F19 ] }; - - // On aluminium keyboards, Num_Lock is replace by Clear - replace key { [ XF86Clear ] }; - // CAPS key is always Caps_Lock, even for JIS keyboards - replace key { [ Caps_Lock ] }; - - // F1..F12 are multimedia keys when used with the 'Fn' key - // Make those multimedia actions available via ISO_Level3_Shift too, - // it is useful when the Fn key is remapped to something else (e.g. Insert) - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86KbdBrightnessDown, NoSymbol, XF86_Switch_VT_1 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86KbdBrightnessUp, NoSymbol, XF86_Switch_VT_2 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_3 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_4 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_5 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, NoSymbol, NoSymbol, XF86_Switch_VT_6 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioPrev, NoSymbol, XF86_Switch_VT_7 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioPlay, NoSymbol, XF86_Switch_VT_8 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioNext, NoSymbol, XF86_Switch_VT_9 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioMute, NoSymbol, XF86_Switch_VT_10 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioLowerVolume, NoSymbol, XF86_Switch_VT_11 ] - }; - key { - type= "FOUR_LEVEL_X", - symbols[Group1]= [ NoSymbol, XF86AudioRaiseVolume, NoSymbol, XF86_Switch_VT_12 ] - }; -}; - -// Aluminium Keyboard: make F13, F14, F15 PC-ish (Print, Scroll_Lock, Pause) -partial function_keys keypad_keys -xkb_symbols "alupckeys" { - key { - type= "PC_ALT_LEVEL2", - symbols[Group1]= [ Print, Sys_Req ] - }; - key { [ Scroll_Lock ] }; - key { - type= "PC_CONTROL_LEVEL2", - symbols[Group1]= [ Pause, Break ] - }; - override key { [ Num_Lock, Pointer_EnableKeys ] }; -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch b/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch deleted file mode 100644 index 4932eb89a..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch +++ /dev/null @@ -1,102 +0,0 @@ -// $XKeyboardConfig$ -// -// 03.01.2003 -// Andreas Tobler -// modified for Swiss German Apple Extended Keyboard II - -partial alphanumeric_keys -xkb_symbols "extended" { - - name[Group1]= "Switzerland - German, Mac"; - - // Alphanumeric section - - key { [ 1, plus, plusminus, infinity ] }; - key { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; - key { [ 3, asterisk, numbersign, leftcaret ] }; - // not displayed here - key { [ 4, ccedilla, Ccedilla, slash ] }; - key { [ 5, percent, bracketleft ] }; - key { [ 6, ampersand, bracketright ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, braceleft, Ograve ] }; - key { [ 9, parenright, braceright, Ocircumflex ] }; - key { [ 0, equal, notequal, Uacute ] }; - key { [ apostrophe, question, questiondown, NoSymbol ] }; - key { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] }; - key { [ q, Q, oe, OE ] }; - key { [ w, W, Greek_SIGMA, Aacute ] }; - key { [ e, E, EuroSign, Ediaeresis ] }; - key { [ r, R, registered, Egrave ] }; - key { [ t, T, dagger, Icircumflex ] }; - key { [ z, Z, Greek_OMEGA, Iacute ] }; - key { [ u, U, degree, Ugrave ] }; - key { [ i, I, exclamdown, idotless ] }; - key { [ o, O, oslash, Ooblique ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [ udiaeresis, egrave, section, ydiaeresis ] }; - key { [ dead_diaeresis, exclam, grave, apostrophe ] }; - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp, NoSymbol ] }; - // ligature fl - key { [ d, D, Greek_sigma, NoSymbol ] }; - // partialderivative is not available here att - key { [ f, F, function, doubledagger ] }; - key { [ g, G, at, comma ] }; - key { [ h, H, ordfeminine, periodcentered ] }; - key { [ j, J, masculine, eth ] }; - key { [ k, K, Greek_DELTA, macron ] }; - key { [ l, L, notsign, caret ] }; - key { [ odiaeresis, eacute, cent, breve ] }; - key { [ adiaeresis, agrave, ae, AE ] }; - key { [ y, Y, yen, Ydiaeresis ] }; - key { [ x, X, similarequal, trademark ] }; - key { [ c, C, copyright, NoSymbol ] }; - key { [ v, V, radical, diamond ] }; - key { [ b, B, integral, NoSymbol ] }; - key { [ n, N, dead_tilde, enopencircbullet ] }; - // to be fixed att - key { [ m, M, mu, dead_abovering ] }; - // not sure att - key { [ comma, semicolon, guillemotleft, guillemotright ] }; - key { [ period, colon, ellipsis, division ] }; - key { [ minus, underscore, hyphen, emdash ] }; - key { [ section, degree, NoSymbol, NoSymbol ] }; - // ligature fi // per mille - key { [ space, nobreakspace, nobreakspace ] }; - key { [ less, greater, lessthanequal, greaterthanequal ] }; - key { [ dollar, sterling, paragraph, enfilledcircbullet ] }; - - include "kpdl(comma)" - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "de" { - include "macintosh_vndr/ch(extended)" -}; - -partial alphanumeric_keys -xkb_symbols "fr" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Swiss/French keybaord - - include "macintosh_vndr/ch(extended)" - name[Group1]= "Switzerland - French, Mac"; - - override key { - [ egrave, udiaeresis, bracketleft ] - }; - override key { - [ eacute, odiaeresis ] - }; - override key { - [ agrave, adiaeresis, braceleft ] - }; -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/ch(fr)" // for consistent naming -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/de b/xorg-server/xkbdata.src/symbols/macintosh_vndr/de deleted file mode 100644 index 92c54916c..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/de +++ /dev/null @@ -1,97 +0,0 @@ -// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/de,v 3.7.2.2 1999/07/13 07:09:56 hohndel Exp $ - -// olh@suse.de very close to MacOS map - -default partial alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple German keybaord - - include "latin" - name[Group1]= "Germany - Mac"; - - // Alphanumeric section - key { [ dead_circumflex, degree, notsign ] }; - key { [ 1, exclam, exclamdown, at ] }; - key { [ 2, quotedbl, twosuperior ] }; - key { [ 3, section, threesuperior,sterling ] }; - key { [ 4, dollar, onequarter, currency ] }; - key { [ 5, percent, bracketleft ] }; - key { [ 6, ampersand, bracketright ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, braceleft, asciitilde ] }; - key { [ 9, parenright, braceright ] }; - key { [ 0, equal, braceright, degree ] }; - key { [ ssharp, question, backslash, questiondown ] }; - key { [ dead_acute, dead_grave, dead_cedilla ] }; - - key { [ q, Q, guillemotleft,guillemotright ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, registered ] }; - key { [ t, T ] }; - key { [ z, Z ] }; - key { [ u, U, diaeresis, Aacute ] }; - key { [ i, I, slash, Ucircumflex ] }; - key { [ o, O, oslash, Ooblique ] }; - key { [ udiaeresis, Udiaeresis, periodcentered, degree ] }; - key { [ plus, asterisk, asciitilde ] }; - key { [ a, A, aring, Aring ] }; - key { [ f, F ] }; - key { [ g, G, copyright ] }; - key { [ h, H, ordfeminine ] }; - key { [ l, L, at ] }; - key { [ odiaeresis, Odiaeresis, dead_acute ] }; - key { [ adiaeresis, Adiaeresis, dead_circumflex ] }; - - key { [ less, greater, bar ] }; - key { [ y, Y, guillemotleft,less ] }; - key { [ n, N, asciitilde ] }; - key { [ m, M, mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon, periodcentered, division ] }; - key { [ minus, underscore ] }; - key { [ numbersign, apostrophe, dead_grave ] }; - - include "kpdl(comma)" - include "level3(ralt_switch)" - -}; - -partial alphanumeric_keys -xkb_symbols "Sundeadkeys" { - // modify the default German layout to use Sun dead keys - include "macintosh_vndr/de(basic)" - name[Group1]= "Germany - Mac, Sun dead keys"; - - key { [ SunFA_Circum, degree, notsign ] }; - key { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] }; - key { [ udiaeresis, Udiaeresis, SunFA_Diaeresis ] }; - key { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; - key { [ odiaeresis, Odiaeresis, SunFA_Acute ] }; - key { [ adiaeresis, Adiaeresis, SunFA_Circum ] }; - - key { [ numbersign, acute, SunFA_Grave ] }; -}; - -partial alphanumeric_keys -xkb_symbols "sundeadkeys" { - include "macintosh_vndr/de(Sundeadkeys)" -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - // modify the default German layout to not have any dead keys - include "macintosh_vndr/de(basic)" - name[Group1]= "Germany - Mac, eliminate dead keys"; - - key { [ asciicircum, degree, notsign ] }; - key { [ acute, grave, cedilla ] }; - key { [ udiaeresis, Udiaeresis, diaeresis ] }; - key { [ plus, asterisk, asciitilde, macron ] }; - key { [ odiaeresis, Odiaeresis, acute ] }; - key { [ adiaeresis, Adiaeresis, asciicircum ] }; - - key { [ numbersign, apostrophe, grave ] }; -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk b/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk deleted file mode 100644 index 56ef85bf6..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk +++ /dev/null @@ -1,79 +0,0 @@ -// $XConsortium: dk /main/3 1996/08/31 12:19:29 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/dk,v 3.3.2.1 1999/12/20 12:56:01 hohndel Exp $ -partial alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a Danish keyboard with dead key support - // and all of ISO-8859-1 characters available. - - include "latin" - name[Group1]= "Denmark - Mac"; - - key { [ onehalf, section, threequarters, paragraph ]}; - key { [ less, greater, backslash, notsign ]}; - key { [ space, space, nobreakspace, nobreakspace ]}; - key { [ 1, exclam, exclamdown, onesuperior ]}; - key { [ 2, quotedbl, at, twosuperior ]}; - key { [ 3, numbersign, sterling, threesuperior ]}; - key { [ 4, EuroSign, dollar, onequarter ]}; - key { [ 5, percent, NoSymbol, cent ]}; - key { [ 6, ampersand, yen, NoSymbol ]}; - key { [ 7, slash, braceleft, division ]}; - key { [ 8, parenleft, bracketleft, guillemotleft ]}; - key { [ 9, parenright, bracketright, guillemotright ]}; - key { [ 0, equal, braceright, degree ]}; - key { [ comma, semicolon, dead_cedilla, dead_ogonek ]}; - key { [ period, colon, periodcentered, dead_abovedot ]}; - key { [ c, C, copyright, NoSymbol ]}; - key { [ minus, underscore, hyphen, macron ]}; - key { [ a, A, ordfeminine, masculine ]}; - key { [ d, D, eth, ETH ]}; - key { [ e, E, EuroSign, cent ]}; - key { [ r, R, registered, NoSymbol ]}; - key { [ t, T, thorn, THORN ]}; - key { [ i, I, NoSymbol, NoSymbol ]}; - key { [ o, O, oe, OE ]}; - key { [ ae, AE ]}; - key { [ plus, question, plusminus, questiondown ]}; - key { [ oslash, Ooblique ]}; - key { [ apostrophe, asterisk, dead_doubleacute, multiply ]}; - key { [ aring, Aring ]}; - key { [ dead_acute, dead_grave, bar, brokenbar ]}; - key { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ]}; - - // End alphanumeric section - - include "eurosign(e)" - include "level3(ralt_switch)" -}; - - -partial default alphanumeric_keys -xkb_symbols "full" { - include "iso9995-3(full)" - include "dk(basic)" -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/dk(basic)" - name[Group1]= "Denmark - Mac, eliminate dead keys"; - - key { [ acute, grave, bar, ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; -}; - -partial alphanumeric_keys -xkb_symbols "macbookpro" { - - include "level3(win_switch)" - include "macintosh_vndr/dk(basic)" - - name[Group1]= "Denmark - Mac, MacBook Pro"; - - key { [apostrophe, asterisk, at, at ] }; - key { [ dollar, section, dollar, dollar ] }; -}; - diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi b/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi deleted file mode 100644 index 6cb5fa314..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi +++ /dev/null @@ -1,18 +0,0 @@ - -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple Swedish(Finland) keybaord - - include "macintosh_vndr/se(basic)" // for consistent naming - name[Group1]= "Finland - Mac"; - -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/se(basic)" // for consistent naming - name[Group1]= "Finland - Mac, eliminate dead keys"; -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr b/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr deleted file mode 100644 index 9a8f8de23..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr +++ /dev/null @@ -1,110 +0,0 @@ -// Marc.Shapiro@inria.fr 19-sep-1998 -// modifications : Etienne Herlent june 2000 -// adapted to the new input layer : -// Martin Costabel 3-jan-2001 -////////////////////////////////////////////////////////////////// -// Petites Modification le juillet 2005 par Bin Zhang : -// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE -// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign" -// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. ) -// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L -// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée -// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html -////////////////////////////////////////////////////////////////// -// This map is an almost-complete mapping of the standard French -// MacIntosh keyboard under Xwindows. I tried to remain as faithful -// as possible to the Mac meaning of each key. I did this entirely by -// hand and by intuition, relying on the Clavier (Keyboard?) Desktop -// Accessory for the Mac meaning of keys, and on reading keysymdef.h -// to intuit the corresponding X names. Lacking proper documentation, -// I may have made some mistakes. - -// Entries marked CHECK are particularly uncertain - -// Entries marked MISSING mark Mac characters for which I was unable -// to find a corresponding keysym. (Some for sure don't: e.g. the -// Apple mark and the oe/OE character; others I may have simply not -// found.) - -default -xkb_symbols "extended" { - - name[Group1]= "France - Mac"; - - key { [ Escape ] }; - - // Alphanumeric section - key { [ at, numbersign, periodcentered, Ydiaeresis ] }; - key { [ KP_Enter ] }; - key { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple - key { [ eacute, 2, ediaeresis, Eacute ] }; - key { [ quotedbl, 3, leftdoublequotemark, rightdoublequotemark ] }; - key { [ apostrophe, 4, leftsinglequotemark, rightsinglequotemark ] }; - key { [ parenleft, 5, braceleft, bracketleft ] }; - key { [ section, 6, paragraph, aring ] }; - key { [ egrave, 7, guillemotleft, guillemotright] }; - key { [ exclam, 8, exclamdown, Ucircumflex ] }; - key { [ ccedilla, 9, Ccedilla, Aacute ] }; - key { [ agrave, 0, oslash, Oslash ] }; - key { [ parenright, degree, braceright, bracketright ] }; - key { [ minus, underscore, emdash, endash ] }; - key { [ BackSpace, VoidSymbol, Delete, VoidSymbol ] }; - - key { [ Tab, ISO_Left_Tab ] }; - key { [ a, A, ae, AE ] }; - key { [ z, Z, Acircumflex, Aring ] }; - key { [ e, E, ecircumflex, Ecircumflex ] }; - key { [ r, R, registered, currency ] }; - key { [ t, T, dagger, trademark ] }; - key { [ y, Y, Uacute, Ydiaeresis ] }; - key { [ u, U, masculine, ordfeminine ] }; - key { [ i, I, icircumflex, idiaeresis ] }; - key { [ o, O, oe, OE ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [dead_circumflex,dead_diaeresis,ocircumflex, Ocircumflex ] }; - key { [ dollar, asterisk, EuroSign, yen ] }; - key { [ Caps_Lock ] }; - key { [ q, Q, doubledagger, Greek_OMEGA ] }; - key { [ s, S, Ograve, Greek_SIGMA ] }; - key { [ d, D, Greek_delta, Greek_DELTA ] }; - key { [ f, F, VoidSymbol, periodcentered ] }; - key { [ g, G, VoidSymbol, VoidSymbol ] }; // MISSING: ligature fi,fl - key { [ h, H, Igrave, Icircumflex ] }; - key { [ j, J, Idiaeresis, Iacute ] }; - key { [ k, K, Egrave, Ediaeresis ] }; - key { [ l, L, notsign, bar ] }; - key { [ m, M, mu, Oacute ] }; - key { [ ugrave, percent, Ugrave, 0x1002030 ] }; - key { [ dead_grave, sterling, at, numbersign ] }; - key { [ Return ] }; - - key { [ less, greater, lessthanequal, greaterthanequal ] }; - key { [ w, W, guilsinglleft, guilsinglright ] }; // MISSING: half-guillemot (single angle bracket) - key { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK: similarequal; MISSING: extra-slanted slash - key { [ c, C, copyright, cent ] }; - key { [ v, V, diamond, radical ] }; // CHECK diamond - key { [ b, B, ssharp, integral ] }; - key { [ n, N, dead_tilde, asciitilde ] }; - key { [ comma, question, infinity, questiondown ] }; - key { [ semicolon, period, ellipsis, periodcentered ] }; - key { [ colon, slash, division, backslash ] }; - key { [ equal, plus, notequal, plusminus ] }; - - key { [ space, space, nobreakspace, nobreakspace ] }; - // End alphanumeric section - - include "level3(ralt_switch)" -}; - - - -xkb_symbols "nodeadkeys" { -include "macintosh_vndr/fr(extended)" - name[Group1]= "France - Mac, eliminate dead keys"; - - key { [ ampersand, 1, VoidSymbol, acute ] }; // MISSING: Apple - key { [asciicircum,diaeresis,ocircumflex, Ocircumflex ] }; - key { [ grave, sterling, at, numbersign ] }; - - key { [ n, N, asciitilde, dead_tilde ] }; -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb b/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb deleted file mode 100644 index 8eb82eb70..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb +++ /dev/null @@ -1,21 +0,0 @@ -// $XConsortium: gb /main/3 1996/08/31 12:19:51 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/gb,v 3.3 1996/12/23 07:13:25 dawes Exp $ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple U.K. keyboard layout - - include "latin" - - name[Group1]= "United Kingdom - Mac"; - - key { [ 2, at, EuroSign ] }; - key { [ 3, sterling, numbersign ] }; - - // End alphanumeric section - - include "level3(ralt_switch)" -}; - - diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/is b/xorg-server/xkbdata.src/symbols/macintosh_vndr/is deleted file mode 100644 index 000bcdb0b..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/is +++ /dev/null @@ -1,128 +0,0 @@ -// $XKeyboardConfig$ -// -// This file describes the differences between a Macintosh US Extended -// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X -// -// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason -// -// Permission to use, copy, modify, distribute, and sell this software and its -// documentation for any purpose is hereby granted without fee, provided that -// the above copyright notice appear in all copies and that both that -// copyright notice and this permission notice appear in supporting -// documentation. -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder shall -// not be used in advertising or otherwise to promote the sale, use or -// other dealings in this Software without prior written authorization of -// the copyright holder. -// -// = HISTORY -// * 2004-09-28: -// Initial cleanroom writing of the keymap, I just booted Mac OS X, opened -// TextEdit.app and wrote down what the value produced by each key was when I -// pressed it, a for a, A for shift + a, Ã¥ for lalt + a etc and made the -// keymap from that information -// -// * 2006-01-14: -// Revised the comments in the file -// -// = NOTES -// * 20 characters in this keymap have no named character defined in -// include/keysymdef.h and as a result their Unicode code points in -// hexadecimal are listed here, these can be generated with the following -// perl command: -// $ perl -CA -e 'printf "U%x\n", ord shift' Æ -// and converted back like: -// $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6 -// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X -// keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it -// has no assigned code point in Unicode, the code point Apple uses for it is -// U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF) -// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it -// should work on other Apple laptop models which use the same keyboard -// layout. It will probably work on standard sized keyboards with little or -// no modification but it might not support them fully, please report if -// you're able to get it running with such a keyboard - -partial default alphanumeric_keys -xkb_symbols "basic" { - name[Group1]= "Iceland - Mac"; - - //-- Row 5 (E) --// - key { [ sterling, section, UF8FF, apostrophe ] }; - key { [ 1, exclam, exclamdown, VoidSymbol ] }; - key { [ 2, quotedbl, at, VoidSymbol ] }; - key { [ 3, numbersign, U2122, sterling ] }; - key { [ 4, dollar, U00A2, EuroSign ] }; - key { [ 5, percent, U2030, infinity ] }; - key { [ 6, ampersand, asciicircum, U2044 ] }; - key { [ 7, slash, backslash, U00F7 ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal, U2260, U2248 ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ minus, underscore, endash, emdash ] }; - - - //-- Row 4 (D) --// - key { [ q, Q, paragraph, VoidSymbol ] }; - key { [ w, W, U2211, VoidSymbol ] }; - key { [ e, E, dead_grave, VoidSymbol ] }; - key { [ r, R, registered, VoidSymbol ] }; - key { [ t, T, degree, VoidSymbol ] }; - key { [ y, Y, yen, VoidSymbol ] }; - key { [ u, U, dead_diaeresis, VoidSymbol ] }; - key { [ i, I, U0131, U00AA ] }; - key { [ o, O, dead_circumflex,U00BA ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [ eth, Eth, U201e, U201c ] }; - key { [ apostrophe, question, questiondown, U00B7 ] }; - - - //-- Row 3 (C) --// - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp, abovedot ] }; - key { [ d, D, U2202, U2DA ] }; - key { [ f, F, U192, macron ] }; - key { [ g, G, copyright, breve ] }; - key { [ h, H, bar, VoidSymbol ] }; - key { [ j, J, U2206, U2dd ] }; - key { [ k, K, U00AC, VoidSymbol ] }; - key { [ l, L, U2026, caron ] }; - key { [ ae, AE, oe, OE ] }; - key { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; - key { [ plus, asterisk, U2022, plusminus ] }; - - - //-- Row 2 (B) --// - key { [ less, greater, section, UF8FF ] }; - key { [ z, Z, U3A9, VoidSymbol ] }; - key { [ x, X, asciitilde, VoidSymbol ] }; - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ v, V, U221A, U25CA ] }; - key { [ b, B, U222B, VoidSymbol ] }; - key { [ n, N, dead_tilde, VoidSymbol ] }; - key { [ m, M, U00B5, VoidSymbol ] }; - key { [ comma, semicolon, lessthanequal, guillemotleft ] }; - key { [ period, colon, greaterthanequal,guillemotright ] }; - key { [ thorn, Thorn, U2019, U201d ] }; - - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/is(basic)" // for consistent naming - name[Group1]= "Iceland - Mac, eliminate dead keys"; -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/it b/xorg-server/xkbdata.src/symbols/macintosh_vndr/it deleted file mode 100644 index 44435201b..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/it +++ /dev/null @@ -1,64 +0,0 @@ - -xkb_symbols "extended" { - - name[Group1]= "Italy - Mac"; - - // Alphanumeric section - key { [ less, greater ] }; - key { [ at, numbersign, periodcentered ] }; - key { [ ampersand, 1, guillemotleft,guillemotright ] }; - key { [ quotedbl, 2 ] }; - key { [ apostrophe, 3 ] }; - key { [ parenleft, 4, braceleft, bracketleft ] }; - key { [ ccedilla, 5, Ccedilla, Iacute ] }; - key { [ egrave, 6, paragraph, periodcentered] }; - key { [ parenright, 7, braceright, bracketright ] }; - key { [ sterling, 8, infinity ] }; - key { [ agrave, 9, acute, Ocircumflex ] }; - key { [ eacute, 0, grave, Oacute ] }; - key { [ minus, underscore ] }; - key { [ equal, plus, notequal, plusminus ] }; - - key { [ q, Q ] }; - key { [ z, Z ] }; - key { [ e, E, EuroSign ] }; - key { [ r, R, registered ] }; - key { [ t, T ] }; - key { [ y, Y, Uacute, ydiaeresis ] }; - key { [ u, U ] }; - key { [ i, I, icircumflex, idiaeresis ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [ igrave, asciicircum ] }; - key { [ dollar, asterisk ] }; - key { [ section, degree, at, numbersign ] }; - - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H, Igrave, Icircumflex ] }; - key { [ j, J, Idiaeresis, Iacute ] }; - key { [ k, K, Egrave, Ediaeresis ] }; - key { [ l, L, ssharp, bar ] }; - key { [ m, M, mu, Oacute ] }; - key { [ ugrave, percent, ae, AE ] }; - - key { [ w, W ] }; - key { [ x, X ] }; - key { [ c, C, copyright, copyright ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N, dead_tilde ] }; - key { [ comma, question, questiondown ] }; - key { [ semicolon, period ] }; - key { [ colon, slash, bar, backslash ] }; - key { [ ograve, exclam, exclamdown ] }; - - // End alphanumeric section - - include "kpdl(dot)" - include "level3(ralt_switch)" -}; - diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/jp b/xorg-server/xkbdata.src/symbols/macintosh_vndr/jp deleted file mode 100644 index a4af79f35..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/jp +++ /dev/null @@ -1,35 +0,0 @@ -// JIS symbol mapping for Apple Aluminium Keyboard -// (Damien Ciabrini ) -// -// The JIS version of the Aluminium Keyboard is made of -// QWERTY-like map for the latin part -// PC98-like map for the kana part -// EISU and KANA keys found on other Apple keyboards - -partial default alphanumeric_keys -xkb_symbols "usmac" { - name[Group1] = "Japan - Macintosh, US map"; - include "jp(common)" - - key { [ KP_Separator ] }; - key { [ yen, bar ] }; - replace key { [ 0 ] }; - replace key { [ underscore ] }; - replace key { [ Caps_Lock ] }; -}; - -partial alphanumeric_keys -xkb_symbols "mac" { - name[Group1] = "Japan - Macintosh"; - include "jp(kana)" - - replace key { [ Caps_Lock ] }; -}; - -partial alphanumeric_keys -xkb_symbols "alujiskeys" { - // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja - // see keycodes macintosh(jisevdev) - replace key { [ Hiragana_Katakana ] }; - replace key { [ Eisu_toggle ] }; -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam b/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam deleted file mode 100644 index 085de0e4b..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam +++ /dev/null @@ -1,38 +0,0 @@ - -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple Spanish keybaord - - include "latin" - name[Group1]= "Latin American - Mac"; - - key { [ bracketleft, bracketright, braceleft, braceright ] }; - key { [ less, greater, bracketleft, braceleft ] }; - key { [ 1, exclamdown ] }; - key { [ 2, exclam, at, oneeighth ] }; - key { [ 3, numbersign, guillemotleft, guillemotright ] }; - key { [ 4, dollar, yen, Icircumflex ] }; - key { [ 5, percent ] }; - key { [ 6, slash, backslash, Idiaeresis ] }; - key { [ 7, ampersand, bar, Iacute ] }; - key { [ 8, asterisk, degree ] }; - key { [ 9, parenleft, sterling, Ocircumflex ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus, plusminus ] }; - key { [ dead_grave, degree ] }; - key { [ dead_acute, dead_diaeresis, bar ] }; - - key { [ comma, questiondown ] }; - key { [ period, question ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] }; - key { [ semicolon, colon ] }; - key { [ apostrophe, quotedbl ] }; - - // End alphanumeric section - - include "level3(ralt_switch)" -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile b/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile deleted file mode 100644 index 0c54d7bdd..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile +++ /dev/null @@ -1,16 +0,0 @@ -ifeq ($(MAKESERVER),1) -$(error Please do not specify MAKESERVER=1) -endif - -DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\macintosh_vndr - -dist_symbols_DATA = \ -apple ch de dk \ -fi fr \ -gb is it jp \ -latam nl no pt \ -se us - -DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%) - -include ..\..\xkbrules.mak diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl b/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl deleted file mode 100644 index b60690e4d..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl +++ /dev/null @@ -1,17 +0,0 @@ - -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple netherland keybaord - - include "latin" - - name[Group1]= "Netherlands - Mac"; - - include "level3(ralt_switch)" - -// do just nothing - -}; - diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/no b/xorg-server/xkbdata.src/symbols/macintosh_vndr/no deleted file mode 100644 index d8bf0d650..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/no +++ /dev/null @@ -1,52 +0,0 @@ -// $XConsortium: no /main/3 1996/08/31 12:20:02 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/no,v 3.3.2.1 1997/07/26 06:31:01 dawes Exp $ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple Norwegian keybaord - - include "latin" - - name[Group1]= "Norway - Mac"; - - key { [ bar, section ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 4, currency, dollar, dollar ] }; - key { [ 3, numbersign, sterling, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal ] }; - - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; - key { [ plus, question ] }; - key { [ ae, AE ] }; - key { [ aring, Aring ] }; - key { [ dead_grave, dead_acute, acute, dead_ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; - key { [ at, asterisk ] }; - key { [ less, greater ] }; - - // End alphanumeric section - - include "eurosign(e)" - include "level3(ralt_switch)" -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - - // Modifies the basic Norwegian layout to eliminate dead keys - include "macintosh_vndr/no(basic)" - name[Group1]= "Norway - Mac, eliminate dead keys"; - - key { [ grave, acute, acute, ogonek ] }; - key { [ diaeresis, asciicircum, asciitilde, macron ] }; - -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt b/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt deleted file mode 100644 index 8f1785742..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt +++ /dev/null @@ -1,63 +0,0 @@ -// $XConsortium: pt /main/3 1996/08/31 12:20:08 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/pt,v 3.3.2.1 1999/11/18 15:37:37 hohndel Exp $ -// mac version from Ricardo Cabral - -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple Portuguese keybaord - - include "latin" - - name[Group1]= "Portugal - Mac"; - - key { [ less, greater, bar, brokenbar ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 4, dollar, section, dollar ] }; - key { [ 3, numbersign, sterling, sterling ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal ] }; - key { [ apostrophe, question ] }; - key { [ plus, asterisk, dead_diaeresis ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ ccedilla, Ccedilla ] }; - key { [ dead_tilde, dead_circumflex ] }; - key { [ backslash, bar ] }; - key { [ masculine, ordfeminine ] }; - key { [ dead_acute, dead_grave ] }; - // End alphanumeric section - - include "eurosign(e)" - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "Sundeadkeys" { - include "macintosh_vndr/pt(basic)" // for consistent naming - name[Group1]= "Portugal - Mac, Sun dead keys"; - - key { [ plus, asterisk, SunFA_Diaeresis, SunFA_Diaeresis ] }; - key { [ SunFA_Tilde, SunFA_Circum ] }; - key { [ SunFA_Acute, SunFA_Grave ] }; -}; - -partial alphanumeric_keys -xkb_symbols "sundeadkeys" { - include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/pt(basic)" // for consistent naming - name[Group1]= "Portugal - Mac, eliminate dead keys"; - - key { [ plus, asterisk, quotedbl, quotedbl ] }; - key { [ asciitilde, asciicircum ] }; - key { [ acute, grave ] }; -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/se b/xorg-server/xkbdata.src/symbols/macintosh_vndr/se deleted file mode 100644 index d5d8c1c4c..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/se +++ /dev/null @@ -1,46 +0,0 @@ -// $XConsortium: se /main/3 1996/08/31 12:20:15 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/se,v 1.1 2000/09/19 12:46:26 eich Exp $ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple en_US - // keyboard and a very simple Swedish(Sweden) keybaord - - include "latin" - - name[Group1]= "Sweden - Mac"; - - key { [ section, degree ] }; - - key { [ 1, exclam, copyright, exclamdown ] }; - key { [ 2, quotedbl, at, oneeighth ] }; - key { [ 3, numbersign, sterling, yen ] }; - key { [ 4, currency, dollar, cent ] }; - key { [ 6, ampersand ] }; - key { [ 7, slash, bar, backslash ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ comma, semicolon ] }; - key { [ 0, equal ] }; - key { [ period, colon ] }; - key { [ minus, underscore ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ plus, question ] }; - key { [ adiaeresis, Adiaeresis, ae, AE ] }; - key { [ aring, Aring ] }; - key { [ acute, grave ] }; - key { [ diaeresis, asciicircum, asciitilde ] }; - key { [ apostrophe, asterisk, at ] }; - key { [ less, greater, bar, brokenbar ] }; - - include "kpdl(comma)" - include "eurosign(e)" - include "level3(ralt_switch)" -}; - - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh_vndr/se(basic)" // for consistent naming - name[Group1]= "Sweden - Mac, eliminate dead keys"; -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/us b/xorg-server/xkbdata.src/symbols/macintosh_vndr/us deleted file mode 100644 index fed3253cf..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/us +++ /dev/null @@ -1,151 +0,0 @@ -// $XConsortium: macintosh /main/10 1996/01/29 19:54:54 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/us,v 1.8 2003/08/04 10:32:31 eich Exp $ - -// symbols definition for a Macintosh "Extended" keyboard - -xkb_symbols "extended" { - - name[Group1]= "USA"; - key { [ Escape ] }; - - // Alphanumeric section - key { [ quoteleft, asciitilde ] }; - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, numbersign ] }; - key { [ 4, dollar ] }; - key { [ 5, percent ] }; - key { [ 6, asciicircum ] }; - key { [ 7, ampersand ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - - key { [ q, Q ] }; - key { [ w, W ] }; - key { [ e, E ] }; - key { [ r, R ] }; - key { [ t, T ] }; - key { [ y, Y ] }; - key { [ u, U ] }; - key { [ i, I ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [ bracketleft, braceleft ] }; - key { [ bracketright, braceright ] }; - key { [ backslash, bar ] }; - - key { [ a, A ] }; - key { [ s, S ] }; - key { [ d, D ] }; - key { [ f, F ] }; - key { [ g, G ] }; - key { [ h, H ] }; - key { [ j, J ] }; - key { [ k, K ] }; - key { [ l, L ] }; - key { [ semicolon, colon ] }; - key { [ quoteright, quotedbl ] }; - - key { [ z, Z ] }; - key { [ x, X ] }; - key { [ c, C ] }; - key { [ v, V ] }; - key { [ b, B ] }; - key { [ n, N ] }; - key { [ m, M ] }; - key { [ comma, less ] }; - key { [ period, greater ] }; - key { [ slash, question ] }; - - key { [ space ] }; - // End alphanumeric section - - - include "eurosign(e)" - include "keypad" - - key { [ equal ] }; -}; - -hidden -xkb_symbols "oldmac" { - - include "macintosh_vndr/us(extended)" - - // Begin "Function" section - key { [ F1 ] }; - key { [ F2 ] }; - key { [ F3 ] }; - key { [ F4 ] }; - key { [ F5 ] }; - key { [ F6 ] }; - key { [ F7 ] }; - key { [ F8 ] }; - key { [ F9 ] }; - key { [ F10 ] }; - key { [ F11 ] }; - key { [ F12 ] }; - key { [ Print ] }; - key { [ Scroll_Lock ] }; - key { [ Pause ] }; - // End "Function" section - - // Begin "Editing" section - key { [ Insert ] }; - key { [ Home ] }; - key { [ Prior ] }; - key { [ Delete ] }; - key { [ End ] }; - key { [ Next ] }; - - key { [ Up ] }; - key { [ Left ] }; - key { [ Down ] }; - key { [ Right ] }; - // End "Editing" section - - key { [ BackSpace ] }; - key { [ Tab, ISO_Left_Tab ] }; - key { [ Return ] }; - key { [ Caps_Lock ] }; - key { [ Num_Lock, Pointer_EnableKeys ] }; - - // Begin "Modifier" section - key { [ Shift_L ] }; - key { [ Shift_R ] }; - key { [ Control_L ] }; - key { [ Control_R ] }; - key { [ Alt_L, Meta_L ] }; - key { [ Alt_R, Meta_R ] }; - key { [ Super_L ] }; - key { [ 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 { [ ISO_Level3_Shift ] }; - key { [ Mode_switch ] }; - modifier_map Mod5 { , }; - - key { [ NoSymbol, Alt_L ] }; - modifier_map Mod1 { , }; - - key { [ NoSymbol, Meta_L ] }; - modifier_map Mod1 { }; - - key { [ NoSymbol, Super_L ] }; - modifier_map Mod4 { }; - - key { [ NoSymbol, Hyper_L ] }; - modifier_map Mod4 { }; - // end modifier mappings - -}; -- cgit v1.2.3