svn merge ^/branches/released .

5 files changed, 0 insertions, 391 deletions

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/cs b/xorg-server/xkbdata.src/symbols/sun_vndr/cs
deleted file mode 100644
index ed46dcf7c..000000000
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5)"
-    include "cz"
-
-    // A few keys are different
-    
-
-    key <TLDE> { [ quoteleft, asciitilde	]			};
-//     key <AE02> { [ ecaron, 2		], [ at 		]	};
-//     key <AE03> { [ scaron, 3		], [ numbersign		]	};
-//     key <AE04> { [ ccaron, 4		], [ dollar		]	};
-//     key <AE05> { [ rcaron, 5		], [ percent		]	};
-//     key <AE06> { [ zcaron, 6		], [ asciicircum	]	};
-//     key <AE07> { [ yacute, 7		], [ ampersand		]	};
-//     key <AE08> { [ aacute, 8		], [ asterisk		]	};
-    key <AE09> { [ iacute, 9		], [ braceleft		]	};
-    key <AE10> { [ eacute, 0		], [ braceright		]	};
-
-    key <AD03> { [ e, E		        ]                               };
-    key <AD11> { [ uacute, slash        ], [ bracketleft		] };
-    key <AD12> { [ parenright, parenleft], [ bracketright		] };
-    
-    key <AC02> { [ s, S			], [ ssharp, ssharp		] };
-    key <BKSL> { [ SunFA_Diaeresis, backslash	]			  };
-
-    key <LSGT> { [ backslash, bar		]			};
-    
-};
-
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/hu b/xorg-server/xkbdata.src/symbols/sun_vndr/hu
deleted file mode 100644
index f14a72fab..000000000
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/hu
+++ /dev/null
@@ -1,88 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $
-default partial alphanumeric_keys 
-xkb_symbols "type5" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Hungarian keyboard.
-
-    // Alphanumeric section
-
-    name[group1]="Hungarian";
-
-    key <TLDE> {	[	0,		section		]	};
-    key <AE01> {	[	1,      	apostrophe	]	};
-    key <AE02> {	[	2,		quotedbl	]	};
-    key <AE03> {	[	3,		plus		],
-			[	numbersign			]	};
-    key <AE04> {	[	4,		exclam		],
-			[	dollar				]	};
-    key <AE06> {	[	6,		slash		],
-			[	asciicircum			]	};
-    key <AE07> {	[	7,		equal		],
-			[	braceleft			]	};
-    key <AE08> {	[	8,		parenleft	],
-			[	bracketleft			]	};
-    key <AE09> {	[	9,		parenright	],
-			[	bracketright			]	};
-    key <AE10> {	[	odiaeresis,	Odiaeresis	],
-			[	braceright  			]	};
-    key <AE11> {	[	udiaeresis,	Udiaeresis	],
-			[	backslash			]	};
-    key <AE12> {	[	oacute,		Oacute		],
-			[	asciitilde				]	};
-
-    key <AD01> {	[	q,		Q		],
-			[	at				]	};
-    key <AD06> {        [       z,              Z               ]	};
-    key <AD11> {	[	odoubleacute,	Odoubleacute	]	};
-    key <AD12> {	[	uacute,		Uacute		]	};
-
-    key <AC02> {	[	s,		S		],
-			[	ssharp				]	};
-    key <AC08> {	[	k,		K		],
-			[	ampersand			]	};
-    key <AC10> {	[	eacute,		Eacute		],
-			[	semicolon			]	};
-    key <AC11> {	[	aacute,		Aacute		],
-			[	adiaeresis,	Adiaeresis	]	};
-    key <BKSL> {	[	udoubleacute,	Udoubleacute	]	};
-
-    key <LSGT> {	[	iacute,		Iacute		],
-			[       bar				]	};
-    key <AB01> {	[	y,		Y		],
-			[	less				]	};
-    key <AB02> {	[	x,		X		],
-			[	greater			]	};
-    key <AB03> {	[	c,		C		],
-			[	quoteleft			]	};
-    key <AB08> {	[	comma,		question	],
-			[	asterisk			]	};
-    key <AB09> {	[	period,		colon		]	};
-    key <AB10> {	[	minus,		underscore	]	};
-
-    // End alphanumeric section
-};
-
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ko b/xorg-server/xkbdata.src/symbols/sun_vndr/ko
deleted file mode 100644
index acc568f6b..000000000
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ko
+++ /dev/null
@@ -1,57 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-//
-// Korean layout for a Type 4 Sun keyboard
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
-
-    key <LNFD> { [ Hangul		]			};
-    key <RALT> { [ Linefeed		]			};
-    key <COMP> { [ Hangul_Hanja		]			};
-
-};
-
-// Korean layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-//    include "sun_vndr/us(type5basic)"
-
-    // A few keys are different
-    key <ALGR> { [ Hangul		]				  };
-    key <COMP> { [ Hangul_Hanja		]				  };
-    key <BKSL> { [ backslash, bar	], [ brokenbar			] };
-};
-
-// Korean layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
-//    include "sun_vndr/us(type5basic)"
-
-    // A few keys are different
-    key <ALGR> { [ Hangul		]				  };
-    key <COMP> { [ Hangul_Hanja		]				  };
-    key <BKSL> { [ backslash, bar	], [ brokenbar			] };
-};
-
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/sw b/xorg-server/xkbdata.src/symbols/sun_vndr/sw
deleted file mode 100644
index ecf52fc9d..000000000
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/sw
+++ /dev/null
@@ -1,167 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-xkb_symbols "type4de" {
-    include "sun_vndr/us(type4basic)"
-    // A few keys are different
-    key <BKSL> { [ less, braceleft      ]                       };
-
-    key <BRCR> { [ greater, braceright  ]                       };
-    key <DELE> { [ Delete               ]                       };
-
-    key <AE01> { [ 1, plus              ], [exclam      ]       };
-    key <AE02> { [ 2, quotedbl          ], [at          ]       };
-    key <AE03> { [ 3, asterisk          ], [numbersign  ]       };
-    key <AE04> { [ 4, ccedilla          ], [cent        ]       };
-    key <AE05> { [ 5, percent           ], [asciitilde  ]       };
-    key <AE06> { [ 6, ampersand         ], [section     ]       };
-    key <AE07> { [ 7, slash             ], [bar         ]       };
-    key <AE08> { [ 8, parenleft         ], [degree      ]       };
-    key <AE09> { [ 9, parenright        ], [backslash   ]       };
-    key <AE10> { [ 0, equal             ], [asciicircum ]       };
-    Key <AE11> { [ quoteright, question ], [quoteleft   ]       };
-    key <AE12> { [ SunFA_Circum, SunFA_Grave    ]               };
-    key <AD03> { [ e, E                 ], [EuroSign    ]       };
-    key <AD06> { [ Z                    ]                       };
-    key <AD11> { [ udiaeresis, egrave   ]                       };
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ]               };
-    key <AC10> { [ odiaeresis, eacute   ]                       };
-    key <AC11> { [ adiaeresis, agrave   ]                       };
-    key <TLDE> { [ dollar, SunFA_Tilde  ], [sterling    ]       };
-    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
-    key <AB01> { [ Y                    ]                       };
-    key <AB07> { [ M, NoSymbol          ], [mu  ]               };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    key <COMP> { [ SunAltGraph          ]                       };
-    key <ALGR> { [ SunCompose           ]                       };
-
-};
-
-xkb_symbols "type4fr" {
-    include "sun_vndr/us(type4basic)"
-    // A few keys are different
-    key <BKSL> { [ less, braceleft	]			};
-
-    key <BRCR> { [ greater, braceright  ]                       };
-    key <DELE> { [ Delete               ]                       };
-
-    key <AE01> { [ 1, plus		], [exclam	]	};
-    key <AE02> { [ 2, quotedbl		], [at	 	]	};
-    key <AE03> { [ 3, asterisk		], [numbersign	]	};
-    key <AE04> { [ 4, ccedilla		], [cent	]	};
-    key <AE05> { [ 5, percent		], [asciitilde	]	};
-    key <AE06> { [ 6, ampersand		], [section	]	};
-    key <AE07> { [ 7, slash		], [bar		]	};
-    key <AE08> { [ 8, parenleft		], [degree	]	};
-    key <AE09> { [ 9, parenright	], [backslash	]	};
-    key <AE10> { [ 0, equal		], [asciicircum	]	};
-    Key <AE11> { [ quoteright, question ], [quoteleft	]	};
-    key <AE12> { [ SunFA_Circum, SunFA_Grave	]		};
-    key <AD03> { [ e, E			], [EuroSign	]	};
-    key <AD06> { [ Z			]			};
-    key <AD11> { [ egrave, udiaeresis	]			};
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute	]		};
-    key <AC10> { [ eacute, odiaeresis	]			};
-    key <AC11> { [ agrave, adiaeresis	]			};
-    key <TLDE> { [ dollar, SunFA_Tilde	], [sterling	]	};
-    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
-    key <AB01> { [ Y			]			};
-    key <AB07> { [ M, NoSymbol		], [mu	]		};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    key <COMP> { [ SunAltGraph		]			};
-    key <ALGR> { [ SunCompose		]			}; 
-
-
-
-};
-
-xkb_symbols "type5fr" {
-
-    key <TLDE> { [ section, degree	]				};
-
-    key <AE01> { [ 1, plus		], [bar				]};
-    key <AE02> { [ 2, quotedbl		], [at	 	]		};
-    key <AE03> { [ 3, asterisk		], [numbersign	]		};
-    key <AE04> { [ 4, ccedilla		], [asciicircum	]		};
-    key <AE05> { [ 5, percent		], [asciitilde	]		};
-    key <AE06> { [ 6, ampersand		], [section	]		};
-    key <AE07> { [ 7, slash		], [bar		]		};
-    key <AE08> { [ 8, parenleft		], [degree	]		};
-    key <AE09> { [ 9, parenright	], [backslash	]		};
-    key <AE10> { [ 0, equal		], [quoteleft	]		};
-    Key <AE11> { [ quoteright, question ], [SunFA_Acute	]		};
-    key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde		]};
-    key <AD03> { [ e, E			], [EuroSign	]		};
-    key <AD06> { [ z, Z			]				};
-    key <AD11> { [ egrave, udiaeresis	], [ bracketleft		]};
-    key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright		]};
-
-    key <AC10> { [ eacute, odiaeresis	]				};
-    key <AC11> { [ agrave, adiaeresis	], [ braceleft			]};
-    key <BKSL> { [ dollar, sterling	], [ braceright			]};
-
-    key <LSGT> { [ less, greater	], [ backslash			]};
-    key <AB01> { [ y, Y			]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    
-};
-
-xkb_symbols "type5de" {
-
-    key <TLDE> { [ section, degree	]				};
-
-    key <AE01> { [ 1, plus		], [bar				]};
-    key <AE02> { [ 2, quotedbl		], [at	 	]		};
-    key <AE03> { [ 3, asterisk		], [numbersign	]		};
-    key <AE04> { [ 4, ccedilla		], [asciicircum	]		};
-    key <AE05> { [ 5, percent		], [asciitilde	]		};
-    key <AE06> { [ 6, ampersand		], [section	]		};
-    key <AE07> { [ 7, slash		], [bar		]		};
-    key <AE08> { [ 8, parenleft		], [degree	]		};
-    key <AE09> { [ 9, parenright	], [backslash	]		};
-    key <AE10> { [ 0, equal		], [quoteleft	]		};
-    Key <AE11> { [ quoteright, question ], [SunFA_Acute	]		};
-    key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde		]};
-    key <AD03> { [ e, E			], [EuroSign	]		};
-    key <AD06> { [ z, Z			]				};
-    key <AD11> { [ udiaeresis, egrave	], [ bracketleft		]};
-    key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright		]};
-
-    key <AC10> { [ odiaeresis, eacute	]				};
-    key <AC11> { [ adiaeresis, agrave	], [ braceleft			]};
-    key <BKSL> { [ dollar, sterling	], [ braceright			]};
-
-    key <LSGT> { [ less, greater	], [ backslash			]};
-    key <AB01> { [ y, Y			]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    
-};
-
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/usb b/xorg-server/xkbdata.src/symbols/sun_vndr/usb
deleted file mode 100644
index 84648dd06..000000000
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/usb
+++ /dev/null
@@ -1,26 +0,0 @@
-// Additional keys for Sun USB keyboard
-
-xkb_symbols "sun_usb" {
-
-    key <STOP> { [ Cancel	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
-    key <HELP> { [ Help		]	};
-
-    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
-    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    key <LMTA> { [	Meta_L		]	};
-    key <RMTA> { [	Meta_R		]	};
-    key <COMP> { [	Multi_key	]	};
-};
-