Thu Jul 30 14:32:52 2020 UTC ()
Remove now unused ModMap data for each keyboard.


(tsutsui)
diff -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h
diff -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c
cvs diff -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h (expand / switch to unified diff)

--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h 2020/07/29 17:29:53 1.3
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h 2020/07/30 14:32:52 1.4
@@ -294,30 +294,28 @@ typedef struct { @@ -294,30 +294,28 @@ typedef struct {
294 294
295/* sunInit.c */ 295/* sunInit.c */
296extern Bool sunAutoRepeatHandlersInstalled; 296extern Bool sunAutoRepeatHandlersInstalled;
297extern sunFbDataRec sunFbData[]; 297extern sunFbDataRec sunFbData[];
298extern fbFd sunFbs[]; 298extern fbFd sunFbs[];
299extern Bool sunSwapLkeys; 299extern Bool sunSwapLkeys;
300extern Bool sunFlipPixels; 300extern Bool sunFlipPixels;
301extern Bool sunFbInfo; 301extern Bool sunFbInfo;
302extern Bool sunCG4Frob; 302extern Bool sunCG4Frob;
303extern Bool sunNoGX; 303extern Bool sunNoGX;
304 304
305/* sunKeyMap.c */ 305/* sunKeyMap.c */
306extern KeySymsRec sunKeySyms[]; 306extern KeySymsRec sunKeySyms[];
307extern const SunModmapRec *sunModMaps[]; 
308extern const int sunMaxLayout; 307extern const int sunMaxLayout;
309extern KeySym *sunType4KeyMaps[]; 308extern KeySym *sunType4KeyMaps[];
310extern const SunModmapRec *sunType4ModMaps[]; 
311 309
312/* sunKbd.c */ 310/* sunKbd.c */
313extern long sunAutoRepeatInitiate; 311extern long sunAutoRepeatInitiate;
314extern long sunAutoRepeatDelay; 312extern long sunAutoRepeatDelay;
315extern DeviceIntPtr sunKeyboardDevice; 313extern DeviceIntPtr sunKeyboardDevice;
316 314
317/* sunMouse.c */ 315/* sunMouse.c */
318extern Bool sunActiveZaphod; 316extern Bool sunActiveZaphod;
319extern DeviceIntPtr sunPointerDevice; 317extern DeviceIntPtr sunPointerDevice;
320extern miPointerScreenFuncRec sunPointerScreenFuncs; 318extern miPointerScreenFuncRec sunPointerScreenFuncs;
321 319
322/* sunFbs.c */ 320/* sunFbs.c */
323extern int sunScreenIndex; 321extern int sunScreenIndex;
cvs diff -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c (expand / switch to unified diff)

--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c 2020/07/24 02:20:20 1.2
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c 2020/07/30 14:32:52 1.3
@@ -500,27 +500,26 @@ OsVendorInit(void) @@ -500,27 +500,26 @@ OsVendorInit(void)
500 FatalError ("Cannot open /dev/kbd, error %d\n", errno); 500 FatalError ("Cannot open /dev/kbd, error %d\n", errno);
501 sunPtrPriv.fd = open ("/dev/mouse", O_RDWR, 0); 501 sunPtrPriv.fd = open ("/dev/mouse", O_RDWR, 0);
502 if (sunPtrPriv.fd < 0) 502 if (sunPtrPriv.fd < 0)
503 FatalError ("Cannot open /dev/mouse, error %d\n", errno); 503 FatalError ("Cannot open /dev/mouse, error %d\n", errno);
504 getKbdType (); 504 getKbdType ();
505 if (sunKbdPriv.type == KB_SUN4) { 505 if (sunKbdPriv.type == KB_SUN4) {
506 (void) ioctl (sunKbdPriv.fd, KIOCLAYOUT, &sunKbdPriv.layout); 506 (void) ioctl (sunKbdPriv.fd, KIOCLAYOUT, &sunKbdPriv.layout);
507 if (sunKbdPriv.layout < 0 || 507 if (sunKbdPriv.layout < 0 ||
508 sunKbdPriv.layout > sunMaxLayout || 508 sunKbdPriv.layout > sunMaxLayout ||
509 sunType4KeyMaps[sunKbdPriv.layout] == NULL) 509 sunType4KeyMaps[sunKbdPriv.layout] == NULL)
510 FatalError ("Unsupported keyboard type 4 layout %d\n", 510 FatalError ("Unsupported keyboard type 4 layout %d\n",
511 sunKbdPriv.layout); 511 sunKbdPriv.layout);
512 sunKeySyms[KB_SUN4].map = sunType4KeyMaps[sunKbdPriv.layout]; 512 sunKeySyms[KB_SUN4].map = sunType4KeyMaps[sunKbdPriv.layout];
513 sunModMaps[KB_SUN4] = sunType4ModMaps[sunKbdPriv.layout]; 
514 } 513 }
515 inited = 1; 514 inited = 1;
516 } 515 }
517} 516}
518 517
519void 518void
520OsVendorFatalError(const char *f, va_list arg) 519OsVendorFatalError(const char *f, va_list arg)
521{ 520{
522} 521}
523 522
524#ifdef GLXEXT 523#ifdef GLXEXT
525void 524void
526GlxExtensionInit(void) 525GlxExtensionInit(void)
cvs diff -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c (expand / switch to unified diff)

