From 5dc3873019dfc20f923f18ab73248d7b7ecefce2 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Mon, 26 Jan 2009 19:26:46 -0200 Subject: Correct make distcheck and sparse warnings. Also apply "by hand" the sed -e 's/__VENDOR__/The X.Org Foundation' (or any other value used in the previous --with-vendor=... configure option) and use a static app-defaults file, matching pattern of changes in other xorg/app programs. --- .gitignore | 4 + Makefile.am | 14 ++-- app-defaults/Xvidtune | 183 ++++++++++++++++++++++++++++++++++++++++++++++ app-defaults/Xvidtune.cpp | 182 --------------------------------------------- configure.ac | 33 +++------ xvidtune.c | 10 +-- 6 files changed, 209 insertions(+), 217 deletions(-) create mode 100644 app-defaults/Xvidtune delete mode 100644 app-defaults/Xvidtune.cpp diff --git a/.gitignore b/.gitignore index 3b30c57..b3999cb 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,7 @@ stamp-h1 xvidtune xvidtune.1 *~ +*.o +xvidtune-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index dd24abe..b56564a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,18 +58,14 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ -# App default files (*.ad) +# App default files +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults appdefaultdir = @appdefaultdir@ -appdefault_DATA = app-defaults/Xvidtune +dist_appdefault_DATA = app-defaults/Xvidtune -app-defaults/Xvidtune: app-defaults/Xvidtune.cpp - $(mkdir_p) app-defaults - $(RAWCPP) $(srcdir)/app-defaults/Xvidtune.cpp | \ - sed -e 's/^\#.*$$//g' -e 's|__VENDOR__|$(VENDOR_NAME)|' > $@ - -EXTRA_DIST = app-defaults/Xvidtune.cpp $(appman_PRE) +EXTRA_DIST = $(appman_PRE) CLEANFILES = Xvidtune $(appman_DATA) @@ -80,6 +76,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/app-defaults/Xvidtune b/app-defaults/Xvidtune new file mode 100644 index 0000000..6ba9c5d --- /dev/null +++ b/app-defaults/Xvidtune @@ -0,0 +1,183 @@ +! $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\ + The X.Org Foundation \ +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 r: xvidtune-restore()\n\ + p: xvidtune-show()\n\ + j: xvidtune-moveleft()\n\ + k: xvidtune-moveright()\n\ + m: xvidtune-movedown()\n\ + i: xvidtune-moveup()\n\ + a: xvidtune-narrower()\n\ + s: xvidtune-wider()\n\ + x: xvidtune-shorter()\n\ + z: xvidtune-taller()\n\ + q: xvidtune-quit() diff --git a/app-defaults/Xvidtune.cpp b/app-defaults/Xvidtune.cpp deleted file mode 100644 index 03c79c7..0000000 --- a/app-defaults/Xvidtune.cpp +++ /dev/null @@ -1,182 +0,0 @@ -! $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 r: xvidtune-restore()\n\ - p: xvidtune-show()\n\ - j: xvidtune-moveleft()\n\ - k: xvidtune-moveright()\n\ - m: xvidtune-movedown()\n\ - i: xvidtune-moveup()\n\ - a: xvidtune-narrower()\n\ - s: xvidtune-wider()\n\ - x: xvidtune-shorter()\n\ - z: xvidtune-taller()\n\ - q: xvidtune-quit() diff --git a/configure.ac b/configure.ac index 7bee2c6..41a81aa 100644 --- a/configure.ac +++ b/configure.ac @@ -26,38 +26,29 @@ AC_INIT(xvidtune,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -AC_PROG_CPP -AC_PATH_PROGS(RAWCPP, [cpp], [$(CPP)], - [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) # Checks for pkg-config packages -PKG_CHECK_MODULES(XAW, xaw7) -PKG_CHECK_MODULES(XVIDTUNE, xxf86vm) - -XVIDTUNE_CFLAGS="$XVIDTUNE_CFLAGS $XAW_CFLAGS" -XVIDTUNE_LIBS="$XVIDTUNE_LIBS $XAW_LIBS" - +PKG_CHECK_MODULES(XVIDTUNE, xxf86vm xt xaw7) +xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_ARG_WITH(appdefaultdir, + AC_HELP_STRING([--with-appdefaultdir=], + [specify directory for app-defaults files (default is autodetected)]), + [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) +XVIDTUNE_CFLAGS="$CWARNFLAGS $XVIDTUNE_CFLAGS" +XVIDTUNE_LIBS="$XVIDTUNE_LIBS" AC_SUBST(XVIDTUNE_CFLAGS) AC_SUBST(XVIDTUNE_LIBS) - -AC_ARG_WITH(vendor-name, - AS_HELP_STRING([--with-vendor-name=VENDOR], - [Vendor name for disclaimer statement]), - [ VENDOR_NAME="$withval" ], - [ VENDOR_NAME="The X.Org Foundation" ]) -AC_SUBST([VENDOR_NAME]) - -PKG_CHECK_MODULES(APPDEFS, xt) -appdefaultdir=$(pkg-config --variable=appdefaultdir xt) AC_SUBST(appdefaultdir) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) diff --git a/xvidtune.c b/xvidtune.c index d7bf290..82a7533 100644 --- a/xvidtune.c +++ b/xvidtune.c @@ -49,11 +49,11 @@ from Kaleb S. KEITHLEY. #include #include -int MajorVersion, MinorVersion; -int EventBase, ErrorBase; -int dot_clock, mode_flags; -unsigned long TestTimeout=5000; /* Default test timeout */ -XtSignalId sigId; +static int MajorVersion, MinorVersion; +static int EventBase, ErrorBase; +static int dot_clock, mode_flags; +static unsigned long TestTimeout=5000; /* Default test timeout */ +static XtSignalId sigId; /* Minimum extension version required */ #define MINMAJOR 0 -- cgit v1.2.3