macbook pro stuff

3 files changed, 138 insertions, 210 deletions

diff --git a/keycodes/evdev b/keycodes/evdev
index b5d1f507..9eed3d9d 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -72,7 +72,8 @@ default xkb_keycodes "evdev" {
 	// Microsoft keyboard extra keys
 	<LWIN> = 133;
 	<RWIN> = 134;
-	<MENU> = 135;
+	<COMP> = 135;
+	alias <MENU> = <COMP>;
 
 	<ESC> = 9;
 	<FK01> = 67;
@@ -127,229 +128,146 @@ default xkb_keycodes "evdev" {
 
 	<KP0> = 90;
 	<KPDL> = 91;
-	// <KPEQ> = 126;
+	<KPEQ> = 125;
 
 	<FK13> = 191;
 	<FK14> = 192;
 	<FK15> = 193;
 	<FK16> = 194;
 	<FK17> = 195;
-	// <KPDC> = 123;
+	<FK18> = 196;
+	<FK19> = 197;
+	<FK20> = 198;
+	<FK21> = 199;
+	<FK22> = 200;
+	<FK23> = 201;
+	<FK24> = 202;
 
 	// Keys that are generated on Japanese keyboards
 
-	// alias <HZTG> = <TLDE>;	// Hankaku_Zenkaku toggle
-	// <HZTG> =  85;               // Hankaku/Zenkakau toggle
-	// <HKTG> =  93;		// Hiragana/Katakana toggle
-	// <AB11> = 211;		// backslash/underscore
-	// <XFER> =  92;		// Henkan
-	// <NFER> =  94;		// Muhenkan
-	// <AE13> = 124;		// Yen
+	<HZTG> =  93;	// Hankaku/Zenkakau toggle
+	<HKTG> = 101;	// Hiragana/Katakana toggle
+	<AB11> = 211;	// backslash/underscore
+	<HENK> = 100;	// Henkan
+	<MUHE> = 102;	// Muhenkan
+	<AE13> = 132;	// Yen
+	<KATA> =  98;	// Katakana
+	<HIRA> =  99;	// Hiragana
+	<JPCM> = 103;	// KPJPComma
 
 	// Keys that are generated on Korean keyboards
 
-	// alias <HNGL> = <FK16>;     // Hangul Latin toggle
-	// alias <HJCV> = <FK17>;     // Hangul to Hanja conversion
-	<HNGL> = 130;
-	<HJCV> = 131;
-
-	// Extended keys that may be generated on "Internet" keyboards.
-	// These are not standardised, hence the meaningless names.
-	// The entries commented out are never generated because the raw codes
-	// in those positions are already used for well-defined keys.
-
-	// evdev does standardize names for these though.  comment them
-	// all out for now.
-
-	// alias <I01> = <XFER>;
-	// <I02> =   130;
-	// alias <I03> = <NFER>;
-	// <I04> =   132;
-	// alias <I05> = <AE13>;
-	// <I06> =   134;
-	// <I07> =   135;
-	// <I08> =   136;
-	// <I09> =   137;
-	// <I0A> =   138;
-	// <I0B> =   139;
-	// <I0C> =   140;
-	// <I0D> =   141;
-	// <I0E> =   142;
-	// <I0F> =   143;
-	// <I10> =   144;
-	// <I11> =   145;
-	// <I12> =   146;
-	// <I13> =   147;
-	// <I14> =   148;
-	// <I15> =   149;
-	// <I16> =   150;
-	// <I17> =   151;
-	// <I18> =   152;
-	// <I19> =   153;
-	// <I1A> =   154;
-	// <I1B> =   155;
-	// <I1C> =   156;	<META>
-	// <I1D> =   157;	<K59>
-	// <I1E> =   158;
-	// <I1F> =   159;
-	// <I20> =   160;
-	// <I21> =   161;
-	// <I22> =   162;
-	// <I23> =   163;
-	// <I24> =   164;
-	// <I25> =   165;
-	// <I26> =   166;
-	// <I27> =   167;
-	// <I28> =   168;
-	// <I29> =   169;
-	// <I2A> =   170;	<K5A>
-	// <I2B> =   171;
-	// <I2C> =   172;
-	// <I2D> =   173;
-	// <I2E> =   174;
-	// <I2F> =   175;
-	// <I30> =   176;
-	// <I31> =   177;
-	// <I32> =   178;
-	// <I33> =   179;
-	// <I34> =   180;
-	// <I35> =   181;	<K5B>
-	// <I36> =   182;	<K5D>
-	// <I37> =   183;	<K5E>
-	// <I38> =   184;	<K5F>
-	// <I39> =   185;
-	// <I3A> =   186;
-	// <I3B> =   187;
-	// <I3C> =   188;
-	// <I3D> =   189;	<K62>
-	// <I3E> =   190;	<K63>
-	// <I3F> =   191;	<K64>
-	// <I40> =   192;	<K65>
-	// <I41> =   193;	<K66>
-	// <I42> =   194;
-	// <I43> =   195;
-	// <I44> =   196;
-	// <I45> =   197;
-	// <I46> =   198;	<K67>
-	// <I47> =   199;	<K68>
-	// <I48> =   200;	<K69>
-	// <I49> =   201;	<K6A>
-	// <I4A> =   202;
-	// <I4B> =   203;	<K6B>
-	// <I4C> =   204;	<K6C>
-	// <I4D> =   205;	<K6D>
-	// <I4E> =   206;	<K6E>
-	// <I4F> =   207;	<K6F>
-	// <I50> =   208;	<K70>
-	// <I51> =   209;	<K71>
-	// <I52> =   210;	<K72>
-	// <I53> =   211;	<K73>
-	// <I54> =   212;
-	// <I55> =   213;
-	// <I56> =   214;
-	// <I57> =   215;
-	// <I58> =   216;
-	// <I59> =   217;
-	// <I5A> =   218;
-	// <I5B> =   219;	<K74>
-	// <I5C> =   220;	<K75>
-	// <I5D> =   221;	<K76>
-	// <I5E> =   222;
-	// <I5F> =   223;
-	// <I60> =   224;
-	// <I61> =   225;
-	// <I62> =   226;
-	// <I63> =   227;
-	// <I64> =   228;
-	// <I65> =   229;
-	// <I66> =   230;
-	// <I67> =   231;
-	// <I68> =   232;
-	// <I69> =   233;
-	// <I6A> =   234;
-	// <I6B> =   235;
-	// <I6C> =   236;
-	// <I6D> =   237;
-	// <I6E> =   238;
-	// <I6F> =   239;
-	// <I70> =   240;
-	// <I71> =   241;
-	// <I72> =   242;
-	// <I73> =   243;
-	// <I74> =   244;
-	// <I75> =   245;
-	// <I76> =   246;
-	// <I77> =   247;
-	// <I78> =   248;
-	// <I79> =   249;
-	// <I7A> =   250;
-	// <I7B> =   251;
-	// <I7C> =   252;
-	// <I7D> =   253;
-	// <I7E> =   254;
-	// <I7F> =   255;
-
-	// Codes generated for scancodes 0x59-0x5f, 0x62-0x76
-	// <K59> =   157;		// <I1D>
-	// <K5A> =   170;		// <I2A>
-	// <K5B> =   181;		// <I35>
-	// alias <K5C> = <KPEQ>;
-	// <K5D> =   182;		// <I36>
-	// <K5E> =   183;		// <I37>
-	// <K5F> =   184;		// <I38>
-	// <K62> =   189;		// <I3D>
-	// <K63> =   190;		// <I3E>
-	// <K64> =   191;		// <I3F>
-	// <K65> =   192;		// <I40>
-	// <K66> =   193;		// <I41>
-	// <K67> =   198;		// <I46>
-	// <K68> =   199;		// <I47>
-	// <K69> =   200;		// <I48>
-	// <K6A> =   201;		// <I49>
-	// <K6B> =   203;		// <I4B>
-	// <K6C> =   204;		// <I4C>
-	// <K6D> =   205;		// <I4D>
-	// <K6E> =   206;		// <I4E>
-	// <K6F> =   207;		// <I4F>
-	// alias <K70> = <HKTG>;	// <I50>
-	// <K71> =   209;		// <I51>
-	// <K72> =   210;		// <I52>
-	// alias <K73> = <AB11>;	// <I53>
-	// <K74> =   219;		// <I5B>
-	// <K75> =   220;		// <I5C>
-	// <K76> =   221;		// <I5D>
+	<HNGL> = 130;	// Hangul Latin toggle
+	<HJCV> = 131;	// Hangul to Hanja conversion
 
 	// Solaris compatibility
 
-	// alias <LMTA> = <LWIN>;
-	// alias <RMTA> = <RWIN>;
-	// alias <COMP> = <MENU>;
-	// alias <POWR> = <I0C>;
-	// alias <MUTE> = <I0D>;
-	// alias <VOL-> = <I0E>;
-	// alias <VOL+> = <I0F>;
-	// alias <HELP> = <I10>;
-	// alias <STOP> = <I11>;
-	// alias <AGAI> = <I12>;
-	// alias <PROP> = <I13>;
-	// alias <UNDO> = <I14>;
-	// alias <FRNT> = <I15>;
-	// alias <COPY> = <I16>;
-	// alias <OPEN> = <I17>;
-	// alias <PAST> = <I18>;
-	// alias <FIND> = <I19>;
-	// alias <CUT>  = <I1A>;
+	alias <LMTA> = <LWIN>;
+	alias <RMTA> = <RWIN>;
+	<MUTE> = 121;
+	<VOL-> = 122;
+	<VOL+> = 123;
+	<POWR> = 124;
+	<STOP> = 136;
+	<AGAI> = 137;
+	<PROP> = 138;
+	<UNDO> = 139;
+	<FRNT> = 140;
+	<COPY> = 141;
+	<OPEN> = 142;
+	<PAST> = 143;
+	<FIND> = 144;
+	<CUT>  = 145;
+	<HELP> = 146;
+
+	// Extended keys that may be generated on "Internet" keyboards.
+	// evdev has standardize names for these.
 
-	// Other codes never generated.  The XFree86 ddx never generates
-	// these codes.
-	// Thus we can use them as fake keys
-	// <MDSW> =    93; // <U5D>
-	// <LVL3> =   124; // <U7C>
-	// <ALT>  =   125; // <U7D>
-	// <META> =   156; // <I1C>
-	// <SUPR> =   127; // <U7F>
-	// <HYPR> =   128; // <U80>
-	<LSGT> = 94;
+	<RO> = 97;	// #define KEY_RO                  89
+	<LNFD> = 109;	// #define KEY_LINEFEED            101
+	<I120> = 120;	// #define KEY_MACRO               112
+	<I126> = 126;	// #define KEY_KPPLUSMINUS         118
+	<I129> = 129;	// #define KEY_KPCOMMA             121
+	<I147> = 147;	// #define KEY_MENU                139
+	<I148> = 148;	// #define KEY_CALC                140
+	<I149> = 149;	// #define KEY_SETUP               141
+	<I150> = 150;	// #define KEY_SLEEP               142
+	<I151> = 151;	// #define KEY_WAKEUP              143
+	<I152> = 152;	// #define KEY_FILE                144
+	<I153> = 153;	// #define KEY_SENDFILE            145
+	<I154> = 154;	// #define KEY_DELETEFILE          146
+	<I155> = 155;	// #define KEY_XFER                147
+	<I156> = 156;	// #define KEY_PROG1               148
+	<I157> = 157;	// #define KEY_PROG2               149
+	<I158> = 158;	// #define KEY_WWW                 150
+	<I159> = 159;	// #define KEY_MSDOS               151
+	<I160> = 160;	// #define KEY_COFFEE              152
+	<I161> = 161;	// #define KEY_DIRECTION           153
+	<I162> = 162;	// #define KEY_CYCLEWINDOWS        154
+	<I163> = 163;	// #define KEY_MAIL                155
+	<I164> = 164;	// #define KEY_BOOKMARKS           156
+	<I165> = 165;	// #define KEY_COMPUTER            157
+	<I166> = 166;	// #define KEY_BACK                158
+	<I167> = 167;	// #define KEY_FORWARD             159
+	<I168> = 168;	// #define KEY_CLOSECD             160
+	<I169> = 169;	// #define KEY_EJECTCD             161
+	<I170> = 170;	// #define KEY_EJECTCLOSECD        162
+	<I171> = 171;	// #define KEY_NEXTSONG            163
+	<I172> = 172;	// #define KEY_PLAYPAUSE           164
+	<I173> = 173;	// #define KEY_PREVIOUSSONG        165
+	<I174> = 174;	// #define KEY_STOPCD              166
+	<I175> = 175;	// #define KEY_RECORD              167
+	<I176> = 176;	// #define KEY_REWIND              168
+	<I177> = 177;	// #define KEY_PHONE               169
+	<I178> = 178;	// #define KEY_ISO                 170
+	<I179> = 179;	// #define KEY_CONFIG              171
+	<I180> = 180;	// #define KEY_HOMEPAGE            172
+	<I181> = 181;	// #define KEY_REFRESH             173
+	<I182> = 182;	// #define KEY_EXIT                174
+	<I183> = 183;	// #define KEY_MOVE                175
+	<I184> = 184;	// #define KEY_EDIT                176
+	<I185> = 185;	// #define KEY_SCROLLUP            177
+	<I186> = 186;	// #define KEY_SCROLLDOWN          178
+	<I187> = 187;	// #define KEY_KPLEFTPAREN         179
+	<I188> = 188;	// #define KEY_KPRIGHTPAREN        180
+	<I189> = 189;	// #define KEY_NEW                 181
+	<I190> = 190;	// #define KEY_REDO                182
+	<I208> = 208;	// #define KEY_PLAYCD              200
+	<I209> = 209;	// #define KEY_PAUSECD             201
+	<I210> = 210;	// #define KEY_PROG3               202
+	<I211> = 211;	// #define KEY_PROG4               203
+	<I213> = 213;	// #define KEY_SUSPEND             205
+	<I214> = 214;	// #define KEY_CLOSE               206
+	<I215> = 215;	// #define KEY_PLAY                207
+	<I216> = 216;	// #define KEY_FASTFORWARD         208
+	<I217> = 217;	// #define KEY_BASSBOOST           209
+	<I218> = 218;	// #define KEY_PRINT               210
+	<I219> = 219;	// #define KEY_HP                  211
+	<I220> = 220;	// #define KEY_CAMERA              212
+	<I221> = 221;	// #define KEY_SOUND               213
+	<I222> = 222;	// #define KEY_QUESTION            214
+	<I223> = 223;	// #define KEY_EMAIL               215
+	<I224> = 224;	// #define KEY_CHAT                216
+	<I225> = 225;	// #define KEY_SEARCH              217
+	<I226> = 226;	// #define KEY_CONNECT             218
+	<I227> = 227;	// #define KEY_FINANCE             219
+	<I228> = 228;	// #define KEY_SPORT               220
+	<I229> = 229;	// #define KEY_SHOP                221
+	<I230> = 230;	// #define KEY_ALTERASE            222
+	<I231> = 231;	// #define KEY_CANCEL              223
+	<I232> = 232;	// #define KEY_BRIGHTNESSDOWN      224
+	<I233> = 233;	// #define KEY_BRIGHTNESSUP        225
+	<I234> = 234;	// #define KEY_MEDIA               226
+	<I235> = 235;	// #define KEY_SWITCHVIDEOMODE     227
+	<I236> = 236;	// #define KEY_KBDILLUMTOGGLE      228
+	<I237> = 237;	// #define KEY_KBDILLUMDOWN        229
+	<I238> = 238;	// #define KEY_KBDILLUMUP          230
+	<I239> = 239;	// #define KEY_SEND                231
+	<I240> = 240;	// #define KEY_REPLY               232
+	<I241> = 241;	// #define KEY_FORWARDMAIL         233
+	<I242> = 242;	// #define KEY_SAVE                234
+	<I243> = 243;	// #define KEY_DOCUMENTS           235
+	<I244> = 244;	// #define KEY_BATTERY             236
 
 	indicator 1 = "Caps Lock";
 	indicator 2 = "Num Lock";
diff --git a/keycodes/macintosh b/keycodes/macintosh
index adc502b4..184740ef 100644
--- a/keycodes/macintosh
+++ b/keycodes/macintosh
@@ -37,6 +37,15 @@ default xkb_keycodes "macintosh" {
    <KPEQ> = 157;
    
 };
+
+xkb_keycodes "macbook" {
+    include "macintosh"
+
+// MacBook keyboards switch TLDE and LSGT keycodes
+    <TLDE> =  94;
+    <LSGT> =  49;
+};
+
 xkb_keycodes "old" {
 
     minimum= 8;
diff --git a/keycodes/xfree86 b/keycodes/xfree86
index b82f379d..f2d7d6b1 100644
--- a/keycodes/xfree86
+++ b/keycodes/xfree86
@@ -295,6 +295,9 @@ xkb_keycodes "basic" {
     <I7E> =   254;
     <I7F> =   255;
 
+    // MacBooks generate 0x65 for the lower brightness key
+    <II65> =  101;
+
     // Codes generated for scancodes 0x59-0x5f, 0x62-0x76
     <K59> =   157;		// <I1D>
     <K5A> =   170;		// <I2A>
@@ -411,5 +414,3 @@ xkb_keycodes "abnt2" {
     <AC13> = 94;
     <KPPT> = 134;
 };
-
-