--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c 2020/07/30 14:15:49 1.2
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c 2020/07/30 14:32:52 1.3
@@ -233,39 +233,29 @@ static KeySym US2Keymap[] = { @@ -233,39 +233,29 @@ static KeySym US2Keymap[] = {
233 NoSymbol, NoSymbol, /* 0x75 */ 233 NoSymbol, NoSymbol, /* 0x75 */
234 NoSymbol, NoSymbol, /* 0x76 */ 234 NoSymbol, NoSymbol, /* 0x76 */
235 NoSymbol, NoSymbol, /* 0x77 */ 235 NoSymbol, NoSymbol, /* 0x77 */
236 XK_Meta_L, NoSymbol, /* 0x78 */ 236 XK_Meta_L, NoSymbol, /* 0x78 */
237 XK_space, NoSymbol, /* 0x79 */ 237 XK_space, NoSymbol, /* 0x79 */
238 XK_Meta_R, NoSymbol, /* 0x7a */ 238 XK_Meta_R, NoSymbol, /* 0x7a */
239 NoSymbol, NoSymbol, /* 0x7b */ 239 NoSymbol, NoSymbol, /* 0x7b */
240 NoSymbol, NoSymbol, /* 0x7c */ 240 NoSymbol, NoSymbol, /* 0x7c */
241 NoSymbol, NoSymbol, /* 0x7d */ 241 NoSymbol, NoSymbol, /* 0x7d */
242 NoSymbol, NoSymbol, /* 0x7e */ 242 NoSymbol, NoSymbol, /* 0x7e */
243 NoSymbol, NoSymbol, /* 0x7f */ 243 NoSymbol, NoSymbol, /* 0x7f */
244}; 244};
245 245
246static const SunModmapRec US2Modmap[] = { 
247 { 99, ShiftMask }, 
248 { 110, ShiftMask }, 
249 { 76, ControlMask }, 
250 { 120, Meta_Mask }, 
251 { 122, Meta_Mask }, 
252 { 0, 0 } 
253}; 
254 
255#else 246#else
256 247
257#define US2Keymap NULL 248#define US2Keymap NULL
258#define US2Modmap NULL 
259 249
260#endif /* US2 */ 250#endif /* US2 */
261 251
262#ifdef US3 252#ifdef US3
263 253
264static KeySym US3Keymap[] = { 254static KeySym US3Keymap[] = {
265 XK_L1, NoSymbol, /* 0x1 */ 255 XK_L1, NoSymbol, /* 0x1 */
266 NoSymbol, NoSymbol, /* 0x2 */ 256 NoSymbol, NoSymbol, /* 0x2 */
267 XK_L2, NoSymbol, /* 0x3 */ 257 XK_L2, NoSymbol, /* 0x3 */
268 NoSymbol, NoSymbol, /* 0x4 */ 258 NoSymbol, NoSymbol, /* 0x4 */
269 XK_F1, NoSymbol, /* 0x5 */ 259 XK_F1, NoSymbol, /* 0x5 */
270 XK_F2, NoSymbol, /* 0x6 */ 260 XK_F2, NoSymbol, /* 0x6 */
271 NoSymbol, NoSymbol, /* 0x7 */ 261 NoSymbol, NoSymbol, /* 0x7 */
@@ -381,124 +371,41 @@ static KeySym US3Keymap[] = { @@ -381,124 +371,41 @@ static KeySym US3Keymap[] = {
381 NoSymbol, NoSymbol, /* 0x75 */ 371 NoSymbol, NoSymbol, /* 0x75 */
382 NoSymbol, NoSymbol, /* 0x76 */ 372 NoSymbol, NoSymbol, /* 0x76 */
383 XK_Caps_Lock, NoSymbol, /* 0x77 */ 373 XK_Caps_Lock, NoSymbol, /* 0x77 */
384 XK_Meta_L, NoSymbol, /* 0x78 */ 374 XK_Meta_L, NoSymbol, /* 0x78 */
385 XK_space, NoSymbol, /* 0x79 */ 375 XK_space, NoSymbol, /* 0x79 */
386 XK_Meta_R, NoSymbol, /* 0x7a */ 376 XK_Meta_R, NoSymbol, /* 0x7a */
387 NoSymbol, NoSymbol, /* 0x7b */ 377 NoSymbol, NoSymbol, /* 0x7b */
388 NoSymbol, NoSymbol, /* 0x7c */ 378 NoSymbol, NoSymbol, /* 0x7c */
389 NoSymbol, NoSymbol, /* 0x7d */ 379 NoSymbol, NoSymbol, /* 0x7d */
390 NoSymbol, NoSymbol, /* 0x7e */ 380 NoSymbol, NoSymbol, /* 0x7e */
391 NoSymbol, NoSymbol, /* 0x7f */ 381 NoSymbol, NoSymbol, /* 0x7f */
392}; 382};
393 383
394static const SunModmapRec US3Modmap[] = { 
395 { 99, ShiftMask }, 
396 { 110, ShiftMask }, 
397 { 76, ControlMask }, 
398 { 119, LockMask }, 
399 { 120, Meta_Mask }, 
400 { 122, Meta_Mask }, 
401 { 0, 0 } 
402}; 
403 
404#else 384#else
405 385
406#define US3Keymap NULL 386#define US3Keymap NULL
407#define US3Modmap NULL 
408 387
409#endif /* US3 */ 388#endif /* US3 */
410 389
411KeySymsRec sunKeySyms[] = { 390KeySymsRec sunKeySyms[] = {
412 /* map minKeyCode maxKC width */ 391 /* map minKeyCode maxKC width */
413 { NULL, 0, 0, 0 }, 392 { NULL, 0, 0, 0 },
414 { NULL, 0, 0, 0 }, 393 { NULL, 0, 0, 0 },
415 { US2Keymap, 1, 0x7a, 2 }, 394 { US2Keymap, 1, 0x7a, 2 },
416 { US3Keymap, 1, 0x7a, 2 }, 395 { US3Keymap, 1, 0x7a, 2 },
417 { NULL, 1, 0x7d, 4 } 396 { NULL, 1, 0x7d, 4 }
418}; 397};
419 398
420const SunModmapRec *sunModMaps[] = { 
421 NULL, 
422 NULL, 
423 US2Modmap, 
424 US3Modmap, 
425 NULL 
426}; 
427 
428static const SunModmapRec Generic5Modmap[] = { 
429 { 99, ShiftMask }, 
430 { 110, ShiftMask }, 
431 { 119, LockMask }, 
432 { 76, ControlMask }, 
433 { 120, Meta_Mask }, 
434 { 122, Meta_Mask }, 
435 { 13, Mode_switch_Mask }, 
436 { 98, Num_Lock_Mask }, 
437 { 19, Alt_Mask }, 
438 { 0, 0} 
439}; 
440 
441#if defined(DEN4) || defined(SWEDFIN4) || defined(SWFR4) || defined(SWGE4) 
442 
443static const SunModmapRec DenSwedFinSw4Modmap[] = { 
444 { 99, ShiftMask }, 
445 { 110, ShiftMask }, 
446 { 76, LockMask }, 
447 { 119, ControlMask }, 
448 { 120, Meta_Mask }, 
449 { 122, Meta_Mask }, 
450 { 67, Mode_switch_Mask }, 
451 { 98, Num_Lock_Mask }, 
452 { 19, Alt_Mask }, 
453 { 0, 0 } 
454}; 
455 
456#endif 
457 
458#if defined(FRBE4) || defined(NETH4) 
459 
460static const SunModmapRec FrBeNeth4Modmap[] = { 
461 { 99, ShiftMask }, 
462 { 110, ShiftMask }, 
463 { 13, LockMask }, 
464 { 76, ControlMask }, 
465 { 120, Meta_Mask }, 
466 { 122, Meta_Mask }, 
467 { 119, Mode_switch_Mask }, 
468 { 98, Num_Lock_Mask }, 
469 { 19, Alt_Mask }, 
470 { 0, 0 } 
471}; 
472 
473#endif 
474 
475#if defined(ITALY4) || defined(NORW4) || defined(PORT4) || defined(SPAINLATAM4) 
476 
477static const SunModmapRec ItNorPortSp4Modmap[] = { 
478 { 99, ShiftMask }, 
479 { 110, ShiftMask }, 
480 { 76, LockMask }, 
481 { 119, ControlMask }, 
482 { 120, Meta_Mask }, 
483 { 122, Meta_Mask }, 
484 { 13, Mode_switch_Mask }, 
485 { 98, Num_Lock_Mask }, 
486 { 19, Alt_Mask }, 
487 { 0, 0 } 
488}; 
489 
490#endif 
491 
492#ifdef CAN4 399#ifdef CAN4
493 400
494static KeySym Canada4Keymap[] = { 401static KeySym Canada4Keymap[] = {
495 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 402 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
496 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 403 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
497 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 404 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
498 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 405 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
499 XK_Escape, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 406 XK_Escape, NoSymbol, NoSymbol, NoSymbol, /* 5*/
500 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 407 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 6*/
501 XK_F9, NoSymbol, NoSymbol, NoSymbol, /* 7*/ 408 XK_F9, NoSymbol, NoSymbol, NoSymbol, /* 7*/
502 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 8*/ 409 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 8*/
503 XK_F10, NoSymbol, NoSymbol, NoSymbol, /* 9*/ 410 XK_F10, NoSymbol, NoSymbol, NoSymbol, /* 9*/
504 XK_F3, NoSymbol, NoSymbol, NoSymbol, /* 10*/ 411 XK_F3, NoSymbol, NoSymbol, NoSymbol, /* 10*/
@@ -609,43 +516,29 @@ static KeySym Canada4Keymap[] = { @@ -609,43 +516,29 @@ static KeySym Canada4Keymap[] = {
609 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 516 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
610 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 517 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
611 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 518 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
612 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 519 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
613 SunXK_AltGraph, NoSymbol, NoSymbol, NoSymbol, /*119*/ 520 SunXK_AltGraph, NoSymbol, NoSymbol, NoSymbol, /*119*/
614 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 521 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
615 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 522 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
616 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 523 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
617 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 524 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
618 XK_Ugrave, NoSymbol, XK_backslash, NoSymbol, /*124*/ 525 XK_Ugrave, NoSymbol, XK_backslash, NoSymbol, /*124*/
619 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 526 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
620}; 527};
621 528
622static const SunModmapRec Canada4Modmap[] = { 
623 { 99, ShiftMask }, 
624 { 110, ShiftMask }, 
625 { 76, LockMask }, 
626 { 13, ControlMask }, 
627 { 120, Meta_Mask }, 
628 { 122, Meta_Mask }, 
629 { 119, Mode_switch_Mask }, 
630 { 98, Num_Lock_Mask }, 
631 { 19, Alt_Mask }, 
632 { 0, 0} 
633}; 
634 
635#else 529#else
636 530
637#define Canada4Keymap NULL 531#define Canada4Keymap NULL
638#define Canada4Modmap NULL 
639 532
640#endif /* CANADA4 */ 533#endif /* CANADA4 */
641 534
642#ifdef CANFR5 535#ifdef CANFR5
643 536
644static KeySym CanadaFr5Keymap[] = { 537static KeySym CanadaFr5Keymap[] = {
645 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 538 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
646 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 539 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
647 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 540 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
648 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 541 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
649 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 542 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
650 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 543 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
651 XK_F10, NoSymbol, NoSymbol, NoSymbol, /* 7*/ 544 XK_F10, NoSymbol, NoSymbol, NoSymbol, /* 7*/
@@ -759,32 +652,29 @@ static KeySym CanadaFr5Keymap[] = { @@ -759,32 +652,29 @@ static KeySym CanadaFr5Keymap[] = {
759 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 652 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
760 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 653 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
761 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 654 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
762 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 655 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
763 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 656 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
764 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 657 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
765 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 658 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
766 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 659 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
767 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 660 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
768 XK_Uacute, NoSymbol, NoSymbol, NoSymbol, /*124*/ 661 XK_Uacute, NoSymbol, NoSymbol, NoSymbol, /*124*/
769 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 662 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
770}; 663};
771 664
772#define CanadaFr5Modmap Generic5Modmap 
773 
774#else 665#else
775 666
776#define CanadaFr5Keymap NULL 667#define CanadaFr5Keymap NULL
777#define CanadaFr5Modmap NULL 
778 668
779#endif /* CANFR5 */ 669#endif /* CANFR5 */
780 670
781 671
782#ifdef DEN4 672#ifdef DEN4
783 673
784static KeySym Denmark4Keymap[] = { 674static KeySym Denmark4Keymap[] = {
785 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 675 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
786 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 676 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
787 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 677 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
788 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 678 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
789 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 679 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
790 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 680 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -899,32 +789,29 @@ static KeySym Denmark4Keymap[] = { @@ -899,32 +789,29 @@ static KeySym Denmark4Keymap[] = {
899 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 789 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
900 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 790 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
901 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 791 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
902 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 792 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
903 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/ 793 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/
904 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 794 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
905 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 795 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
906 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 796 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
907 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 797 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
908 XK_less, XK_greater, XK_backslash, NoSymbol, /*124*/ 798 XK_less, XK_greater, XK_backslash, NoSymbol, /*124*/
909 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 799 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
910}; 800};
911 801
912#define Denmark4Modmap DenSwedFinSw4Modmap 
913 
914#else 802#else
915 803
916#define Denmark4Keymap NULL 804#define Denmark4Keymap NULL
917#define Denmark4Modmap NULL 
918 805
919#endif /* DENMARK4 */ 806#endif /* DENMARK4 */
920 807
921 808
922#ifdef DEN5 809#ifdef DEN5
923 810
924static KeySym Denmark5Keymap[] = { 811static KeySym Denmark5Keymap[] = {
925 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 812 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
926 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 813 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
927 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 814 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
928 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 815 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
929 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 816 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
930 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 817 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -1039,32 +926,29 @@ static KeySym Denmark5Keymap[] = { @@ -1039,32 +926,29 @@ static KeySym Denmark5Keymap[] = {
1039 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 926 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
1040 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 927 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
1041 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 928 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
1042 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 929 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
1043 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 930 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
1044 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 931 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
1045 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 932 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
1046 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 933 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
1047 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 934 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
1048 XK_less, XK_greater, XK_backslash, NoSymbol, /*124*/ 935 XK_less, XK_greater, XK_backslash, NoSymbol, /*124*/
1049 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 936 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
1050}; 937};
1051 938
1052#define Denmark5Modmap Generic5Modmap 
1053 
1054#else 939#else
1055 940
1056#define Denmark5Keymap NULL 941#define Denmark5Keymap NULL
1057#define Denmark5Modmap NULL 
1058 942
1059#endif /* DEN5 */ 943#endif /* DEN5 */
1060 944
1061 945
1062#ifdef FR5 946#ifdef FR5
1063 947
1064static KeySym France5Keymap[] = { 948static KeySym France5Keymap[] = {
1065 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 949 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
1066 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 950 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
1067 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 951 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
1068 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 952 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
1069 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 953 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
1070 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 954 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -1179,32 +1063,29 @@ static KeySym France5Keymap[] = { @@ -1179,32 +1063,29 @@ static KeySym France5Keymap[] = {
1179 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 1063 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
1180 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 1064 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
1181 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 1065 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
1182 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 1066 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
1183 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 1067 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
1184 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 1068 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
1185 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 1069 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
1186 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 1070 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
1187 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 1071 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
1188 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 1072 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
1189 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 1073 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
1190}; 1074};
1191 1075
1192#define France5Modmap Generic5Modmap 
1193 
1194#else 1076#else
1195 1077
1196#define France5Keymap NULL 1078#define France5Keymap NULL
1197#define France5Modmap NULL 
1198 1079
1199#endif /* FRANCE5 */ 1080#endif /* FRANCE5 */
1200 1081
1201 1082
1202#ifdef FRBE4 1083#ifdef FRBE4
1203 1084
1204static KeySym FranceBelg4Keymap[] = { 1085static KeySym FranceBelg4Keymap[] = {
1205 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 1086 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
1206 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 1087 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
1207 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 1088 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
1208 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 1089 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
1209 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 1090 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
1210 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 1091 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -1319,32 +1200,29 @@ static KeySym FranceBelg4Keymap[] = { @@ -1319,32 +1200,29 @@ static KeySym FranceBelg4Keymap[] = {
1319 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 1200 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
1320 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 1201 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
1321 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 1202 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
1322 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 1203 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
1323 SunXK_AltGraph, NoSymbol, NoSymbol, NoSymbol, /*119*/ 1204 SunXK_AltGraph, NoSymbol, NoSymbol, NoSymbol, /*119*/
1324 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 1205 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
1325 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 1206 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
1326 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 1207 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
1327 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 1208 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
1328 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 1209 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
1329 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/ 1210 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/
1330}; 1211};
1331 1212
1332#define FranceBelg4Modmap FrBeNeth4Modmap 
1333 
1334#else 1213#else
1335 1214
1336#define FranceBelg4Keymap NULL 1215#define FranceBelg4Keymap NULL
1337#define FranceBelg4Modmap NULL 
1338 1216
1339#endif /* FRANCEBELG4 */ 1217#endif /* FRANCEBELG4 */
1340 1218
1341 1219
1342#ifdef GER4 1220#ifdef GER4
1343 1221
1344static KeySym Germany4Keymap[] = { 1222static KeySym Germany4Keymap[] = {
1345 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 1223 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
1346 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 1224 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
1347 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 1225 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
1348 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 1226 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
1349 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 1227 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
1350 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 1228 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -1459,43 +1337,29 @@ static KeySym Germany4Keymap[] = { @@ -1459,43 +1337,29 @@ static KeySym Germany4Keymap[] = {
1459 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 1337 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
1460 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 1338 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
1461 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 1339 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
1462 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 1340 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
1463 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/ 1341 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/
1464 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 1342 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
1465 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 1343 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
1466 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 1344 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
1467 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 1345 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
1468 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 1346 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
1469 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 1347 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
1470}; 1348};
1471 1349
1472static const SunModmapRec Germany4Modmap[] = { 
1473 { 99, ShiftMask }, 
1474 { 110, ShiftMask }, 
1475 { 76, LockMask }, 
1476 { 119, ControlMask }, 
1477 { 120, Meta_Mask }, 
1478 { 122, Meta_Mask }, 
1479 { 19, Mode_switch_Mask }, 
1480 { 98, Num_Lock_Mask }, 
1481 { 13, Alt_Mask }, 
1482 { 0, 0 } 
1483}; 
1484 
1485#else 1350#else
1486 1351
1487#define Germany4Keymap NULL 1352#define Germany4Keymap NULL
1488#define Germany4Modmap NULL 
1489 1353
1490#endif /* GERMANY4 */ 1354#endif /* GERMANY4 */
1491 1355
1492 1356
1493#ifdef GER5 1357#ifdef GER5
1494 1358
1495static KeySym Germany5Keymap[] = { 1359static KeySym Germany5Keymap[] = {
1496 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 1360 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
1497 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 1361 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
1498 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 1362 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
1499 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 1363 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
1500 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 1364 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
1501 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 1365 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -1610,32 +1474,29 @@ static KeySym Germany5Keymap[] = { @@ -1610,32 +1474,29 @@ static KeySym Germany5Keymap[] = {
1610 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 1474 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
1611 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 1475 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
1612 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 1476 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
1613 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 1477 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
1614 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 1478 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
1615 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 1479 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
1616 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 1480 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
1617 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 1481 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
1618 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 1482 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
1619 XK_less, XK_greater, XK_bar, NoSymbol, /*124*/ 1483 XK_less, XK_greater, XK_bar, NoSymbol, /*124*/
1620 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/ 1484 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/
1621}; 1485};
1622 1486
1623#define Germany5Modmap Generic5Modmap 
1624 
1625#else 1487#else
1626 1488
1627#define Germany5Keymap NULL 1489#define Germany5Keymap NULL
1628#define Germany5Modmap NULL 
1629 1490
1630#endif /* GERMANY5 */ 1491#endif /* GERMANY5 */
1631 1492
1632 1493
1633#ifdef ITALY4 1494#ifdef ITALY4
1634 1495
1635static KeySym Italy4Keymap[] = { 1496static KeySym Italy4Keymap[] = {
1636 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 1497 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
1637 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 1498 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
1638 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 1499 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
1639 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 1500 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
1640 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 1501 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
1641 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 1502 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -1750,32 +1611,29 @@ static KeySym Italy4Keymap[] = { @@ -1750,32 +1611,29 @@ static KeySym Italy4Keymap[] = {
1750 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 1611 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
1751 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 1612 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
1752 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 1613 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
1753 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 1614 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
1754 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/ 1615 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/
1755 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 1616 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
1756 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 1617 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
1757 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 1618 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
1758 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 1619 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
1759 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 1620 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
1760 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 1621 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
1761}; 1622};
1762 1623
1763#define Italy4Modmap ItNorPortSp4Modmap 
1764 
1765#else 1624#else
1766 1625
1767#define Italy4Keymap NULL 1626#define Italy4Keymap NULL
1768#define Italy4Modmap NULL 
1769 1627
1770#endif /* ITALY4 */ 1628#endif /* ITALY4 */
1771 1629
1772 1630
1773#ifdef ITALY5 1631#ifdef ITALY5
1774 1632
1775static KeySym Italy5Keymap[] = { 1633static KeySym Italy5Keymap[] = {
1776 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 1634 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
1777 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 1635 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
1778 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 1636 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
1779 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 1637 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
1780 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 1638 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
1781 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 1639 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -1890,32 +1748,29 @@ static KeySym Italy5Keymap[] = { @@ -1890,32 +1748,29 @@ static KeySym Italy5Keymap[] = {
1890 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 1748 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
1891 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 1749 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
1892 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 1750 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
1893 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 1751 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
1894 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 1752 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
1895 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 1753 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
1896 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 1754 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
1897 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 1755 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
1898 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 1756 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
1899 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 1757 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
1900 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/ 1758 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/
1901}; 1759};
1902 1760
1903#define Italy5Modmap Generic5Modmap 
1904 
1905#else 1761#else
1906 1762
1907#define Italy5Keymap NULL 1763#define Italy5Keymap NULL
1908#define Italy5Modmap NULL 
1909 1764
1910#endif /* ITALY5 */ 1765#endif /* ITALY5 */
1911 1766
1912 1767
1913#ifdef JAPAN4 1768#ifdef JAPAN4
1914 1769
1915static KeySym Japan4Keymap[] = { 1770static KeySym Japan4Keymap[] = {
1916 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 1771 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
1917 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 1772 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
1918 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 1773 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
1919 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 1774 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
1920 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 1775 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
1921 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 1776 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -2030,32 +1885,29 @@ static KeySym Japan4Keymap[] = { @@ -2030,32 +1885,29 @@ static KeySym Japan4Keymap[] = {
2030 XK_Execute, NoSymbol, NoSymbol, NoSymbol, /*115*/ 1885 XK_Execute, NoSymbol, NoSymbol, NoSymbol, /*115*/
2031 XK_Kanji, NoSymbol, NoSymbol, NoSymbol, /*116*/ 1886 XK_Kanji, NoSymbol, NoSymbol, NoSymbol, /*116*/
2032 XK_Henkan_Mode, NoSymbol, NoSymbol, NoSymbol, /*117*/ 1887 XK_Henkan_Mode, NoSymbol, NoSymbol, NoSymbol, /*117*/
2033 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 1888 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
2034 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 1889 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
2035 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 1890 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
2036 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 1891 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
2037 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 1892 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
2038 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 1893 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
2039 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 1894 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
2040 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/ 1895 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/
2041}; 1896};
2042 1897
2043#define Japan4Modmap Generic5Modmap 
2044 
2045#else 1898#else
2046 1899
2047#define Japan4Keymap NULL 1900#define Japan4Keymap NULL
2048#define Japan4Modmap NULL 
2049 1901
2050#endif /* JAPAN4 */ 1902#endif /* JAPAN4 */
2051 1903
2052 1904
2053#ifdef JAPAN5 1905#ifdef JAPAN5
2054 1906
2055static KeySym Japan5Keymap[] = { 1907static KeySym Japan5Keymap[] = {
2056 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 1908 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
2057 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 1909 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
2058 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 1910 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
2059 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 1911 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
2060 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 1912 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
2061 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 1913 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -2170,32 +2022,29 @@ static KeySym Japan5Keymap[] = { @@ -2170,32 +2022,29 @@ static KeySym Japan5Keymap[] = {
2170 XK_Execute, NoSymbol, NoSymbol, NoSymbol, /*115*/ 2022 XK_Execute, NoSymbol, NoSymbol, NoSymbol, /*115*/
2171 XK_Kanji, NoSymbol, NoSymbol, NoSymbol, /*116*/ 2023 XK_Kanji, NoSymbol, NoSymbol, NoSymbol, /*116*/
2172 XK_Henkan_Mode, NoSymbol, NoSymbol, NoSymbol, /*117*/ 2024 XK_Henkan_Mode, NoSymbol, NoSymbol, NoSymbol, /*117*/
2173 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 2025 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
2174 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 2026 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
2175 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 2027 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
2176 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 2028 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
2177 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 2029 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
2178 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 2030 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
2179 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 2031 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
2180 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/ 2032 XK_KP_Add, XK_KP_Add, NoSymbol, NoSymbol, /*125*/
2181}; 2033};
2182 2034
2183#define Japan5Modmap Generic5Modmap 
2184 
2185#else 2035#else
2186 2036
2187#define Japan5Keymap NULL 2037#define Japan5Keymap NULL
2188#define Japan5Modmap NULL 
2189 2038
2190#endif /* JAPAN5 */ 2039#endif /* JAPAN5 */
2191 2040
2192 2041
2193#ifdef KOREA4 2042#ifdef KOREA4
2194 2043
2195static KeySym Korea4Keymap[] = { 2044static KeySym Korea4Keymap[] = {
2196 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 2045 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
2197 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 2046 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
2198 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 2047 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
2199 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 2048 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
2200 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 2049 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
2201 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 2050 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -2310,43 +2159,29 @@ static KeySym Korea4Keymap[] = { @@ -2310,43 +2159,29 @@ static KeySym Korea4Keymap[] = {
2310 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 2159 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
2311 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 2160 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
2312 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 2161 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
2313 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 2162 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
2314 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 2163 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
2315 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 2164 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
2316 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 2165 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
2317 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 2166 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
2318 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 2167 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
2319 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 2168 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
2320 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 2169 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
2321}; 2170};
2322 2171
2323static const SunModmapRec Korea4Modmap[] = { 
2324 { 99, ShiftMask }, 
2325 { 110, ShiftMask }, 
2326 { 119, LockMask }, 
2327 { 76, ControlMask }, 
2328 { 120, Meta_Mask }, 
2329 { 122, Meta_Mask }, 
2330 { 111, Mode_switch_Mask }, 
2331 { 98, Num_Lock_Mask }, 
2332 { 19, Alt_Mask }, 
2333 { 0, 0 } 
2334}; 
2335 
2336#else 2172#else
2337 2173
2338#define Korea4Keymap NULL 2174#define Korea4Keymap NULL
2339#define Korea4Modmap NULL 
2340 2175
2341#endif /* KOREA4 */ 2176#endif /* KOREA4 */
2342 2177
2343 2178
2344#ifdef KOREA5 2179#ifdef KOREA5
2345 2180
2346static KeySym Korea5Keymap[] = { 2181static KeySym Korea5Keymap[] = {
2347 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 2182 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
2348 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 2183 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
2349 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 2184 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
2350 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 2185 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
2351 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 2186 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
2352 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 2187 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -2461,32 +2296,29 @@ static KeySym Korea5Keymap[] = { @@ -2461,32 +2296,29 @@ static KeySym Korea5Keymap[] = {
2461 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 2296 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
2462 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 2297 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
2463 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 2298 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
2464 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 2299 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
2465 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 2300 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
2466 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 2301 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
2467 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 2302 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
2468 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 2303 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
2469 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 2304 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
2470 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 2305 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
2471 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 2306 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
2472}; 2307};
2473 2308
2474#define Korea5Modmap Generic5Modmap 
2475 
2476#else 2309#else
2477 2310
2478#define Korea5Keymap NULL 2311#define Korea5Keymap NULL
2479#define Korea5Modmap NULL 
2480 2312
2481#endif /* KOREA5 */ 2313#endif /* KOREA5 */
2482 2314
2483 2315
2484#ifdef NETH4 2316#ifdef NETH4
2485 2317
2486static KeySym Netherland4Keymap[] = { 2318static KeySym Netherland4Keymap[] = {
2487 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 2319 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
2488 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 2320 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
2489 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 2321 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
2490 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 2322 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
2491 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 2323 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
2492 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 2324 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -2601,32 +2433,29 @@ static KeySym Netherland4Keymap[] = { @@ -2601,32 +2433,29 @@ static KeySym Netherland4Keymap[] = {
2601 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 2433 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
2602 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 2434 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
2603 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 2435 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
2604 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 2436 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
2605 SunXK_AltGraph, NoSymbol, NoSymbol, NoSymbol, /*119*/ 2437 SunXK_AltGraph, NoSymbol, NoSymbol, NoSymbol, /*119*/
2606 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 2438 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
2607 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 2439 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
2608 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 2440 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
2609 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 2441 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
2610 XK_bracketright,XK_bracketleft, NoSymbol, NoSymbol, /*124*/ 2442 XK_bracketright,XK_bracketleft, NoSymbol, NoSymbol, /*124*/
2611 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 2443 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
2612}; 2444};
2613 2445
2614#define Netherland4Modmap FrBeNeth4Modmap 
2615 
2616#else 2446#else
2617 2447
2618#define Netherland4Keymap NULL 2448#define Netherland4Keymap NULL
2619#define Netherland4Modmap NULL 
2620 2449
2621#endif /* NETHERLAND4 */ 2450#endif /* NETHERLAND4 */
2622 2451
2623 2452
2624#ifdef NETH5 2453#ifdef NETH5
2625 2454
2626static KeySym Netherland5Keymap[] = { 2455static KeySym Netherland5Keymap[] = {
2627 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 2456 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
2628 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 2457 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
2629 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 2458 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
2630 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 2459 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
2631 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 2460 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
2632 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 2461 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -2741,32 +2570,29 @@ static KeySym Netherland5Keymap[] = { @@ -2741,32 +2570,29 @@ static KeySym Netherland5Keymap[] = {
2741 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 2570 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
2742 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 2571 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
2743 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 2572 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
2744 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 2573 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
2745 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 2574 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
2746 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 2575 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
2747 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 2576 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
2748 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 2577 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
2749 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 2578 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
2750 XK_bracketright,XK_bracketleft, XK_brokenbar, NoSymbol, /*124*/ 2579 XK_bracketright,XK_bracketleft, XK_brokenbar, NoSymbol, /*124*/
2751 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 2580 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
2752}; 2581};
2753 2582
2754#define Netherland5Modmap Generic5Modmap 
2755 
2756#else 2583#else
2757 2584
2758#define Netherland5Keymap NULL 2585#define Netherland5Keymap NULL
2759#define Netherland5Modmap NULL 
2760 2586
2761#endif /* NETHERLAND5 */ 2587#endif /* NETHERLAND5 */
2762 2588
2763 2589
2764#ifdef NORW4 2590#ifdef NORW4
2765 2591
2766static KeySym Norway4Keymap[] = { 2592static KeySym Norway4Keymap[] = {
2767 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 2593 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
2768 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 2594 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
2769 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 2595 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
2770 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 2596 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
2771 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 2597 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
2772 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 2598 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -2881,32 +2707,29 @@ static KeySym Norway4Keymap[] = { @@ -2881,32 +2707,29 @@ static KeySym Norway4Keymap[] = {
2881 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 2707 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
2882 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 2708 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
2883 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 2709 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
2884 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 2710 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
2885 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/ 2711 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/
2886 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 2712 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
2887 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 2713 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
2888 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 2714 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
2889 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 2715 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
2890 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 2716 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
2891 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 2717 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
2892}; 2718};
2893 2719
2894#define Norway4Modmap ItNorPortSp4Modmap 
2895 
2896#else 2720#else
2897 2721
2898#define Norway4Keymap NULL 2722#define Norway4Keymap NULL
2899#define Norway4Modmap NULL 
2900 2723
2901#endif /* NORWAY4 */ 2724#endif /* NORWAY4 */
2902 2725
2903 2726
2904#ifdef NORW5 2727#ifdef NORW5
2905 2728
2906static KeySym Norway5Keymap[] = { 2729static KeySym Norway5Keymap[] = {
2907 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 2730 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
2908 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 2731 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
2909 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 2732 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
2910 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 2733 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
2911 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 2734 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
2912 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 2735 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -3021,32 +2844,29 @@ static KeySym Norway5Keymap[] = { @@ -3021,32 +2844,29 @@ static KeySym Norway5Keymap[] = {
3021 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 2844 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
3022 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 2845 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
3023 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 2846 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
3024 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 2847 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
3025 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 2848 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
3026 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 2849 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
3027 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 2850 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
3028 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 2851 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
3029 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 2852 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
3030 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 2853 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
3031 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 2854 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
3032}; 2855};
3033 2856
3034#define Norway5Modmap Generic5Modmap 
3035 
3036#else 2857#else
3037 2858
3038#define Norway5Keymap NULL 2859#define Norway5Keymap NULL
3039#define Norway5Modmap NULL 
3040 2860
3041#endif /* NORWAY5 */ 2861#endif /* NORWAY5 */
3042 2862
3043 2863
3044#ifdef PORT4 2864#ifdef PORT4
3045 2865
3046static KeySym Portugal4Keymap[] = { 2866static KeySym Portugal4Keymap[] = {
3047 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 2867 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
3048 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 2868 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
3049 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 2869 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
3050 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 2870 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
3051 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 2871 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
3052 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 2872 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -3161,32 +2981,29 @@ static KeySym Portugal4Keymap[] = { @@ -3161,32 +2981,29 @@ static KeySym Portugal4Keymap[] = {
3161 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 2981 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
3162 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 2982 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
3163 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 2983 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
3164 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 2984 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
3165 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/ 2985 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/
3166 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 2986 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
3167 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 2987 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
3168 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 2988 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
3169 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 2989 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
3170 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 2990 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
3171 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 2991 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
3172}; 2992};
3173 2993
3174#define Portugal4Modmap ItNorPortSp4Modmap 
3175 
3176#else 2994#else
3177 2995
3178#define Portugal4Keymap NULL 2996#define Portugal4Keymap NULL
3179#define Portugal4Modmap NULL 
3180 2997
3181#endif /* PORTUGAL4 */ 2998#endif /* PORTUGAL4 */
3182 2999
3183 3000
3184#ifdef PORT5 3001#ifdef PORT5
3185 3002
3186static KeySym Portugal5Keymap[] = { 3003static KeySym Portugal5Keymap[] = {
3187 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 3004 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
3188 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 3005 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
3189 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 3006 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
3190 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 3007 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
3191 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 3008 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
3192 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 3009 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -3301,32 +3118,29 @@ static KeySym Portugal5Keymap[] = { @@ -3301,32 +3118,29 @@ static KeySym Portugal5Keymap[] = {
3301 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 3118 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
3302 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 3119 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
3303 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 3120 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
3304 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 3121 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
3305 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 3122 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
3306 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 3123 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
3307 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 3124 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
3308 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 3125 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
3309 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 3126 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
3310 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 3127 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
3311 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 3128 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
3312}; 3129};
3313 3130
3314#define Portugal5Modmap Generic5Modmap 
3315 
3316#else 3131#else
3317 3132
3318#define Portugal5Keymap NULL 3133#define Portugal5Keymap NULL
3319#define Portugal5Modmap NULL 
3320 3134
3321#endif /* PORTUGAL5 */ 3135#endif /* PORTUGAL5 */
3322 3136
3323 3137
3324#ifdef SPAIN5 3138#ifdef SPAIN5
3325 3139
3326static KeySym Spain5Keymap[] = { 3140static KeySym Spain5Keymap[] = {
3327 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 3141 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
3328 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 3142 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
3329 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 3143 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
3330 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 3144 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
3331 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 3145 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
3332 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 3146 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -3441,32 +3255,29 @@ static KeySym Spain5Keymap[] = { @@ -3441,32 +3255,29 @@ static KeySym Spain5Keymap[] = {
3441 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 3255 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
3442 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 3256 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
3443 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 3257 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
3444 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 3258 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
3445 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 3259 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
3446 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 3260 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
3447 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 3261 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
3448 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 3262 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
3449 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 3263 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
3450 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 3264 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
3451 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 3265 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
3452}; 3266};
3453 3267
3454#define Spain5Modmap Generic5Modmap 
3455 
3456#else 3268#else
3457 3269
3458#define Spain5Keymap NULL 3270#define Spain5Keymap NULL
3459#define Spain5Modmap NULL 
3460 3271
3461#endif /* SPAIN5 */ 3272#endif /* SPAIN5 */
3462 3273
3463 3274
3464#ifdef SPAINLATAM4 3275#ifdef SPAINLATAM4
3465 3276
3466static KeySym SpainLatAm4Keymap[] = { 3277static KeySym SpainLatAm4Keymap[] = {
3467 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 3278 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
3468 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 3279 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
3469 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 3280 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
3470 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 3281 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
3471 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 3282 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
3472 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 3283 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -3581,32 +3392,29 @@ static KeySym SpainLatAm4Keymap[] = { @@ -3581,32 +3392,29 @@ static KeySym SpainLatAm4Keymap[] = {
3581 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 3392 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
3582 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 3393 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
3583 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 3394 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
3584 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 3395 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
3585 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/ 3396 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/
3586 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 3397 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
3587 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 3398 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
3588 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 3399 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
3589 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 3400 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
3590 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/ 3401 XK_less, XK_greater, NoSymbol, NoSymbol, /*124*/
3591 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 3402 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
3592}; 3403};
3593 3404
3594#define SpainLatAm4Modmap ItNorPortSp4Modmap 
3595 
3596#else 3405#else
3597 3406
3598#define SpainLatAm4Keymap NULL 3407#define SpainLatAm4Keymap NULL
3599#define SpainLatAm4Modmap NULL 
3600 3408
3601#endif /* SPAINLATAM4 */ 3409#endif /* SPAINLATAM4 */
3602 3410
3603 3411
3604#ifdef SWED5 3412#ifdef SWED5
3605 3413
3606static KeySym Sweden5Keymap[] = { 3414static KeySym Sweden5Keymap[] = {
3607 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 3415 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
3608 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 3416 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
3609 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 3417 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
3610 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 3418 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
3611 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 3419 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
3612 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 3420 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -3721,32 +3529,29 @@ static KeySym Sweden5Keymap[] = { @@ -3721,32 +3529,29 @@ static KeySym Sweden5Keymap[] = {
3721 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 3529 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
3722 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 3530 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
3723 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 3531 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
3724 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 3532 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
3725 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 3533 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
3726 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 3534 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
3727 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 3535 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
3728 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 3536 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
3729 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 3537 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
3730 XK_less, XK_greater, XK_bar, NoSymbol, /*124*/ 3538 XK_less, XK_greater, XK_bar, NoSymbol, /*124*/
3731 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 3539 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
3732}; 3540};
3733 3541
3734#define Sweden5Modmap Generic5Modmap 
3735 
3736#else 3542#else
3737 3543
3738#define Sweden5Keymap NULL 3544#define Sweden5Keymap NULL
3739#define Sweden5Modmap NULL 
3740 3545
3741#endif /* SWEDEN5 */ 3546#endif /* SWEDEN5 */
3742 3547
3743 3548
3744#ifdef SWEDFIN4 3549#ifdef SWEDFIN4
3745 3550
3746static KeySym SwedenFin4Keymap[] = { 3551static KeySym SwedenFin4Keymap[] = {
3747 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 3552 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
3748 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 3553 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
3749 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 3554 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
3750 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 3555 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
3751 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 3556 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
3752 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 3557 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -3861,32 +3666,29 @@ static KeySym SwedenFin4Keymap[] = { @@ -3861,32 +3666,29 @@ static KeySym SwedenFin4Keymap[] = {
3861 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 3666 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
3862 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 3667 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
3863 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 3668 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
3864 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 3669 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
3865 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/ 3670 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/
3866 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 3671 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
3867 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 3672 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
3868 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 3673 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
3869 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 3674 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
3870 XK_less, XK_greater, XK_bar, NoSymbol, /*124*/ 3675 XK_less, XK_greater, XK_bar, NoSymbol, /*124*/
3871 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 3676 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
3872}; 3677};
3873 3678
3874#define SwedenFin4Modmap DenSwedFinSw4Modmap 
3875 
3876#else 3679#else
3877 3680
3878#define SwedenFin4Keymap NULL 3681#define SwedenFin4Keymap NULL
3879#define SwedenFin4Modmap NULL 
3880 3682
3881#endif /* SWEDENFIN4 */ 3683#endif /* SWEDENFIN4 */
3882 3684
3883 3685
3884#ifdef SWFR4 3686#ifdef SWFR4
3885 3687
3886static KeySym SwissFr4Keymap[] = { 3688static KeySym SwissFr4Keymap[] = {
3887 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 3689 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
3888 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 3690 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
3889 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 3691 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
3890 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 3692 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
3891 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 3693 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
3892 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 3694 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -4001,32 +3803,29 @@ static KeySym SwissFr4Keymap[] = { @@ -4001,32 +3803,29 @@ static KeySym SwissFr4Keymap[] = {
4001 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 3803 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
4002 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 3804 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
4003 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 3805 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
4004 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 3806 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
4005 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/ 3807 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/
4006 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 3808 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
4007 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 3809 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
4008 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 3810 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
4009 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 3811 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
4010 XK_bracketright,XK_bracketleft, NoSymbol, NoSymbol, /*124*/ 3812 XK_bracketright,XK_bracketleft, NoSymbol, NoSymbol, /*124*/
4011 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 3813 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
4012}; 3814};
4013 3815
4014#define SwissFr4Modmap DenSwedFinSw4Modmap 
4015 
4016#else 3816#else
4017 3817
4018#define SwissFr4Keymap NULL 3818#define SwissFr4Keymap NULL
4019#define SwissFr4Modmap NULL 
4020 3819
4021#endif /* SWFR4 */ 3820#endif /* SWFR4 */
4022 3821
4023 3822
4024#ifdef SWFR5 3823#ifdef SWFR5
4025 3824
4026static KeySym SwissFr5Keymap[] = { 3825static KeySym SwissFr5Keymap[] = {
4027 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 3826 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
4028 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 3827 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
4029 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 3828 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
4030 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 3829 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
4031 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 3830 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
4032 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 3831 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -4141,32 +3940,29 @@ static KeySym SwissFr5Keymap[] = { @@ -4141,32 +3940,29 @@ static KeySym SwissFr5Keymap[] = {
4141 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 3940 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
4142 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 3941 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
4143 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 3942 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
4144 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 3943 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
4145 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 3944 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
4146 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 3945 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
4147 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 3946 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
4148 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 3947 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
4149 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 3948 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
4150 XK_less, XK_greater, XK_backslash, NoSymbol, /*124*/ 3949 XK_less, XK_greater, XK_backslash, NoSymbol, /*124*/
4151 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 3950 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
4152}; 3951};
4153 3952
4154#define SwissFr5Modmap Generic5Modmap 
4155 
4156#else 3953#else
4157 3954
4158#define SwissFr5Keymap NULL 3955#define SwissFr5Keymap NULL
4159#define SwissFr5Modmap NULL 
4160 3956
4161#endif /* SWFR5 */ 3957#endif /* SWFR5 */
4162 3958
4163 3959
4164#ifdef SWGE4 3960#ifdef SWGE4
4165 3961
4166static KeySym SwissGe4Keymap[] = { 3962static KeySym SwissGe4Keymap[] = {
4167 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 3963 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
4168 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 3964 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
4169 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 3965 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
4170 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 3966 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
4171 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 3967 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
4172 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 3968 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -4281,32 +4077,29 @@ static KeySym SwissGe4Keymap[] = { @@ -4281,32 +4077,29 @@ static KeySym SwissGe4Keymap[] = {
4281 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 4077 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
4282 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 4078 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
4283 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 4079 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
4284 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 4080 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
4285 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/ 4081 XK_Control_L, NoSymbol, NoSymbol, NoSymbol, /*119*/
4286 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 4082 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
4287 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 4083 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
4288 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 4084 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
4289 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 4085 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
4290 XK_bracketright,XK_bracketleft, NoSymbol, NoSymbol, /*124*/ 4086 XK_bracketright,XK_bracketleft, NoSymbol, NoSymbol, /*124*/
4291 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 4087 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
4292}; 4088};
4293 4089
4294#define SwissGe4Modmap DenSwedFinSw4Modmap 
4295 
4296#else 4090#else
4297 4091
4298#define SwissGe4Keymap NULL 4092#define SwissGe4Keymap NULL
4299#define SwissGe4Modmap NULL 
4300 4093
4301#endif /* SWISSGE4 */ 4094#endif /* SWISSGE4 */
4302 4095
4303 4096
4304#ifdef SWGE5 4097#ifdef SWGE5
4305 4098
4306static KeySym SwissGe5Keymap[] = { 4099static KeySym SwissGe5Keymap[] = {
4307 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 4100 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
4308 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 4101 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
4309 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 4102 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
4310 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 4103 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
4311 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 4104 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
4312 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 4105 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -4421,32 +4214,29 @@ static KeySym SwissGe5Keymap[] = { @@ -4421,32 +4214,29 @@ static KeySym SwissGe5Keymap[] = {
4421 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 4214 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
4422 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 4215 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
4423 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 4216 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
4424 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 4217 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
4425 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 4218 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
4426 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 4219 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
4427 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 4220 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
4428 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 4221 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
4429 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 4222 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
4430 XK_less, XK_greater, XK_backslash, NoSymbol, /*124*/ 4223 XK_less, XK_greater, XK_backslash, NoSymbol, /*124*/
4431 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 4224 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
4432}; 4225};
4433 4226
4434#define SwissGe5Modmap Generic5Modmap 
4435 
4436#else 4227#else
4437 4228
4438#define SwissGe5Keymap NULL 4229#define SwissGe5Keymap NULL
4439#define SwissGe5Modmap NULL 
4440 4230
4441#endif /* SWITZER_GE5 */ 4231#endif /* SWITZER_GE5 */
4442 4232
4443 4233
4444#ifdef TAI4 4234#ifdef TAI4
4445 4235
4446static KeySym Taiwan4Keymap[] = { 4236static KeySym Taiwan4Keymap[] = {
4447 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 4237 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
4448 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 4238 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
4449 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 4239 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
4450 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 4240 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
4451 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 4241 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
4452 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 4242 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -4561,32 +4351,29 @@ static KeySym Taiwan4Keymap[] = { @@ -4561,32 +4351,29 @@ static KeySym Taiwan4Keymap[] = {
4561 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 4351 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
4562 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 4352 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
4563 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 4353 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
4564 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 4354 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
4565 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 4355 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
4566 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 4356 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
4567 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 4357 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
4568 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 4358 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
4569 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 4359 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
4570 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 4360 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
4571 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 4361 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
4572}; 4362};
4573 4363
4574#define Taiwan4Modmap Generic5Modmap 
4575 
4576#else 4364#else
4577 4365
4578#define Taiwan4Keymap NULL 4366#define Taiwan4Keymap NULL
4579#define Taiwan4Modmap NULL 
4580 4367
4581#endif /* TAIWAN4 */ 4368#endif /* TAIWAN4 */
4582 4369
4583 4370
4584#ifdef TAI5 4371#ifdef TAI5
4585 4372
4586static KeySym Taiwan5Keymap[] = { 4373static KeySym Taiwan5Keymap[] = {
4587 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 4374 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
4588 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 4375 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
4589 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 4376 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
4590 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 4377 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
4591 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 4378 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
4592 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 4379 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -4701,32 +4488,29 @@ static KeySym Taiwan5Keymap[] = { @@ -4701,32 +4488,29 @@ static KeySym Taiwan5Keymap[] = {
4701 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 4488 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
4702 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 4489 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
4703 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 4490 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
4704 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 4491 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
4705 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 4492 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
4706 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 4493 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
4707 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 4494 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
4708 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 4495 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
4709 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 4496 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
4710 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 4497 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
4711 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 4498 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
4712}; 4499};
4713 4500
4714#define Taiwan5Modmap Generic5Modmap 
4715 
4716#else 4501#else
4717 4502
4718#define Taiwan5Keymap NULL 4503#define Taiwan5Keymap NULL
4719#define Taiwan5Modmap NULL 
4720 4504
4721#endif /* TAIWAN5 */ 4505#endif /* TAIWAN5 */
4722 4506
4723 4507
4724#ifdef UK4 4508#ifdef UK4
4725 4509
4726static KeySym UK4Keymap[] = { 4510static KeySym UK4Keymap[] = {
4727 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 4511 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
4728 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 4512 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
4729 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 4513 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
4730 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 4514 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
4731 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 4515 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
4732 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 4516 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -4841,32 +4625,29 @@ static KeySym UK4Keymap[] = { @@ -4841,32 +4625,29 @@ static KeySym UK4Keymap[] = {
4841 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 4625 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
4842 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 4626 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
4843 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 4627 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
4844 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 4628 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
4845 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 4629 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
4846 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 4630 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
4847 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 4631 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
4848 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 4632 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
4849 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 4633 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
4850 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 4634 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
4851 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 4635 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
4852}; 4636};
4853 4637
4854#define UK4Modmap Generic5Modmap 
4855 
4856#else 4638#else
4857 4639
4858#define UK4Keymap NULL 4640#define UK4Keymap NULL
4859#define UK4Modmap NULL 
4860 4641
4861#endif /* UK4 */ 4642#endif /* UK4 */
4862 4643
4863 4644
4864#ifdef UK5 4645#ifdef UK5
4865 4646
4866static KeySym UK5Keymap[] = { 4647static KeySym UK5Keymap[] = {
4867 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 4648 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
4868 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 4649 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
4869 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 4650 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
4870 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 4651 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
4871 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 4652 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
4872 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 4653 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -4981,32 +4762,29 @@ static KeySym UK5Keymap[] = { @@ -4981,32 +4762,29 @@ static KeySym UK5Keymap[] = {
4981 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 4762 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
4982 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 4763 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
4983 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 4764 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
4984 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 4765 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
4985 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 4766 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
4986 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 4767 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
4987 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 4768 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
4988 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 4769 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
4989 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 4770 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
4990 XK_backslash, XK_bar, NoSymbol, NoSymbol, /*124*/ 4771 XK_backslash, XK_bar, NoSymbol, NoSymbol, /*124*/
4991 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 4772 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
4992}; 4773};
4993 4774
4994#define UK5Modmap Generic5Modmap 
4995 
4996#else 4775#else
4997 4776
4998#define UK5Keymap NULL 4777#define UK5Keymap NULL
4999#define UK5Modmap NULL 
5000 4778
5001#endif /* UK5 */ 4779#endif /* UK5 */
5002 4780
5003 4781
5004#ifdef US101A 4782#ifdef US101A
5005 4783
5006static KeySym US101AKeymap[] = { 4784static KeySym US101AKeymap[] = {
5007 XK_Pause, NoSymbol, XK_Break, NoSymbol, /* 1*/ 4785 XK_Pause, NoSymbol, XK_Break, NoSymbol, /* 1*/
5008 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 4786 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
5009 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 3*/ 4787 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 3*/
5010 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 4788 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
5011 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 4789 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
5012 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 4790 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -5121,41 +4899,29 @@ static KeySym US101AKeymap[] = { @@ -5121,41 +4899,29 @@ static KeySym US101AKeymap[] = {
5121 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 4899 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
5122 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 4900 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
5123 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 4901 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
5124 XK_Delete, NoSymbol, NoSymbol, NoSymbol, /*118*/ 4902 XK_Delete, NoSymbol, NoSymbol, NoSymbol, /*118*/
5125 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 4903 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
5126 XK_Alt_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 4904 XK_Alt_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
5127 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 4905 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
5128 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 4906 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
5129 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 4907 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
5130 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 4908 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
5131 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 4909 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
5132}; 4910};
5133 4911
5134static const SunModmapRec US101AModmap[] = { 
5135 { 99, ShiftMask }, 
5136 { 110, ShiftMask }, 
5137 { 119, LockMask }, 
5138 { 76, ControlMask }, 
5139 { 122, Meta_Mask }, 
5140 { 98, Num_Lock_Mask }, 
5141 { 120, Alt_Mask }, 
5142 { 0, 0 } 
5143}; 
5144 
5145#else 4912#else
5146 4913
5147#define US101AKeymap NULL 4914#define US101AKeymap NULL
5148#define US101AModmap NULL 
5149 4915
5150#endif /* US101A */ 4916#endif /* US101A */
5151 4917
5152 4918
5153#ifdef US4 4919#ifdef US4
5154 4920
5155static KeySym US4Keymap[] = { 4921static KeySym US4Keymap[] = {
5156 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 4922 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
5157 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/ 4923 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 2*/
5158 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 4924 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
5159 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/ 4925 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /* 4*/
5160 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 4926 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
5161 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 4927 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -5270,32 +5036,29 @@ static KeySym US4Keymap[] = { @@ -5270,32 +5036,29 @@ static KeySym US4Keymap[] = {
5270 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 5036 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
5271 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 5037 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
5272 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 5038 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
5273 XK_Help, XK_Help, NoSymbol, NoSymbol, /*118*/ 5039 XK_Help, XK_Help, NoSymbol, NoSymbol, /*118*/
5274 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 5040 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
5275 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 5041 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
5276 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 5042 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
5277 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 5043 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
5278 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/ 5044 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*123*/
5279 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 5045 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
5280 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 5046 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
5281}; 5047};
5282 5048
5283#define US4Modmap Generic5Modmap 
5284 
5285#else 5049#else
5286 5050
5287#define US4Keymap NULL 5051#define US4Keymap NULL
5288#define US4Modmap NULL 
5289 5052
5290#endif /* US4 */ 5053#endif /* US4 */
5291 5054
5292 5055
5293#ifdef US5 5056#ifdef US5
5294 5057
5295static KeySym US5Keymap[] = { 5058static KeySym US5Keymap[] = {
5296 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 5059 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
5297 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 5060 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
5298 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 5061 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
5299 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 5062 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
5300 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 5063 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
5301 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 5064 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
@@ -5410,32 +5173,29 @@ static KeySym US5Keymap[] = { @@ -5410,32 +5173,29 @@ static KeySym US5Keymap[] = {
5410 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 5173 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
5411 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 5174 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
5412 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 5175 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
5413 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 5176 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
5414 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 5177 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
5415 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 5178 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
5416 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 5179 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
5417 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 5180 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
5418 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 5181 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
5419 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 5182 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
5420 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 5183 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
5421}; 5184};
5422 5185
5423#define US5Modmap Generic5Modmap 
5424 
5425#else 5186#else
5426 5187
5427#define US5Keymap NULL 5188#define US5Keymap NULL
5428#define US5Modmap NULL 
5429 5189
5430#endif /* US5 */ 5190#endif /* US5 */
5431 5191
5432#ifdef US_UNIX5 5192#ifdef US_UNIX5
5433 5193
5434static KeySym US_UNIX5Keymap[] = { 5194static KeySym US_UNIX5Keymap[] = {
5435 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/ 5195 SunXK_Stop, NoSymbol, XK_L1, NoSymbol, /* 1*/
5436 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/ 5196 SunXK_AudioLowerVolume,SunXK_VideoLowerBrightness,NoSymbol, NoSymbol, /* 2*/
5437 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/ 5197 SunXK_Again, NoSymbol, XK_L2, NoSymbol, /* 3*/
5438 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/ 5198 SunXK_AudioRaiseVolume,SunXK_VideoRaiseBrightness,NoSymbol, NoSymbol, /* 4*/
5439 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/ 5199 XK_F1, NoSymbol, NoSymbol, NoSymbol, /* 5*/
5440 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/ 5200 XK_F2, NoSymbol, NoSymbol, NoSymbol, /* 6*/
5441 XK_F10, NoSymbol, NoSymbol, NoSymbol, /* 7*/ 5201 XK_F10, NoSymbol, NoSymbol, NoSymbol, /* 7*/
@@ -5549,32 +5309,29 @@ static KeySym US_UNIX5Keymap[] = { @@ -5549,32 +5309,29 @@ static KeySym US_UNIX5Keymap[] = {
5549 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/ 5309 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*115*/
5550 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/ 5310 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*116*/
5551 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/ 5311 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*117*/
5552 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/ 5312 XK_Help, NoSymbol, NoSymbol, NoSymbol, /*118*/
5553 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/ 5313 XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol, /*119*/
5554 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/ 5314 XK_Meta_L, NoSymbol, NoSymbol, NoSymbol, /*120*/
5555 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/ 5315 XK_space, NoSymbol, NoSymbol, NoSymbol, /*121*/
5556 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/ 5316 XK_Meta_R, NoSymbol, NoSymbol, NoSymbol, /*122*/
5557 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/ 5317 XK_Next, NoSymbol, NoSymbol, NoSymbol, /*123*/
5558 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/ 5318 NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*124*/
5559 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/ 5319 XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
5560}; 5320};
5561 5321
5562#define US_UNIX5Modmap Generic5Modmap 
5563 
5564#else 5322#else
5565 5323
5566#define US_UNIX5Keymap NULL 5324#define US_UNIX5Keymap NULL
5567#define US_UNIX5Modmap NULL 
5568 5325
5569#endif /* US_UNIX5 */ 5326#endif /* US_UNIX5 */
5570 5327
5571KeySym *sunType4KeyMaps[] = { 5328KeySym *sunType4KeyMaps[] = {
5572 US4Keymap, /* 0 */ 5329 US4Keymap, /* 0 */
5573 US4Keymap, /* 1 */ 5330 US4Keymap, /* 1 */
5574 FranceBelg4Keymap, /* 2 */ 5331 FranceBelg4Keymap, /* 2 */
5575 Canada4Keymap, /* 3 */ 5332 Canada4Keymap, /* 3 */
5576 Denmark4Keymap, /* 4 */ 5333 Denmark4Keymap, /* 4 */
5577 Germany4Keymap, /* 5 */ 5334 Germany4Keymap, /* 5 */
5578 Italy4Keymap, /* 6 */ 5335 Italy4Keymap, /* 6 */
5579 Netherland4Keymap, /* 7 */ 5336 Netherland4Keymap, /* 7 */
5580 Norway4Keymap, /* 8 */ 5337 Norway4Keymap, /* 8 */
@@ -5669,114 +5426,13 @@ KeySym *sunType4KeyMaps[] = { @@ -5669,114 +5426,13 @@ KeySym *sunType4KeyMaps[] = {
5669 Portugal5Keymap, /* 88 */ 5426 Portugal5Keymap, /* 88 */
5670 Spain5Keymap, /* 89 */ 5427 Spain5Keymap, /* 89 */
5671 Sweden5Keymap, /* 90 */ 5428 Sweden5Keymap, /* 90 */
5672 SwissFr5Keymap, /* 91 */ 5429 SwissFr5Keymap, /* 91 */
5673 SwissGe5Keymap, /* 92 */ 5430 SwissGe5Keymap, /* 92 */
5674 UK5Keymap, /* 93 */ 5431 UK5Keymap, /* 93 */
5675 Korea5Keymap, /* 94 */ 5432 Korea5Keymap, /* 94 */
5676 Taiwan5Keymap, /* 95 */ 5433 Taiwan5Keymap, /* 95 */
5677 Japan5Keymap, /* 96 */ 5434 Japan5Keymap, /* 96 */
5678 CanadaFr5Keymap, /* 97 */ 5435 CanadaFr5Keymap, /* 97 */
5679}; 5436};
5680 5437
5681const int sunMaxLayout = sizeof(sunType4KeyMaps) / sizeof(sunType4KeyMaps[0]); 5438const int sunMaxLayout = sizeof(sunType4KeyMaps) / sizeof(sunType4KeyMaps[0]);
5682 
5683const SunModmapRec *sunType4ModMaps[] = { 
5684 US4Modmap, /* 0 */ 
5685 US4Modmap, /* 1 */ 
5686 FranceBelg4Modmap, /* 2 */ 
5687 Canada4Modmap, /* 3 */ 
5688 Denmark4Modmap, /* 4 */ 
5689 Germany4Modmap, /* 5 */ 
5690 Italy4Modmap, /* 6 */ 
5691 Netherland4Modmap, /* 7 */ 
5692 Norway4Modmap, /* 8 */ 
5693 Portugal4Modmap, /* 9 */ 
5694 SpainLatAm4Modmap, /* 10 */ 
5695 SwedenFin4Modmap, /* 11 */ 
5696 SwissFr4Modmap, /* 12 */ 
5697 SwissGe4Modmap, /* 13 */ 
5698 UK4Modmap, /* 14 */ 
5699 NULL, /* 15 */ 
5700 Korea4Modmap, /* 16 */ 
5701 Taiwan4Modmap, /* 17 */ 
5702 NULL, /* 18 */ 
5703 US101AModmap, /* 19 */ 
5704 NULL, /* 20 */ 
5705 NULL, /* 21 */ 
5706 NULL, /* 22 */ 
5707 NULL, /* 23 */ 
5708 NULL, /* 24 */ 
5709 NULL, /* 25 */ 
5710 NULL, /* 26 */ 
5711 NULL, /* 27 */ 
5712 NULL, /* 28 */ 
5713 NULL, /* 29 */ 
5714 NULL, /* 30 */ 
5715 NULL, /* 31 */ 
5716 Japan4Modmap, /* 32 */ 
5717 US5Modmap, /* 33 */ 
5718 US_UNIX5Modmap, /* 34 */ 
5719 France5Modmap, /* 35 */ 
5720 Denmark5Modmap, /* 36 */ 
5721 Germany5Modmap, /* 37 */ 
5722 Italy5Modmap, /* 38 */ 
5723 Netherland5Modmap, /* 39 */ 
5724 Norway5Modmap, /* 40 */ 
5725 Portugal5Modmap, /* 41 */ 
5726 Spain5Modmap, /* 42 */ 
5727 Sweden5Modmap, /* 43 */ 
5728 SwissFr5Modmap, /* 44 */ 
5729 SwissGe5Modmap, /* 45 */ 
5730 UK5Modmap, /* 46 */ 
5731 Korea5Modmap, /* 47 */ 
5732 Taiwan5Modmap, /* 48 */ 
5733 Japan5Modmap, /* 49 */ 
5734 CanadaFr5Modmap, /* 50 */ 
5735 NULL, /* Hungary5 */ /* 51 */ 
5736 NULL, /* Poland5 */ /* 52 */ 
5737 NULL, /* Czech5 */ /* 53 */ 
5738 NULL, /* Russia5 */ /* 54 */ 
5739 NULL, /* 55 */ 
5740 NULL, /* 56 */ 
5741 NULL, /* 57 */ 
5742 NULL, /* 58 */ 
5743 NULL, /* 59 */ 
5744 NULL, /* 60 */ 
5745 NULL, /* 61 */ 
5746 NULL, /* 62 */ 
5747 NULL, /* CanadaFr5+ */ /* 63 */ 
5748 NULL, /* 64 */ 
5749 NULL, /* 65 */ 
5750 NULL, /* 66 */ 
5751 NULL, /* 67 */ 
5752 NULL, /* 68 */ 
5753 NULL, /* 69 */ 
5754 NULL, /* 70 */ 
5755 NULL, /* 71 */ 
5756 NULL, /* 72 */ 
5757 NULL, /* 73 */ 
5758 NULL, /* 74 */ 
5759 NULL, /* 75 */ 
5760 NULL, /* 76 */ 
5761 NULL, /* 77 */ 
5762 NULL, /* 78 */ 
5763 NULL, /* 79 */ 
5764 US5Modmap, /* 80 */ 
5765 US_UNIX5Modmap, /* 81 */ 
5766 France5Modmap, /* 82 */ 
5767 Denmark5Modmap, /* 83 */ 
5768 Germany5Modmap, /* 84 */ 
5769 Italy5Modmap, /* 85 */ 
5770 Netherland5Modmap, /* 86 */ 
5771 Norway5Modmap, /* 87 */ 
5772 Portugal5Modmap, /* 88 */ 
5773 Spain5Modmap, /* 89 */ 
5774 Sweden5Modmap, /* 90 */ 
5775 SwissFr5Modmap, /* 91 */ 
5776 SwissGe5Modmap, /* 92 */ 
5777 UK5Modmap, /* 93 */ 
5778 Korea5Modmap, /* 94 */ 
5779 Taiwan5Modmap, /* 95 */ 
5780 Japan5Modmap, /* 96 */ 
5781 CanadaFr5Modmap, /* 97 */ 
5782};