Blob Blame History Raw
Kill off the I211 key in evdev, as it conflicts with I211 and makes
xkbcomp generate warnings.

I decided to let AB11 outlive I211 because it was more widely
used in the symbols files.

Index: keycodes/evdev
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/keycodes/evdev,v
retrieving revision 1.10
diff -u -p -r1.10 evdev
--- keycodes/evdev	14 Nov 2007 21:40:51 -0000	1.10
+++ keycodes/evdev	22 Dec 2007 06:11:42 -0000
@@ -235,7 +235,7 @@ default xkb_keycodes "evdev" {
 	<I208> = 208;	// #define KEY_PLAYCD              200
 	<I209> = 209;	// #define KEY_PAUSECD             201
 	<I210> = 210;	// #define KEY_PROG3               202
-	<I211> = 211;	// #define KEY_PROG4               203
+	//<I211> = 211;	// #define KEY_PROG4               203 conflicts with AB11
 	<I213> = 213;	// #define KEY_SUSPEND             205
 	<I214> = 214;	// #define KEY_CLOSE               206
 	<I215> = 215;	// #define KEY_PLAY                207
Index: symbols/inet
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/inet,v
retrieving revision 1.76
diff -u -p -r1.76 inet
--- symbols/inet	10 Dec 2007 22:42:07 -0000	1.76
+++ symbols/inet	22 Dec 2007 06:11:43 -0000
@@ -126,7 +126,7 @@ xkb_symbols "evdev" {
     key <I208>   {      [ XF86AudioPlay         ]       };
     key <I209>   {      [ XF86AudioPause        ]       };
     key <I210>   {      [ XF86Launch3           ]       };
-    key <I211>   {      [ XF86Launch4           ]       };
+    key <AB11>   {      [ XF86Launch4           ]       };
     key <I213>   {      [ XF86Standby           ]       };
     key <I214>   {      [ XF86Close             ]       };
     key <I215>   {      [ XF86AudioPlay         ]       };