xset 1.0.3

This commit is contained in:
Brice Goglin 2007-08-28 23:04:07 +02:00
parent b79820b560
commit ac40940711
12 changed files with 526 additions and 102 deletions

1
debian/changelog vendored
View File

@ -18,6 +18,7 @@ x11-xserver-utils (7.2+4) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add menu entries for xrefresh and xvidtune.
* sessreg 1.0.3.
* xset 1.0.3.
-- Brice Goglin <bgoglin@debian.org> Fri, 17 Aug 2007 09:58:34 +0200

View File

@ -1,70 +1,350 @@
2006-04-26 Adam Jackson <ajax@freedesktop.org>
commit 3decc85623f023a31b8c19526b29092a9f2d0357
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 27 16:37:20 2007 -0700
* configure.ac:
Bump to 1.0.2
Version bump: 1.0.3
2006-04-06 Alan Coopersmith <alan.coopersmith@sun.com>
commit 4eca5d1de51926b640fd3d38db1a683740c64dd0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 27 16:36:47 2007 -0700
* xset.c (set_lock):
Free modifier map when done with it (Coverity #823 & 824)
Replace static ChangeLog with dist-hook to generate from git log
* xset.c (xkbset_repeatrate):
Free Xkb keyboard description when done with it (Coverity #825)
commit 44d9468edbbbb19d73c488345ceef1073d1df3a7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 27 15:56:14 2007 -0700
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
Use autoconf to check for usleep before falling into twisty #ifdef maze
* configure.ac:
Update package version for X11R7 release.
commit ef35876a808a3cfbefecf59434118cb4d5cd3c3e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 27 15:55:30 2007 -0700
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
Add *~ to .gitignore to skip emacs/patch droppings
* configure.ac:
Update package version number for final X11R7 release candidate.
commit bbf68f536efd4f4e03ccaee9ebcd1438c5b0a66b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 27 15:35:25 2007 -0700
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
Change xset_CFLAGS to AM_CFLAGS to make automake-1.10 happier
* Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit f7841444d4f12be78bc12c15190318819598c8a1
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:08 2007 -0400
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
Rename .cvsignore to .gitignore
* configure.ac:
Update package version number for X11R7 RC3 release.
commit c55edac5a9f7d48daf67bba9fb2aebc28d5f10ce
Author: Eric S. Raymond <esr@thyrsus.com>
Date: Tue Jan 2 10:20:00 2007 -0800
2005-11-20 Alan Coopersmith <alan.coopersmith@sun.com>
Bug #9524: Markup problems on xset.1x
X.Org Bugzilla #9524 <https://bugs.freedesktop.org/show_bug.cgi?id=9524>
* configure.ac:
Change dependency from xmu to xmuu since the full xmu
(with all its baggage like Xt) is not needed here.
commit 7a1add2942ad1e8c0f606edd5990a266a1e8a5ac
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Apr 26 23:47:29 2006 +0000
2005-11-19 Alan Coopersmith <alan.coopersmith@sun.com>
Bump to 1.0.2
* configure.ac:
Fix typo in XSET_LIBS setting so libXext is linked in properly.
commit 195524643a6f050e6d55f4c0000c8e39319c7b14
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Apr 7 01:20:35 2006 +0000
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
Free modifier map when done with it (Coverity #823 & 824)
Free Xkb keyboard description when done with it (Coverity #825)
* configure.ac:
Update dependencies to work with separate build roots.
commit bd5af2a53e631e36199af000f97f6eed8681eb8c
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:54 2005 +0000
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
Update package version for X11R7 release.
* configure.ac:
Update package version number for X11R7 RC2 release.
commit 39c3c423c2b2bd292861d738cbc0311f6728b13f
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:22:47 2005 +0000
2005-10-20 Eric Anholt <anholt@FreeBSD.org>
Stub COPYING files
* configure.ac:
Fix check for fontcache to look for "xfontcache" (Bill Crawford)
commit 3e609b20aebbf40ec8ac2bc6939e4f94bbef31f8
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:11 2005 +0000
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
Update package version number for final X11R7 release candidate.
* configure.ac:
Update package version number for RC1 release.
commit ba06c6414b1ed96172a361b9a596c3992c99ea90
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:25 2005 +0000
2005-08-29 Daniel Stone <daniel@freedesktop.org>
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
Bump to 0.99.1.
commit 7008ce4c7bd51712540e6fe08d835d856616b4b4
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:27 2005 +0000
* configure.ac:
Add support for more extensions.
Update package version number for X11R7 RC3 release.
commit b357ad9833e7a559974fa6276777f11aecf15f68
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:01:47 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit 48c40b02e98c5ff74a31ddad95cd3161c6c212d5
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:35:08 2005 +0000
Another pass at .cvsignores for apps.
commit 1b860c0dc7c6c780485083fa1eb0001eab4d740b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 21 03:14:16 2005 +0000
Change dependency from xmu to xmuu since the full xmu (with all its baggage
like Xt) is not needed here.
commit 538c64f6c89d12934bab7f17a21dbd5b59accd7d
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 20 22:08:55 2005 +0000
Add/improve .cvsignore files for apps.
commit eeb3a8d403e4f4f996ff68b5b45a93150263aa7a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 20 18:21:51 2005 +0000
Fix typo in #define that caused Xprint support to not be built in modular
tree.
commit b0679cb89861e1aec2700a22ee8be0570819f9ce
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 20 04:11:07 2005 +0000
Fix typo in XSET_LIBS setting so libXext is linked in properly.
commit a85959a46e205dc63b9d13bcfb0a22f246d82f95
Author: Kevin E Martin <kem@kem.org>
Date: Sat Nov 19 07:15:38 2005 +0000
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.
commit 315c08c29b58805884556c3709a57b98bd05bfd3
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:09:22 2005 +0000
Update package version number for X11R7 RC2 release.
commit f30d091c1d8a9b8912c981a1c1dbde57c68d4ad5
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Oct 20 23:27:03 2005 +0000
Fix check for fontcache to look for "xfontcache" (Bill Crawford)
commit 66ab568492b90ef9783ac754f6cf418858102c2d
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:47:57 2005 +0000
Update package version number for RC1 release.
commit bfa61c748fd43a5fda1ec7353d28ade31a6bb9bb
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 23:56:25 2005 +0000
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
work better with BSD make
commit 558b3c03372a38701963e1af3d93469768b54af9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 00:25:48 2005 +0000
Use sed to fill in variables in man page
commit 5b2b432ab4681d374537ab1d104fc016ab553135
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 31 09:37:27 2005 +0000
Bump to 0.99.1.
commit 5390e188325ff1e65d2c33531ab8513a33686f58
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 29 14:16:25 2005 +0000
Add config.h inclusion, defines based on autoconf header checks.
commit df7dc57880eb3e1e0a2142653339226d00a9aa33
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 29 14:15:39 2005 +0000
Add support for more extensions.
commit b56559798fb7b6331df16f89f9fbfe9639b5ddc4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 1 20:25:32 2005 +0000
Install man pages to section 1 instead of section m (Patch from Donnie
Berkholz)
commit b4095b20c4f68779607f583938edaf30f265873a
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:37 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 30d354e3fa21954d67cadfee8438e8d1d5563c81
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 20 19:32:04 2005 +0000
Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
configure cache, you cache it, and the cached value is probably wrong.
commit 6467b9f9b57d56d502e97260261745742a7645c7
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 14 22:40:16 2005 +0000
Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch
commit aba3f11253842b810676ae26efb20f9658182097
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Jul 1 18:21:15 2005 +0000
Build system for xset
commit 287b04adcd4d01118902bd27bbb91007aad93a62
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Mar 20 20:45:58 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2258) attachment #2166
(https://bugs.freedesktop.org/attachment.cgi?id=2166) "xset q" (query)
should not print an error message ('Xlib: extension "XFree86-Misc"
missing on display ":35.0".') when the "XFree86-Misc" is not available
on the Xserver.
commit 1cfa1c94b01303aa9f1c3327e3bbdb53834d0322
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Oct 17 23:08:07 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1659 - Fix
Imakefile bug which caused the Xprint support in "xset" not being
build.
commit b9e86e763abd12686a648c4c4a5ecc20e017170e
Author: Kevin E Martin <kem@kem.org>
Date: Thu Sep 2 05:50:38 2004 +0000
Clean up defines for Xprint support and fix BuildServersOnly build for
libXaw.
commit 735853aa5531434c951de4c2cd2b75b8ce7148ba
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 16 16:36:27 2004 +0000
As discussed and agreed on on the release-wranglers meeting of August 16,
I'm committing the patch from bug #1060 to back out unconditional
Xprint functionality.
Back out Xprint changes.
Revert xman to CVS of June 5, revert xlogo to CVS of May 8, revert xedit to
CVS of April 25, to back out unconditional Xprint support.
Fix up Xprint config logic to be like the rest of the extensions:
BuildXprint is a one-stop option for disabling everything Xprint
related. XprtServer controls building Xprt, BuildXprintLib controls
building Xprint libs and BuildXprintClients controls building clients
related to Xprint. BuiltXprint defaults to YES and the other options
respects relevant settings, i.e. BuildServer and BuildServersOnly.
Build Xaw regardless of BuildXprintLib setting.
Only build xphelloworld, xplsprinters and xprehashprinterlist when
BuildXprintClients it YES. Disable building xmore, it has always
supported XawPrintShell.
Make Xprint support depend on BuildXprintLib.
commit 7ee8234d82f9e3842f33a3861f8a18de834a0910
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 9 22:37:23 2004 +0000
Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339,
Harold L. Hunt II, Alexander Gottwald).
Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao,
David Dawes).
Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson).
HP-PA build fix (Bug #828, Guy Martin, Paul Anderson).
Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine).
Fix attempt to read video ROM before enabling it (Bug #843, Ivan
Kokshaysky, Mike A. Harris).
Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A.
Harris).
Clarify xset man page description of how to use the keyboard repeat rate
settings (Bug #846, Mike A. Harris).
Fix problem where print-screen key would get remapped to sys-req in certain
keymaps, which broke GNOME printscreen functionality (Bug #847, Owen
Taylor).
Fix several render problems:
- MMIO mode support
- Hang on IGP chips
- VT switching hang
- 3D render corruption (Bug #922, Hui Yu).
commit 602012ef6ef5681067c23893760f94df1b2c493a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed May 5 01:49:05 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=597 -
"xset" should have an option to rehash the list of available printers
commit ccd079eb8051132dc319c159b85be7c925583e91
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:55:04 2004 +0000
Merging XORG-CURRENT into trunk
commit 5e264049678aff7e12fc075556cba230df9d5f12
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:35:44 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit ee8f27ff967efd0087973d593c86d8a9ede51f9f
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:13:18 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 71ae2808ce7f1e6b9fe39b2cb5b7cf3c4d476fd7
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:26 2004 +0000
readding XFree86's cvs IDs
commit c600dfa9ac8d188e066f72885124b3f797c05762
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:24:17 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit b6c5bf83f4b1b89c9d5015c084de1776a36891f1
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:29:17 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 603734e7dff1f89e2518994fa76c93a6c168e1bb
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:49:23 2003 +0000
XFree86 4.3.0.1
commit ba9612df0697182f5c4ebd5852da1e4da479101e
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 15:54:55 2003 +0000
R6.6 is the Xorg base-line

View File

@ -21,7 +21,7 @@
bin_PROGRAMS = xset
xset_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE
AM_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE
xset_LDADD = $(XSET_LIBS)
xset_SOURCES = \
@ -35,8 +35,16 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
CLEANFILES = $(appman_DATA)
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)
dist-hook: ChangeLog
SED = sed

View File

@ -77,7 +77,7 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_xset_OBJECTS = xset-xset.$(OBJEXT)
am_xset_OBJECTS = xset.$(OBJEXT)
xset_OBJECTS = $(am_xset_OBJECTS)
am__DEPENDENCIES_1 =
xset_DEPENDENCIES = $(am__DEPENDENCIES_1)
@ -224,7 +224,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
xset_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE
AM_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE
xset_LDADD = $(XSET_LIBS)
xset_SOURCES = \
xset.c
@ -234,8 +234,9 @@ appman_PRE = \
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
CLEANFILES = $(appman_DATA)
MAINTAINERCLEANFILES = ChangeLog
SED = sed
# Strings to replace in man pages
@ -343,7 +344,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xset-xset.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xset.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -358,20 +359,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
xset-xset.o: xset.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xset_CFLAGS) $(CFLAGS) -MT xset-xset.o -MD -MP -MF "$(DEPDIR)/xset-xset.Tpo" -c -o xset-xset.o `test -f 'xset.c' || echo '$(srcdir)/'`xset.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xset-xset.Tpo" "$(DEPDIR)/xset-xset.Po"; else rm -f "$(DEPDIR)/xset-xset.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xset.c' object='xset-xset.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xset_CFLAGS) $(CFLAGS) -c -o xset-xset.o `test -f 'xset.c' || echo '$(srcdir)/'`xset.c
xset-xset.obj: xset.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xset_CFLAGS) $(CFLAGS) -MT xset-xset.obj -MD -MP -MF "$(DEPDIR)/xset-xset.Tpo" -c -o xset-xset.obj `if test -f 'xset.c'; then $(CYGPATH_W) 'xset.c'; else $(CYGPATH_W) '$(srcdir)/xset.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xset-xset.Tpo" "$(DEPDIR)/xset-xset.Po"; else rm -f "$(DEPDIR)/xset-xset.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xset.c' object='xset-xset.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xset_CFLAGS) $(CFLAGS) -c -o xset-xset.obj `if test -f 'xset.c'; then $(CYGPATH_W) 'xset.c'; else $(CYGPATH_W) '$(srcdir)/xset.c'; fi`
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
@ -468,6 +455,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -597,6 +587,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@ -652,8 +643,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-appmanDATA install-binPROGRAMS install-data \
@ -666,6 +657,13 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
uninstall-info-am
.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)
dist-hook: ChangeLog
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.

2
xset/aclocal.m4 vendored
View File

@ -159,7 +159,7 @@ path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

6
xset/config.guess vendored
View File

@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
timestamp='2007-03-06'
timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:SunOS:5.*:*)
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@ -793,7 +793,7 @@ EOF
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
x86)
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)

View File

@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the `usleep' function. */
#undef HAVE_USLEEP
/* Define to 1 if you have the <X11/extensions/dpms.h> header file. */
#undef HAVE_X11_EXTENSIONS_DPMS_H

