Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

3 files changed, 193 insertions, 11 deletions

diff --git a/Xvidtune.cpp b/Xvidtune.cpp
new file mode 100644
index 0000000..03c79c7
--- /dev/null
+++ b/Xvidtune.cpp
@@ -0,0 +1,182 @@
+! $XFree86: xc/programs/xvidtune/Xvidtune.ad,v 3.10 1995/07/19 12:46:12 dawes Exp $
+!
+*adInstalled: true
+*borderWidth: 0
+*Scrollbar.borderWidth: 1
+*Scrollbar.width: 250
+*Command.borderWidth: 1
+*HSyncStart-form.fromVert: HDisplay-form
+*HSyncEnd-form.fromVert: HSyncStart-form
+*HTotal-form.fromVert: HSyncEnd-form
+*VSyncStart-form.fromVert: VDisplay-form
+*VSyncEnd-form.fromVert: VSyncStart-form
+*VTotal-form.fromVert: VSyncEnd-form
+*Flags-form.fromVert: HTotal-form
+*Buttons-form.fromVert: Flags-form
+*Buttons2-form.fromVert: Buttons-form
+*Left-button.fromVert: HTotal-scrollbar
+*Right-button.fromVert: HTotal-scrollbar
+*Narrower-button.fromVert: HTotal-scrollbar
+*Wider-button.fromVert: HTotal-scrollbar
+*Up-button.fromVert: VTotal-scrollbar
+*Down-button.fromVert: VTotal-scrollbar
+*Shorter-button.fromVert: VTotal-scrollbar
+*Taller-button.fromVert: VTotal-scrollbar
+*HDisplay-text.fromHoriz: HDisplay-label
+*HSyncStart-text.fromHoriz: HSyncStart-label
+*HSyncStart-scrollbar.fromVert: HSyncStart-label
+*HSyncStart-scrollbar.orientation: horizontal
+*HSyncEnd-text.fromHoriz: HSyncEnd-label
+*HSyncEnd-scrollbar.fromVert: HSyncEnd-label
+*HSyncEnd-scrollbar.orientation: horizontal
+*Right-button.fromHoriz: Left-button
+*Wider-button.fromHoriz: Right-button
+*Narrower-button.fromHoriz: Wider-button
+*HTotal-text.fromHoriz: HTotal-label
+*HTotal-scrollbar.fromVert: HTotal-label
+*HTotal-scrollbar.orientation: horizontal
+*VDisplay-form.fromHoriz: HSyncStart-form
+*VTotal-form.fromHoriz: HSyncStart-form
+*VSyncStart-form.fromHoriz: HSyncStart-form
+*VSyncEnd-form.fromHoriz: HSyncStart-form
+*VDisplay-text.fromHoriz: VDisplay-label
+*VSyncStart-text.fromHoriz: VSyncStart-label
+*VSyncStart-scrollbar.fromVert: VSyncStart-label
+*VSyncStart-scrollbar.orientation: horizontal
+*VSyncStart-text.type: XawAsciiString
+*VSyncEnd-text.fromHoriz: VSyncEnd-label
+*VSyncEnd-scrollbar.fromVert: VSyncEnd-label
+*VSyncEnd-scrollbar.orientation: horizontal
+*VTotal-text.fromHoriz: VTotal-label
+*VTotal-scrollbar.fromVert: VTotal-label
+*VTotal-scrollbar.orientation: horizontal
+*PixelClock-form.fromHoriz: HTotal-form
+*PixelClock-form.fromVert: VTotal-form
+*HSyncRate-form.fromHoriz: HTotal-form
+*HSyncRate-form.fromVert: PixelClock-form
+*VSyncRate-form.fromHoriz: HTotal-form
+*VSyncRate-form.fromVert: HSyncRate-form
+*PixelClock-text.fromHoriz: PixelClock-label
+*HSyncRate-text.fromHoriz: HSyncRate-label
+*VSyncRate-text.fromHoriz: VSyncRate-label
+*PixelClock-label.label: Pixel Clock (MHz):
+*HSyncRate-label.label: Horizontal Sync (kHz):
+*VSyncRate-label.label: Vertical Sync (Hz):
+*Flags-text.fromHoriz: Flags-label
+*HDisplay-label.label: HDisplay:
+*HSyncStart-label.label: HSyncStart:
+*HSyncEnd-label.label: HSyncEnd:
+*HTotal-label.label: HTotal:
+*VDisplay-label.label: VDisplay:
+*VSyncStart-label.label: VSyncStart:
+*VSyncEnd-label.label: VSyncEnd:
+*VTotal-label.label: VTotal:
+*Down-button.fromHoriz: Up-button
+*Shorter-button.fromHoriz: Down-button
+*Taller-button.fromHoriz: Shorter-button
+*Flags-label.label: Flags (hex):
+*Flags-text.borderWidth: 1
+*Flags-text*editType: edit
+!Removed Edit capability -- Jon
+*Flags-text*sensitive: False
+*Apply-button.fromHoriz: Quit-button
+*AutoApply-toggle.fromHoriz: Apply-button
+*AutoApply-toggle.borderWidth: 1
+*Test-button.fromHoriz: AutoApply-toggle
+*Restore-button.fromHoriz: Test-button
+*Show-button.fromHoriz: Fetch-button
+*Next-button.fromHoriz: Show-button
+*Prev-button.fromHoriz: Next-button
+*Quit-button.label: Quit
+*Fetch-button.label: Fetch
+*Show-button.label: Show
+*Restore-button.label: Restore
+*Test-button.label: Test
+*Apply-button.label: Apply
+*AutoApply-toggle.label: Auto
+*Next-button.label: Next
+*Prev-button.label: Prev
+*Left-button.label: Left
+*Right-button.label: Right
+*Wider-button.label: Wider
+*Narrower-button.label: Narrower
+*Up-button.label: Up
+*Down-button.label: Down
+*Shorter-button.label: Shorter
+*Taller-button.label: Taller
+*Abort.label: Abort Test Now
+*WarnOK.label: OK
+*WarnCancel.label: Cancel
+*NoTuneOK.label: OK
+*Left.label: Left
+*Right.label: Right
+*Wider.label: Wider
+*Narrower.label: Narrower
+*Up.label: Up
+*Down.label: Down
+*Shorter.label: Shorter
+*Higher.label: Higher
+*AckError.label: Acknowledged
+*ErrorMessage.label: Sorry: You have requested a mode-line\n\
+ That is not possible, or not supported by your\n\
+ hardware configuration\n
+*testingMessage.label: Mode test current in progress\n\n     Please wait
+*WarnLabel.label: WARNING     WARNING    WARNING    WARNING    WARNING\
+    WARNING\n\n\
+THE INCORRECT USE OF THIS PROGRAM CAN DO PERMANENT DAMAGE TO YOUR MONITOR\n\
+AND/OR VIDEO CARD.  IF YOU ARE NOT SURE WHAT YOU ARE DOING, HIT CANCEL\n\
+NOW. OTHERWISE, HIT OK TO CONTINUE\n\
+\n\
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\n\
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n\
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n\
+IN NO EVENT SHALL Kaleb S. KEITHLEY (or his employer) OR \n\
+ __VENDOR__ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n\
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n\
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER\n\
+DEALINGS IN THE SOFTWARE.\n\n
+*NoTuneLabel.label: Video modes are not tunable on this chip.\n
+
+	
+*S3-form.fromVert: Buttons2-form
+*EarlySc-toggle.fromHoriz: InvertVclk-toggle
+*Blank1-label.fromHoriz: EarlySc-toggle
+!*Blank1-text.fromHoriz: Blank1-label
+!*Blank2-label.fromHoriz: Blank1-text
+!*Blank2-text.fromHoriz: Blank2-label
+*InvertVclk-toggle.borderWidth: 1
+*EarlySc-toggle.borderWidth: 1
+*Blank1-text.borderWidth: 1
+*Blank2-text.borderWidth: 1
+*Blank1-text*editType: edit
+*Blank2-text*editType: edit
+*Blank1-text*width: 20
+*Blank2-text*width: 20
+*InvertVclk-toggle.label: InvertVCLK
+*EarlySc-toggle.label:EarlySC
+*Blank1-label.label: Blank Delay 1
+*Blank2-label.label: Blank Delay 2
+
+*Blank1Dec-button.fromHoriz: Blank1-label
+*Blank1-text.fromHoriz: Blank1Dec-button
+*Blank1Inc-button.fromHoriz: Blank1-text
+*Blank2-label.fromHoriz: Blank1Inc-button
+*Blank2Dec-button.fromHoriz: Blank2-label
+*Blank2-text.fromHoriz: Blank2Dec-button
+*Blank2Inc-button.fromHoriz: Blank2-text
+*Blank1Inc-button.label: +
+*Blank1Dec-button.label: -
+*Blank2Inc-button.label: +
+*Blank2Dec-button.label: -
+
+*translations:	#override <Key>r: xvidtune-restore()\n\
+			  <Key>p: xvidtune-show()\n\
+			  <Key>j: xvidtune-moveleft()\n\
+			  <Key>k: xvidtune-moveright()\n\
+			  <Key>m: xvidtune-movedown()\n\
+			  <Key>i: xvidtune-moveup()\n\
+			  <Key>a: xvidtune-narrower()\n\
+			  <Key>s: xvidtune-wider()\n\
+			  <Key>x: xvidtune-shorter()\n\
+			  <Key>z: xvidtune-taller()\n\
+			  <Key>q: xvidtune-quit()
diff --git a/xvidtune.c b/xvidtune.c
index 306145f..1bdf947 100644
--- a/xvidtune.c
+++ b/xvidtune.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xvidtune/xvidtune.c,v 3.36 2003/10/24 20:38:24 tsi Exp $ */
+/* $XFree86: xc/programs/xvidtune/xvidtune.c,v 3.35tsi Exp $ */
 
 /*
 
diff --git a/xvidtune.man b/xvidtune.man
index 7713fe6..12bb80c 100644
--- a/xvidtune.man
+++ b/xvidtune.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/xvidtune/xvidtune.man,v 3.14 2001/08/13 19:35:01 dawes Exp $
+.\" $XFree86: xc/programs/xvidtune/xvidtune.man,v $
 .\"
 .\" Copyright (c) 1995  Kaleb S. KEITHLEY
 .\"
@@ -26,9 +26,9 @@
 .\" other dealings in this Software without prior written authorization
 .\" from Kaleb S. KEITHLEY.
 .\"
-.TH xvidtune 1 __vendorversion__
+.TH xvidtune __appmansuffix__ __vendorversion__
 .SH NAME
-xvidtune \- video mode tuner for XFree86
+xvidtune \- video mode tuner for __xservername__
 .SH SYNOPSIS
 .B xvidtune
 [
@@ -43,7 +43,7 @@ xvidtune \- video mode tuner for XFree86
 .I \-toolkitoption
 \&.\|.\|. ]
 .SH DESCRIPTION
-Xvidtune is a client interface to the XFree86 X server video mode
+Xvidtune is a client interface to the X server video mode
 extension (XFree86-VidModeExtension).
 .PP
 When given one of the non-toolkit options, xvidtune provides
@@ -53,9 +53,9 @@ Without any options (or with only toolkit options) it
 presents the user with various buttons and sliders that can be
 used to interactively adjust existing video modes.
 It will also print the settings in a format suitable for inclusion
-in an XF86Config file.
+in an __xconfigfile__ file.
 .PP
-Normally the XFree86 X servers only allow changes to be made with
+Normally the __xservername__ X servers only allow changes to be made with
 the XFree86-VidModeExtension from clients connected via a local
 connection type.
 .PP
@@ -108,7 +108,7 @@ Return the settings to their original values.
 Query the server for its current settings.
 .TP 10
 .B Show
-Print the currently selected settings to stdout in XF86Config
+Print the currently selected settings to stdout in __xconfigfile__
 "Modeline" format.  The primary selection is similarly set.
 .TP 10
 .B Next
@@ -141,7 +141,7 @@ be useful.  For S3 Trio32/Trio64 cards only \fIInvertVCLK\fP is available.
 At the moment there are no default settings available for these chips 
 in the video mode extension and thus this feature is disabled in xvidtune.
 It can be enabled by setting any of the optional S3 commands in the
-screen section of XF86Config, e.g. using
+screen section of __xconfigfile__, e.g. using
 .RS 10
 .B blank_delay \fI"\(**"\fP 0
 .RE
@@ -150,7 +150,7 @@ screen section of XF86Config, e.g. using
 as the following:
 .TP 10
 .B \-show
-Print the current settings to stdout in XF86Config
+Print the current settings to stdout in __xconfigfile__
 "Modeline" format and exit.
 .TP 10
 .B \-prev
@@ -166,7 +166,7 @@ did not exit cleanly and they are still disabled, the program can
 be re-run with this option to re-enable the mode switching key
 combinations.
 .SH SEE ALSO
-XF86Config(4/5), XFree86(1)
+__xconfigfile__(__filemansuffix__), __xservername__(__appmansuffix__)
 .SH AUTHORS
 Kaleb S. Keithley, X Consortium.
 .br