Index: programs/xkbcomp/keycodes/macintosh =================================================================== RCS file: /home/eich/cvs/xc/programs/xkbcomp/keycodes/macintosh,v retrieving revision 1.1.1.8 diff -u -r1.1.1.8 macintosh --- programs/xkbcomp/keycodes/macintosh 30 Nov 2001 13:39:50 -0000 1.1.1.8 +++ programs/xkbcomp/keycodes/macintosh 21 Oct 2004 10:14:44 -0000 @@ -29,6 +29,146 @@ // $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.4 2001/10/02 19:57:00 alanh Exp $ // default xkb_keycodes "macintosh" { + include "macintosh(linux_key_codes)" +}; + +xkb_keycodes "linux_key_codes" { + + minimum= 8; + maximum= 255; + + = 49; + = 10; + = 11; + = 12; + = 13; + = 14; + = 15; + = 16; + = 17; + = 18; + = 19; + = 20; + = 21; + = 22; + + = 23; + = 24; + = 25; + = 26; + = 27; + = 28; + = 29; + = 30; + = 31; + = 32; + = 33; + = 34; + = 35; + = 36; + + = 66; + = 38; + = 39; + = 40; + = 41; + = 42; + = 43; + = 44; + = 45; + = 46; + = 47; + = 48; + = 51; + + = 50; + = 94; + = 52; + = 53; + = 54; + = 55; + = 56; + = 57; + = 58; + = 59; + = 60; + = 61; + = 62; + + = 37; // left control + = 64; // left alt / option + = 115; // left command / apple + = 65; // + = 116; // right command / apple + = 113; // right altgr / option + = 109; // right control + + = 9; + = 67; + = 68; + = 69; + = 70; + = 71; + = 72; + = 73; + = 74; + = 75; + = 76; + = 95; + = 96; + = 182; + = 183; + = 184; + = 93; + + = 111; + = 92; + = 78; + = 110; + = 114; + + = 106; + = 97; + = 99; + = 107; + = 103; + = 105; + + = 98; + = 100; + = 104; + = 102; + + = 174; + = 176; + = 160; + = 204; + + = 77; + = 157; + = 112; + = 63; + + = 79; + = 80; + = 81; + = 82; + + = 83; + = 84; + = 85; + = 86; + + = 87; + = 88; + = 89; + = 108; + + = 90; + = 91; +}; + +xkb_keycodes "macintosh_raw_adb" { minimum= 8; maximum= 134; @@ -92,14 +232,14 @@ = 57; - = 62; // Left Control - = 63; // Left Option = 64; // Left Shift - = 66; // Left Command -// = 131; // Right Shift -// = 132; // Right Command -// = 133; // Right Control -// = 134; // Right Option + = 62; // Left Control + = 66; // Left alt / Option + = 63; // Left apple / Command + = 132; // Right apple / Command + = 134; // Right alt(gr) / Option + = 133; // Right Control + = 131; // Right Shift = 130; = 128; @@ -114,9 +254,9 @@ = 111; = 119; - = 113; - = 115; - = 121; + = 113; // F13 + = 78; // F14 + = 110; // F15 = 122; = 123; Index: programs/xkbcomp/keymap/macintosh =================================================================== RCS file: /home/eich/cvs/xc/programs/xkbcomp/keymap/macintosh,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 macintosh --- programs/xkbcomp/keymap/macintosh 7 Mar 2001 14:37:06 -0000 1.1.1.2 +++ programs/xkbcomp/keymap/macintosh 21 Oct 2004 10:14:44 -0000 @@ -1,7 +1,7 @@ // $XConsortium: macintosh /main/11 1996/03/07 13:42:13 kaleb $ // $XFree86: xc/programs/xkbcomp/keymap/macintosh,v 1.1 1999/05/23 05:27:51 dawes Exp $ default xkb_keymap "macintosh" { - xkb_keycodes { include "xfree86" }; + xkb_keycodes { include "macintosh(linux_key_codes)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "macintosh/us(extended)" }; @@ -9,7 +9,7 @@ }; xkb_keymap "macintosh_old" { - xkb_keycodes { include "macintosh" }; + xkb_keycodes { include "macintosh(macintosh_raw_adb)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "macintosh/us(extended)" }; Index: programs/xkbcomp/symbols/macintosh_vndr/dk =================================================================== RCS file: /home/eich/cvs/xc/programs/xkbcomp/symbols/macintosh/Attic/dk,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 dk --- programs/xkbcomp/symbols/macintosh_vndr/dk 29 Sep 2000 11:23:03 -0000 1.1.1.2 +++ programs/xkbcomp/symbols/macintosh_vndr/dk 21 Oct 2004 10:14:44 -0000 @@ -48,7 +48,7 @@ key { [ d, D ], [ eth, ETH ]}; key { [ e, E ], - [ NoSymbol, cent ]}; + [ EuroSign, cent ]}; key { [ r, R ], [ registered, NoSymbol ]}; key { [ t, T ], Index: programs/xkbcomp/symbols/macintosh_vndr/es =================================================================== RCS file: /home/eich/cvs/xc/programs/xkbcomp/symbols/macintosh/Attic/es,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 es --- programs/xkbcomp/symbols/macintosh_vndr/es 28 Sep 2000 10:09:10 -0000 1.1.1.2 +++ programs/xkbcomp/symbols/macintosh_vndr/es 21 Oct 2004 10:14:44 -0000 @@ -6,6 +6,8 @@ // Describes the differences between a very simple mac_US // keyboard and a very simple Spanish keybaord + // this keymap is used by the spanish guys in Mexico + // people in spain use "iso", see below name[Group1]= "Spanish"; @@ -13,8 +15,8 @@ [ braceleft, braceright ] }; key { [ less, greater ], [ bracketleft, braceleft ] }; - key { [ 1, exclam ] }; - key { [ 2, exclamdown ], + key { [ 1, exclamdown ] }; + key { [ 2, exclam ], [ at, oneeighth ] }; key { [ 3, numbersign ], [ guillemotleft, guillemotright ] }; @@ -36,6 +38,9 @@ key { [ dead_grave, degree ] }; key { [ dead_acute, dead_diaeresis ], [ bar ] }; + key { [ e, E ], + [ EuroSign ] }; + key { [ comma, questiondown ] }; key { [ period, question ] }; @@ -46,5 +51,18 @@ key { [ apostrophe, quotedbl ] }; // End alphanumeric section + +}; + +xkb_symbols "nodeadkeys" { + // a dummy map to workaround XF86config errors + include "macintosh/es(basic)" +}; + +xkb_symbols "iso" { + // the people in spain use PC style keyboards on their macs + // credits to Xoán Pedracova + + include "es(basic)" }; Index: programs/xkbcomp/symbols/macintosh_vndr/fr =================================================================== RCS file: /home/eich/cvs/xc/programs/xkbcomp/symbols/macintosh/Attic/fr,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 fr Index: programs/xkbcomp/symbols/macintosh_vndr/it =================================================================== RCS file: /home/eich/cvs/xc/programs/xkbcomp/symbols/macintosh/Attic/it,v retrieving revision 1.1.1.3 diff -u -r1.1.1.3 it --- programs/xkbcomp/symbols/macintosh_vndr/it 10 Apr 2001 15:25:15 -0000 1.1.1.3 +++ programs/xkbcomp/symbols/macintosh_vndr/it 21 Oct 2004 10:14:44 -0000 @@ -32,7 +32,8 @@ key { [ q, Q ] }; key { [ z, Z ] }; - key { [ e, E ] }; + key { [ e, E ], + [ EuroSign ] }; key { [ r, R ], [ registered ] }; key { [ t, T ] }; @@ -85,9 +86,6 @@ [ exclamdown ] }; // End alphanumeric section - - key { [ KP_Decimal , KP_Delete ] }; - // End "Keypad" section }; Index: programs/xkbcomp/symbols/macintosh_vndr/no =================================================================== RCS file: /home/eich/cvs/xc/programs/xkbcomp/symbols/macintosh/Attic/no,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 no --- programs/xkbcomp/symbols/macintosh_vndr/no 29 Sep 2000 11:23:03 -0000 1.1.1.2 +++ programs/xkbcomp/symbols/macintosh_vndr/no 21 Oct 2004 10:14:44 -0000 @@ -31,6 +31,8 @@ [ odiaeresis, Odiaeresis ] }; key { [ plus, question ] }; key { [ ae, AE ] }; + key { [ e, E ], + [ EuroSign ] }; key { [ aring, Aring ] }; key { [ dead_grave, dead_acute ], [ acute, dead_ogonek ] }; Index: programs/xkbcomp/symbols/macintosh_vndr/se =================================================================== RCS file: /home/eich/cvs/xc/programs/xkbcomp/symbols/macintosh/Attic/se,v retrieving revision 1.1.1.3 diff -u -r1.1.1.3 se --- programs/xkbcomp/symbols/macintosh_vndr/se 6 Dec 2000 12:44:54 -0000 1.1.1.3 +++ programs/xkbcomp/symbols/macintosh_vndr/se 21 Oct 2004 10:14:44 -0000 @@ -34,6 +34,8 @@ key { [ plus, question ] }; key { [ adiaeresis, Adiaeresis ], [ ae, AE ] }; + key { [ e, E ], + [ EuroSign ] }; key { [ aring, Aring ] }; key { [ acute, grave ] }; key { [ diaeresis, asciicircum ], Index: programs/xkbcomp/symbols/macintosh_vndr/us =================================================================== RCS file: /home/eich/cvs/xc/programs/xkbcomp/symbols/macintosh/us,v retrieving revision 1.1.1.12 diff -u -r1.1.1.12 us --- programs/xkbcomp/symbols/macintosh_vndr/us 2 Dec 2003 18:46:35 -0000 1.1.1.12 +++ programs/xkbcomp/symbols/macintosh_vndr/us 21 Oct 2004 10:14:44 -0000 @@ -22,12 +22,16 @@ key { [ 0, parenright ] }; key { [ minus, underscore ] }; key { [ equal, plus ] }; - key { [ BackSpace ] }; + key { + type="CTRL+ALT", + symbols[Group1]= [ BackSpace, Terminate_Server ] + }; key { [ Tab, ISO_Left_Tab ] }; key { [ q, Q ] }; key { [ w, W ] }; - key { [ e, E ] }; + key { [ e, E ], + [ EuroSign ] }; key { [ r, R ] }; key { [ t, T ] }; key { [ y, Y ] }; @@ -68,21 +72,64 @@ // End alphanumeric section // 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 ] }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F1, XF86_Switch_VT_1 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F2, XF86_Switch_VT_2 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F3, XF86_Switch_VT_3 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F4, XF86_Switch_VT_4 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F5, XF86_Switch_VT_5 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F6, XF86_Switch_VT_6 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F7, XF86_Switch_VT_7 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F8, XF86_Switch_VT_8 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F9, XF86_Switch_VT_9 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F10, XF86_Switch_VT_10 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F11, XF86_Switch_VT_11 ] + }; + key { + type="CTRL+ALT", + symbols[Group1]= [ F12, XF86_Switch_VT_12 ] + }; + key { [ F13 ] }; + key { + type="PC_SYSRQ", + symbols[Group1]= [ Print, Sys_Req ] + }; + key { [ Scroll_Lock ] }; + key { + type="PC_BREAK", + symbols[Group1]= [ Pause, Break ] + }; // End "Function" section // Begin "Editing" section @@ -100,20 +147,37 @@ // End "Editing" section // Begin "Keypad" section + key { [ XF86AudioLowerVolume ] }; + key { [ XF86AudioRaiseVolume ] }; + key { [ XF86AudioMute ] }; + key { [ XF86Eject ] }; + key { [ Num_Lock, Pointer_EnableKeys ] }; key { [ equal ] }; - key { [ KP_Divide ] }; - key { [ KP_Multiply ] }; + key { + type="CTRL+ALT", + symbols[Group1]=[ KP_Divide, XF86_Ungrab ] + }; + key { + type="CTRL+ALT", + symbols[Group1]=[ KP_Multiply, XF86_ClearGrab ] + }; key { [ KP_7, KP_Home ] }; key { [ KP_8, KP_Up ] }; key { [ KP_9, KP_Prior ] }; - key { [ KP_Subtract ] }; + key { + type="CTRL+ALT", + symbols[Group1]=[ KP_Subtract, XF86_Prev_VMode ] + }; key { [ KP_4, KP_Left ] }; key { [ KP_5, KP_Begin ] }; key { [ KP_6, KP_Right ] }; - key { [ KP_Add ] }; + key { + type="CTRL+ALT", + symbols[Group1]=[ KP_Add, XF86_Next_VMode ] + }; key { [ KP_1, KP_End ] }; key { [ KP_2, KP_Down ] }; @@ -129,10 +193,10 @@ 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 ] }; + key { [ Mode_switch, Multi_key ] }; + key { [ Mode_switch, Multi_key ] }; + key { [ Alt_L ] }; + key { [ Alt_R ] }; // End "Modifier" section // begin modifier mappings @@ -148,57 +212,5 @@ include "compose(rwin)" include "apple(extended)" -// *** FIXME -// key { [ quoteleft, asciitilde ] }; -// key { [ 1, exclam ], -// [exclamdown, slash ] }; -// key { [ 2, at ], -// [ trademark, eth ] }; -// key { [ 3, numbersign ], -// [ sterling ] }; -// key { [ 4, dollar ], -// [ cent ] }; -// key { [ 5, percent ], -// [ infinity ] }; -// key { [ 6, asciicircum ], -// [ section ] }; -// key { [ 7, ampersand ], -// [ paragraph ] }; -// key { [ 8, asterisk ], -// [periodcentered ] }; -// key { [ 9, parenleft ], -// [ordfeminine ] }; -// key { [ equal, plus ], -// [ notequal, plusminus ] }; -// key { [ q, Q ], -// [ oe, OE ] }; -// key { [ r, R ], -// [registered ] }; -// key { [ t, T ], -// [ dagger ] }; -// key { [ backslash, bar ], -// [guillemotleft,guillemotright ] }; -// key { [ a, A ], -// [ aring, Aring ] }; -// key { [ s, S ], -// [ ssharp, Iacute ] }; -// key { [ d, D ], -// eth, Icircumflex ] }; -// key { [ f, F ], -// [ Idiaeresis ] }; -// key { [ g, G ], -// [ copyright ] }; -// key { [ l, L ], -// [ notsign, Ograve ] }; -// key { [ quoteright, quotedbl ], -// [ ae, AE ] }; -// key { [ c, C ], -// [ ccedilla, Ccedilla ] }; -// key { [ n, N ], -// [asciitilde ] }; -// key { [ m, M ], -// [ mu, Acircumflex ] }; -// key { [ Mode_switch, Multi_key ] }; -// modifier_map Mod3 { Mode_switch }; }; --- /dev/null Tue Apr 9 15:46:34 2002 +++ programs/xkbcomp/symbols/macintosh_vndr/dvorak Sun Aug 17 11:41:33 2003 @@ -0,0 +1,7 @@ + +partial default alphanumeric_keys +xkb_symbols "basic" { + + include "dvorak(basic)" + name[Group1]= "Dvorak"; +}; --- programs/xkbcomp/symbols/macintosh_vndr/Makefile.am.orig 2004-10-24 22:26:30.593548997 +0200 +++ programs/xkbcomp/symbols/macintosh_vndr/Makefile.am 2004-10-24 22:26:40.160871410 +0200 @@ -1,5 +1,5 @@ dist_symbols_DATA = \ -apple ch de dk \ +apple ch de dk dvorak \ es fi fr \ gb it \ nl no pt \ --- programs/xkbcomp/symbols/macintosh_vndr/pt.orig 2004-10-24 22:50:40.148333056 +0200 +++ programs/xkbcomp/symbols/macintosh_vndr/pt 2004-10-24 22:51:46.002782010 +0200 @@ -34,6 +34,8 @@ key { [ ccedilla, Ccedilla ] }; key { [ dead_tilde, dead_circumflex ] }; key { [ backslash, bar ] }; + key { [ e, E ], + [ EuroSign ] }; key { [ masculine, ordfeminine ] }; key { [ dead_acute, dead_grave ] }; // End alphanumeric section @@ -41,21 +43,6 @@ }; partial alphanumeric_keys -xkb_symbols "Sundeadkeys" { - include "macintosh_vndr/pt(basic)" // for consistent naming - - 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 --- programs/xkbcomp/rules/base.m_k.part.orig 2005-07-28 16:10:18.008054713 +0200 +++ programs/xkbcomp/rules/base.m_k.part 2005-07-28 16:11:59.755341278 +0200 @@ -1,5 +1,5 @@ - macintosh_old = macintosh - powerpcps2 = powerpcps2 + macintosh_old = macintosh(macintosh_raw_adb) + $mac = macintosh // uses linux_key_codes pc98 = xfree98(pc98) abnt2 = xfree86(abnt2) jp106 = xfree86(jp106)