10
xset/config.sub vendored
View File

@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
timestamp='2007-01-18'
timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@ -475,8 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
cr16c)
basic_machine=cr16c-unknown
cr16)
basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@ -683,6 +683,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
mingw32ce)
basic_machine=arm-unknown
os=-mingw32ce
;;
miniframe)
basic_machine=m68000-convergent
;;

126
xset/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for xset 1.0.2.
# Generated by GNU Autoconf 2.61 for xset 1.0.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xset'
PACKAGE_TARNAME='xset'
PACKAGE_VERSION='1.0.2'
PACKAGE_STRING='xset 1.0.2'
PACKAGE_VERSION='1.0.3'
PACKAGE_STRING='xset 1.0.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@ -1218,7 +1218,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures xset 1.0.2 to adapt to many kinds of systems.
\`configure' configures xset 1.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1288,7 +1288,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xset 1.0.2:";;
short | recursive ) echo "Configuration of xset 1.0.3:";;
esac
cat <<\_ACEOF
@ -1406,7 +1406,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xset configure 1.0.2
xset configure 1.0.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1420,7 +1420,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by xset $as_me 1.0.2, which was
It was created by xset $as_me 1.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@ -2090,7 +2090,7 @@ fi
# Define the identity of the package.
PACKAGE='xset'
VERSION='1.0.2'
VERSION='1.0.3'
cat >>confdefs.h <<_ACEOF
@ -3438,6 +3438,103 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Checks for system functions
for ac_func in usleep
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
int
main ()
{
return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
# Checks for pkg-config packages
@ -3650,7 +3747,7 @@ Alternatively, you may set the environment variables XSET_CFLAGS
and XSET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@ -3660,7 +3757,7 @@ Alternatively, you may set the environment variables XSET_CFLAGS
and XSET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@ -3763,7 +3860,7 @@ Alternatively, you may set the environment variables SET_X11_CFLAGS
and SET_X11_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@ -3773,7 +3870,7 @@ Alternatively, you may set the environment variables SET_X11_CFLAGS
and SET_X11_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@ -3785,7 +3882,6 @@ echo "${ECHO_T}yes" >&6; }
fi
pkg_failed=no
{ echo "$as_me:$LINENO: checking for SET_XEXT" >&5
echo $ECHO_N "checking for SET_XEXT... $ECHO_C" >&6; }
@ -5068,7 +5164,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by xset $as_me 1.0.2, which was
This file was extended by xset $as_me 1.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -5121,7 +5217,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
xset config.status 1.0.2
xset config.status 1.0.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(xset,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset)
AC_INIT(xset,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@ -30,6 +30,9 @@ AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
# Checks for system functions
AC_CHECK_FUNCS([usleep])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XSET, xmuu)

View File

@ -87,8 +87,10 @@ in this Software without prior written authorization from The Open Group.
#endif
#undef BOOL
#endif
#if defined(SVR4) && defined(sun)
#include <sys/syscall.h>
#ifndef HAVE_USLEEP
# if defined(SVR4) && defined(sun)
# include <sys/syscall.h>
# endif
#endif
#endif /* DPMSExtension */
@ -575,6 +577,9 @@ for (i = 1; i < argc; ) {
*
* On OS/2, use _sleep2()
*/
#ifdef HAVE_USLEEP
# define Usleep(us) usleep((us))
#else
#ifdef SVR4
# ifdef sun
/* Anything to avoid linking with -lposix4 */
@ -610,6 +615,7 @@ for (i = 1; i < argc; ) {
# define Usleep(us) usleep((us))
# endif
#endif
#endif /* HAVE_USLEEP */
if (strcmp(arg, "on") == 0) {
DPMSEnable(dpy);

View File

@ -31,17 +31,41 @@ xset - user preference utility for X
.SH SYNOPSIS
.B xset
[-display \fIdisplay\fP]
[-b] [b on/off] [b [\fIvolume\fP [\fIpitch\fP [\fIduration\fP]]]
[[-]bc]
[-c] [c on/off] [c [\fIvolume\fP]]
[[+-]dpms] [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]] [dpms force standby/suspend/off/on]
[[-+]fp[-+=] \fIpath\fP[,\fIpath\fP[,...]]] [fp default] [fp rehash]
[[-]led [\fIinteger\fP]] [led on/off]
[m[ouse] [\fIaccel_mult\fP[/\fIaccel_div\fP] [\fIthreshold\fP]]] [m[ouse] default]
.br
[-b] [b {on|off}] [b [\fIvolume\fP [\fIpitch\fP [\fIduration\fP]]]]
.br
[-bc] [bc]
.br
[-c] [c {on|off}] [c [\fIvolume\fP]]
.br
[+dpms] [-dpms]
.br
[dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]]
[dpms force {standby|suspend|off|on}]
.br
[fp=\fIpathlist\fP]
[-fp=\fIpathlist\fP]
[+fp=\fIpathlist\fP]
[fp-\fIpathlist\fP]
[fp+\fIpathlist\fP]
.br
[fp default] [fp rehash]
.br
[-led [\fIinteger\fP]]
[+led [\fIinteger\fP]]
.br
[led {on|off}]
.br
[mouse [\fIaccel_mult\fP[/\fIaccel_div\fP] [\fIthreshold\fP]]] [mouse default]
.br
[p \fIpixel\fP \fIcolor\fP]
[[-]r [keycode]] [r on/off] [r rate \fIdelay\fP [\fIrate\fP]]
[s [\fIlength\fP [\fIperiod\fP]]] [s blank/noblank]
[s expose/noexpose] [s on/off] [s default] [s activate] [s reset]
.br
[-r [keycode]] [r [keycode]]
[r {on|off}] [r rate \fIdelay\fP [\fIrate\fP]]
.br
[s [\fIlength\fP [\fIperiod\fP]]] [s {blank|noblank}]
[s {expose|noexpose}] [s {on|off}] [s default] [s activate] [s reset]
.br
[q]
.SH DESCRIPTION
This program is used to set various user preference options of the display.
@ -158,8 +182,9 @@ The particular LED values may refer to different LEDs on different
hardware.
.PP
.TP 8
.B m
The \fBm\fP option controls the mouse parameters.
.B mouse
The \fBm\fP option controls the mouse parameters; it may be
abbreviated to 'm'.
The parameters for the mouse are `acceleration' and `threshold'.
The acceleration can be specified as an integer, or as a simple
fraction.