mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-09 10:48:48 +00:00
Update to xset 1.2.1
This commit is contained in:
matthieu
@@ -1,9 +1,123 @@
|
||||
commit 6da66cd144e309a6f79f4f6c315fe6ef0f3d5b19
|
||||
Merge: 859a3fb fd058da
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sat Apr 3 18:47:26 2010 +0200
|
||||
commit 8a3ad532fc8e00ea5066355a783cb270315596fe
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Wed Nov 10 20:02:19 2010 -0800
|
||||
|
||||
Merge remote branch 'origin/master' into obsd
|
||||
xset 1.2.1
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit d75ab3dcae8bcb022e87fd73c9f798421d040c46
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Nov 9 18:16:27 2010 -0800
|
||||
|
||||
Strip trailing whitespace
|
||||
|
||||
Generated via: perl -i -p -e 's{\s+$}{\n}' *
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 33580bb84fb5ca6d1a49c1f1ac7b785fe4f92d11
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Nov 9 18:13:51 2010 -0800
|
||||
|
||||
Restore man page copyright accidentally removed in ce3f6a73c2beef
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 0d807d97e8387a38b6a9324912b9c65662949038
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Nov 9 17:13:41 2010 -0800
|
||||
|
||||
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
|
||||
|
||||
Regroup AC statements under the Autoconf initialization section.
|
||||
Regroup AM sttaements under the Automake initialization section.
|
||||
Add missing AC_CONFIG_SRCDIR
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit edeb291f81424ec04798618379ad252c122377ec
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Nov 9 17:11:42 2010 -0800
|
||||
|
||||
config: AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 5b4a8121b1cb2c0dc643460ee7c9363dc0d83a38
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Nov 9 17:09:45 2010 -0800
|
||||
|
||||
config: update AC_PREREQ statement to 2.60
|
||||
|
||||
Unrelated to the previous patches, the new value simply reflects
|
||||
the reality that the minimum level for autoconf to configure
|
||||
all x.org modules is 2.60 dated June 2006.
|
||||
|
||||
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit ce3f6a73c2beef0c486575f7797d92b44a718973
|
||||
Author: Jesse Adkins <jesserayadkins@gmail.com>
|
||||
Date: Tue Sep 28 13:29:50 2010 -0700
|
||||
|
||||
Purge cvs tags.
|
||||
|
||||
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 41743c6fbea9f58dff4e9fe200837fe718eefc9d
|
||||
Author: Bryce Harrington <bryce@canonical.com>
|
||||
Date: Tue Aug 10 12:46:14 2010 -0400
|
||||
|
||||
Spelling fix in help docs.
|
||||
|
||||
Reviewed-by: Robert Hooker <sarvatt@ubuntu.com>
|
||||
Signed-off-by: Bryce Harrington <bryce@canonical.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 5948a0e2095c4e032dd93e22a65077ff81288666
|
||||
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
||||
Date: Fri Aug 6 00:26:48 2010 -0500
|
||||
|
||||
Use silent rules
|
||||
|
||||
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit d36afd69f0c5129b6b50c9062257560342d81ebd
|
||||
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
||||
Date: Fri Aug 6 00:26:47 2010 -0500
|
||||
|
||||
Use AC_PROG_SED and MAN_SUBSTS in macros-1.8
|
||||
|
||||
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 0ac4f20a863d69b99193da26d468397827c672a1
|
||||
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
||||
Date: Fri Aug 6 00:26:46 2010 -0500
|
||||
|
||||
Remove unused variable warning with !XF86MISC
|
||||
|
||||
xset.c: In function 'query':
|
||||
xset.c:1317: warning: unused variable 'dummy'
|
||||
|
||||
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit c963b0cb393630962e9094e849b291c539b655ca
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri Aug 6 13:10:36 2010 +1000
|
||||
|
||||
xset 1.2.0
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit fd058da6c1931fa824dd8c07e9130054176fedd7
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
@@ -23,13 +137,6 @@ Date: Fri Mar 26 17:49:09 2010 -0400
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 859a3fb6f3ea901c0dd4f54d87072967d80534e1
|
||||
Merge: 6c4981c a666197
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sun Feb 14 16:13:16 2010 +0100
|
||||
|
||||
Merge remote branch 'origin/master' into obsd
|
||||
|
||||
commit a6661974f8bfc0761e5f4e3a1970448e49ef6032
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Feb 11 10:08:07 2010 -0500
|
||||
@@ -41,13 +148,6 @@ Date: Thu Feb 11 10:08:07 2010 -0500
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 6c4981c33fc5f21b29bafabab5b0c9c2ce1aeb81
|
||||
Merge: e1ec00b 068dd4c
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sat Jan 2 17:26:04 2010 +0100
|
||||
|
||||
Merge remote branch 'origin/master' into obsd
|
||||
|
||||
commit 068dd4ce2ecb8d0225a60c736df8cc102e6edf01
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Mon Dec 21 08:34:37 2009 +1000
|
||||
@@ -73,13 +173,6 @@ Date: Sun Oct 18 17:49:41 2009 +0200
|
||||
Signed-off-by: Simon Thum <simon.thum@gmx.de>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit e1ec00b7c68717e44e774ff7b9c1413a8394a855
|
||||
Merge: 992cbbe ee1e2d0
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sun Dec 20 00:47:30 2009 +0100
|
||||
|
||||
Merge remote branch 'origin/master' into obsd
|
||||
|
||||
commit ee1e2d02454a8e4c36bbda295f6bae639180b9d8
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Nov 26 09:19:54 2009 -0500
|
||||
@@ -89,13 +182,6 @@ Date: Thu Nov 26 09:19:54 2009 -0500
|
||||
Now that the INSTALL file is generated.
|
||||
Allows running make maintainer-clean.
|
||||
|
||||
commit 992cbbe3d1559db0fd49f19a820f31f9e6d746c2
|
||||
Merge: 274520f c4d0fea
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sun Nov 1 17:33:53 2009 +0100
|
||||
|
||||
Merge remote branch 'origin/master' into obsd
|
||||
|
||||
commit 66b43cf00484f8c03bbfc1dafe38a9d9eaf6476b
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Oct 28 14:09:08 2009 -0400
|
||||
@@ -158,13 +244,6 @@ Date: Wed Oct 21 12:47:21 2009 -0700
|
||||
|
||||
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
|
||||
commit 274520f3d6b3a60b9437cb763f3552fbbbd6ed0f
|
||||
Merge: 80a70cb c40fd8f
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Wed Oct 14 23:34:01 2009 +0200
|
||||
|
||||
Merge remote branch 'origin/master' into obsd
|
||||
|
||||
commit c40fd8f7d4b6ffa068fa692134218d8fb3f2a40e
|
||||
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
Date: Tue Oct 13 11:35:08 2009 -0700
|
||||
@@ -173,13 +252,6 @@ Date: Tue Oct 13 11:35:08 2009 -0700
|
||||
|
||||
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
|
||||
commit 80a70cbadb09f92c6af7bd1c9126568481762c68
|
||||
Merge: 74c47be 434c62e
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Fri Sep 25 21:44:10 2009 +0200
|
||||
|
||||
Merge remote branch 'origin/master' into obsd
|
||||
|
||||
commit 434c62e22aeed94b7b84ec613ba066ac6aa7c14b
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Mon Sep 21 15:48:57 2009 -0700
|
||||
@@ -196,13 +268,6 @@ Date: Mon Sep 21 15:42:08 2009 -0700
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 74c47be1613e7231de1a256d433890e9d6f53303
|
||||
Merge: 7ba43f4 3341f13
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sun Jul 5 14:41:57 2009 +0200
|
||||
|
||||
Merge commit 'origin/master' into obsd
|
||||
|
||||
commit 3341f135515f6f2e5b0c40f5ec0a8fb59d4cb1ed
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue Jun 16 16:34:15 2009 -0700
|
||||
@@ -236,13 +301,6 @@ Date: Tue Jun 16 13:14:47 2009 -0700
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 7ba43f4e7e157897f7d86f8dab632a343839a985
|
||||
Merge: 529e4ae 8ce473c
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Fri May 1 18:36:17 2009 +0200
|
||||
|
||||
Merge commit 'origin/master' into obsd
|
||||
|
||||
commit 8ce473c45da07eb82537509a4d14ccb50262bfa7
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Apr 29 13:57:47 2009 -0700
|
||||
@@ -266,25 +324,12 @@ Date: Tue Apr 28 16:11:56 2009 +0200
|
||||
Debian bug#525255 <http://bugs.debian.org/525255>
|
||||
Reported-by: "A. Costa" <agcosta@gis.net>
|
||||
|
||||
commit 529e4ae959c7fa82357c2cd1528fc5f9d64fd1e2
|
||||
Merge: b9d5d73 3d11462
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Wed Feb 4 22:19:56 2009 +0100
|
||||
|
||||
Merge commit 'origin/master' into obsd
|
||||
|
||||
commit 3d1146293d84cecaff18aa44b95539910e24ef11
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Mon Jan 26 18:03:23 2009 -0200
|
||||
|
||||
Correct make distcheck and most sparse warnings.
|
||||
|
||||
commit b9d5d7323cf5f71b81120335bf54a8d51ba279ed
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sat Mar 8 19:24:15 2008 +0100
|
||||
|
||||
BSD Makefile
|
||||
|
||||
commit 9f79fc8957d595cc9f7131ee5230b5bb3aae0679
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Thu Mar 6 17:29:45 2008 -0500
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
#
|
||||
# Copyright 2005 Red Hat, Inc.
|
||||
#
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
# the above copyright notice appear in all copies and that both that
|
||||
@@ -10,7 +10,7 @@
|
||||
# specific, written prior permission. Red Hat makes no
|
||||
# representations about the suitability of this software for any purpose. It
|
||||
# is provided "as is" without express or implied warranty.
|
||||
#
|
||||
#
|
||||
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
@@ -35,7 +35,7 @@ appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
|
||||
EXTRA_DIST = $(appman_PRE)
|
||||
EXTRA_DIST = $(appman_PRE)
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
CLEANFILES = $(appman_DATA)
|
||||
|
||||
@@ -49,26 +49,11 @@ ChangeLog:
|
||||
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
||||
SED = sed
|
||||
|
||||
# Strings to replace in man pages
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
#
|
||||
#
|
||||
# Copyright 2005 Red Hat, Inc.
|
||||
#
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
# the above copyright notice appear in all copies and that both that
|
||||
@@ -26,7 +26,7 @@
|
||||
# specific, written prior permission. Red Hat makes no
|
||||
# representations about the suitability of this software for any purpose. It
|
||||
# is provided "as is" without express or implied warranty.
|
||||
#
|
||||
#
|
||||
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
@@ -158,19 +158,7 @@ MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
OBJEXT = @OBJEXT@
|
||||
@@ -182,7 +170,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
SED = sed
|
||||
SED = @SED@
|
||||
SET_FONTCACHE_CFLAGS = @SET_FONTCACHE_CFLAGS@
|
||||
SET_FONTCACHE_LIBS = @SET_FONTCACHE_LIBS@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
@@ -253,7 +241,7 @@ appman_PRE = \
|
||||
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
EXTRA_DIST = $(appman_PRE)
|
||||
EXTRA_DIST = $(appman_PRE)
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
CLEANFILES = $(appman_DATA)
|
||||
|
||||
@@ -673,7 +661,7 @@ ChangeLog:
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
119
app/xset/aclocal.m4
vendored
119
app/xset/aclocal.m4
vendored
@@ -498,18 +498,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
||||
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
|
||||
])
|
||||
|
||||
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
||||
# serial 8
|
||||
|
||||
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
|
||||
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
||||
|
||||
# Do all the work for Automake. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
@@ -997,7 +985,7 @@ AC_SUBST([am__untar])
|
||||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
|
||||
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl
|
||||
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
||||
dnl copy of this software and associated documentation files (the "Software"),
|
||||
@@ -1034,7 +1022,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.10.0])
|
||||
m4_define([vers_have], [1.11.0])
|
||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||
@@ -1185,6 +1173,7 @@ MAN_SUBSTS="\
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|\$(prefix)|g' \
|
||||
-e 's|__apploaddir__|\$(appdefaultdir)|g' \
|
||||
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
|
||||
@@ -1342,15 +1331,17 @@ AC_SUBST(MAKE_PDF)
|
||||
AC_SUBST(MAKE_HTML)
|
||||
]) # XORG_CHECK_DOCBOOK
|
||||
|
||||
# XORG_WITH_XMLTO([MIN-VERSION])
|
||||
# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.5.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-xmlto option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the xmlto package.
|
||||
# as whether or not to use the xmlto package. When DEFAULT is not specified,
|
||||
# --with-xmlto assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_XMLTO: used in makefiles to conditionally generate documentation
|
||||
@@ -1367,10 +1358,12 @@ AC_SUBST(MAKE_HTML)
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_XMLTO],[
|
||||
AC_ARG_VAR([XMLTO], [Path to xmlto command])
|
||||
m4_define([_defopt], m4_default([$2], [auto]))
|
||||
AC_ARG_WITH(xmlto,
|
||||
AS_HELP_STRING([--with-xmlto],
|
||||
[Use xmlto to regenerate documentation (default: yes, if installed)]),
|
||||
[use_xmlto=$withval], [use_xmlto=auto])
|
||||
[Use xmlto to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_xmlto=$withval], [use_xmlto=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_xmlto" = x"auto"; then
|
||||
AC_PATH_PROG([XMLTO], [xmlto])
|
||||
@@ -1424,15 +1417,17 @@ AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
|
||||
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
]) # XORG_WITH_XMLTO
|
||||
|
||||
# XORG_WITH_ASCIIDOC([MIN-VERSION])
|
||||
# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.5.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-asciidoc option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the asciidoc package.
|
||||
# as whether or not to use the asciidoc package. When DEFAULT is not specified,
|
||||
# --with-asciidoc assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
|
||||
@@ -1445,10 +1440,12 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_ASCIIDOC],[
|
||||
AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
|
||||
m4_define([_defopt], m4_default([$2], [auto]))
|
||||
AC_ARG_WITH(asciidoc,
|
||||
AS_HELP_STRING([--with-asciidoc],
|
||||
[Use asciidoc to regenerate documentation (default: yes, if installed)]),
|
||||
[use_asciidoc=$withval], [use_asciidoc=auto])
|
||||
[Use asciidoc to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_asciidoc=$withval], [use_asciidoc=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_asciidoc" = x"auto"; then
|
||||
AC_PATH_PROG([ASCIIDOC], [asciidoc])
|
||||
@@ -1489,15 +1486,17 @@ fi])
|
||||
AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
]) # XORG_WITH_ASCIIDOC
|
||||
|
||||
# XORG_WITH_DOXYGEN([MIN-VERSION])
|
||||
# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
|
||||
# --------------------------------
|
||||
# Minimum version: 1.5.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-doxygen option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the doxygen package.
|
||||
# as whether or not to use the doxygen package. When DEFAULT is not specified,
|
||||
# --with-doxygen assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
|
||||
@@ -1510,10 +1509,12 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_DOXYGEN],[
|
||||
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
|
||||
m4_define([_defopt], m4_default([$2], [auto]))
|
||||
AC_ARG_WITH(doxygen,
|
||||
AS_HELP_STRING([--with-doxygen],
|
||||
[Use doxygen to regenerate documentation (default: yes, if installed)]),
|
||||
[use_doxygen=$withval], [use_doxygen=auto])
|
||||
[Use doxygen to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_doxygen=$withval], [use_doxygen=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_doxygen" = x"auto"; then
|
||||
AC_PATH_PROG([DOXYGEN], [doxygen])
|
||||
@@ -1554,15 +1555,17 @@ fi])
|
||||
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
||||
]) # XORG_WITH_DOXYGEN
|
||||
|
||||
# XORG_WITH_GROFF
|
||||
# XORG_WITH_GROFF([DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-groff option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the groff package.
|
||||
# as whether or not to use the groff package. When DEFAULT is not specified,
|
||||
# --with-groff assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_GROFF: used in makefiles to conditionally generate documentation
|
||||
@@ -1591,10 +1594,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_GROFF],[
|
||||
AC_ARG_VAR([GROFF], [Path to groff command])
|
||||
m4_define([_defopt], m4_default([$1], [auto]))
|
||||
AC_ARG_WITH(groff,
|
||||
AS_HELP_STRING([--with-groff],
|
||||
[Use groff to regenerate documentation (default: yes, if installed)]),
|
||||
[use_groff=$withval], [use_groff=auto])
|
||||
[Use groff to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_groff=$withval], [use_groff=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_groff" = x"auto"; then
|
||||
AC_PATH_PROG([GROFF], [groff])
|
||||
@@ -1657,15 +1662,17 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
|
||||
AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
|
||||
]) # XORG_WITH_GROFF
|
||||
|
||||
# XORG_WITH_FOP
|
||||
# XORG_WITH_FOP([DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-fop option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the fop package.
|
||||
# as whether or not to use the fop package. When DEFAULT is not specified,
|
||||
# --with-fop assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_FOP: used in makefiles to conditionally generate documentation
|
||||
@@ -1678,10 +1685,12 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_FOP],[
|
||||
AC_ARG_VAR([FOP], [Path to fop command])
|
||||
m4_define([_defopt], m4_default([$1], [auto]))
|
||||
AC_ARG_WITH(fop,
|
||||
AS_HELP_STRING([--with-fop],
|
||||
[Use fop to regenerate documentation (default: yes, if installed)]),
|
||||
[use_fop=$withval], [use_fop=auto])
|
||||
[Use fop to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_fop=$withval], [use_fop=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_fop" = x"auto"; then
|
||||
AC_PATH_PROG([FOP], [fop])
|
||||
@@ -1708,15 +1717,17 @@ fi
|
||||
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
|
||||
]) # XORG_WITH_FOP
|
||||
|
||||
# XORG_WITH_PS2PDF
|
||||
# XORG_WITH_PS2PDF([DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the ps2pdf package.
|
||||
# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
|
||||
# --with-ps2pdf assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_PS2PDF: used in makefiles to conditionally generate documentation
|
||||
@@ -1729,10 +1740,12 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_PS2PDF],[
|
||||
AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
|
||||
m4_define([_defopt], m4_default([$1], [auto]))
|
||||
AC_ARG_WITH(ps2pdf,
|
||||
AS_HELP_STRING([--with-ps2pdf],
|
||||
[Use ps2pdf to regenerate documentation (default: yes, if installed)]),
|
||||
[use_ps2pdf=$withval], [use_ps2pdf=auto])
|
||||
[Use ps2pdf to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_ps2pdf=$withval], [use_ps2pdf=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_ps2pdf" = x"auto"; then
|
||||
AC_PATH_PROG([PS2PDF], [ps2pdf])
|
||||
@@ -1783,14 +1796,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_DOCS],[
|
||||
default=$1
|
||||
if test "x$default" = x ; then
|
||||
default="yes"
|
||||
fi
|
||||
m4_define([default], m4_default([$1], [yes]))
|
||||
AC_ARG_ENABLE(docs,
|
||||
AS_HELP_STRING([--enable-docs],
|
||||
[Enable building the documentation (default: yes)]),
|
||||
[build_docs=$enableval], [build_docs=$default])
|
||||
[Enable building the documentation (default: ]default[)]),
|
||||
[build_docs=$enableval], [build_docs=]default)
|
||||
m4_undefine([default])
|
||||
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
|
||||
AC_MSG_CHECKING([whether to build documentation])
|
||||
AC_MSG_RESULT([$build_docs])
|
||||
@@ -1818,14 +1829,12 @@ AC_MSG_RESULT([$build_docs])
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
|
||||
devel_default=$1
|
||||
if test "x$devel_default" = x ; then
|
||||
devel_default="yes"
|
||||
fi
|
||||
m4_define([devel_default], m4_default([$1], [yes]))
|
||||
AC_ARG_ENABLE(devel-docs,
|
||||
AS_HELP_STRING([--enable-devel-docs],
|
||||
[Enable building the developer documentation (default: yes)]),
|
||||
[build_devel_docs=$enableval], [build_devel_docs=$devel_default])
|
||||
[Enable building the developer documentation (default: ]devel_default[)]),
|
||||
[build_devel_docs=$enableval], [build_devel_docs=]devel_default)
|
||||
m4_undefine([devel_default])
|
||||
AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
|
||||
AC_MSG_CHECKING([whether to build developer documentation])
|
||||
AC_MSG_RESULT([$build_devel_docs])
|
||||
@@ -1853,14 +1862,12 @@ AC_MSG_RESULT([$build_devel_docs])
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_SPECS],[
|
||||
spec_default=$1
|
||||
if test "x$spec_default" = x ; then
|
||||
spec_default="yes"
|
||||
fi
|
||||
m4_define([spec_default], m4_default([$1], [yes]))
|
||||
AC_ARG_ENABLE(specs,
|
||||
AS_HELP_STRING([--enable-specs],
|
||||
[Enable building the specs (default: yes)]),
|
||||
[build_specs=$enableval], [build_specs=$spec_default])
|
||||
[Enable building the specs (default: ]spec_default[)]),
|
||||
[build_specs=$enableval], [build_specs=]spec_default)
|
||||
m4_undefine([spec_default])
|
||||
AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
|
||||
AC_MSG_CHECKING([whether to build functional specifications])
|
||||
AC_MSG_RESULT([$build_specs])
|
||||
|
||||
933
app/xset/configure
vendored
933
app/xset/configure
vendored
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
||||
dnl Copyright 2005 Red Hat, Inc.
|
||||
dnl
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
dnl documentation for any purpose is hereby granted without fee, provided that
|
||||
dnl the above copyright notice appear in all copies and that both that
|
||||
@@ -9,7 +9,7 @@ dnl advertising or publicity pertaining to distribution of the software without
|
||||
dnl specific, written prior permission. Red Hat makes no
|
||||
dnl representations about the suitability of this software for any purpose. It
|
||||
dnl is provided "as is" without express or implied warranty.
|
||||
dnl
|
||||
dnl
|
||||
dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
@@ -20,21 +20,22 @@ dnl PERFORMANCE OF THIS SOFTWARE.
|
||||
dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(xset,[1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset)
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xset], [1.2.1],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xset])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
# Initialize Automake
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
# Require xorg-macros: XORG_MANPAGE_SECTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.3)
|
||||
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.8)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
|
||||
|
||||
# Checks for system functions
|
||||
AC_CHECK_FUNCS([usleep])
|
||||
@@ -51,16 +52,16 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
|
||||
AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
|
||||
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
|
||||
|
||||
PKG_CHECK_MODULES(SET_XKB, x11,
|
||||
PKG_CHECK_MODULES(SET_XKB, x11,
|
||||
[SAVE_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
|
||||
AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
|
||||
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
|
||||
|
||||
AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]),
|
||||
AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]),
|
||||
[USE_XF86MISC="$withval"], [USE_XF86MISC="yes"])
|
||||
if test "x$USE_XF86MISC" != "xno" ; then
|
||||
PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
|
||||
PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
|
||||
[SAVE_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $SET_XF86MISC_CFLAGS $SET_X11_CFLAGS"
|
||||
AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/xf86mscstr.h],,,
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
/*
|
||||
* $Xorg: xset.c,v 1.6 2001/02/09 02:05:58 xorgcvs Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
Copyright 1985, 1998 The Open Group
|
||||
@@ -27,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/programs/xset/xset.c,v 3.31 2003/05/27 22:27:09 tsi Exp $ */
|
||||
/* Modified by Stephen so keyboard rate is set using XKB extensions */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@@ -573,7 +568,7 @@ main(int argc, char *argv[])
|
||||
*
|
||||
* On OS/2, use _sleep2()
|
||||
*/
|
||||
|
||||
|
||||
#ifdef HAVE_USLEEP
|
||||
# define Usleep(us) usleep((us))
|
||||
#else
|
||||
@@ -934,7 +929,7 @@ set_font_path(Display *dpy, char *path, int special, int before, int after)
|
||||
}
|
||||
|
||||
/*
|
||||
* parse the path list. If before or after is non-zero, we'll need
|
||||
* parse the path list. If before or after is non-zero, we'll need
|
||||
* the current value.
|
||||
*/
|
||||
|
||||
@@ -1314,7 +1309,6 @@ query(Display *dpy)
|
||||
XKeyboardState values;
|
||||
int acc_num, acc_denom, threshold;
|
||||
int timeout, interval, prefer_blank, allow_exp;
|
||||
int dummy;
|
||||
|
||||
#ifdef XF86MISC
|
||||
XF86MiscKbdSettings kbdinfo;
|
||||
@@ -1425,10 +1419,14 @@ query(Display *dpy)
|
||||
#endif
|
||||
#endif
|
||||
#ifdef XF86MISC
|
||||
if (XF86MiscQueryExtension(dpy, &dummy, &dummy) &&
|
||||
XF86MiscGetKbdSettings(dpy, &kbdinfo))
|
||||
printf(" auto repeat delay: %d repeat rate: %d\n",
|
||||
kbdinfo.delay, kbdinfo.rate);
|
||||
{
|
||||
int dummy;
|
||||
|
||||
if (XF86MiscQueryExtension(dpy, &dummy, &dummy) &&
|
||||
XF86MiscGetKbdSettings(dpy, &kbdinfo))
|
||||
printf(" auto repeat delay: %d repeat rate: %d\n",
|
||||
kbdinfo.delay, kbdinfo.rate);
|
||||
}
|
||||
#endif
|
||||
printf(" auto repeating keys: ");
|
||||
for (i = 0; i < 4; i++) {
|
||||
@@ -1657,8 +1655,8 @@ usage(char *fmt, ...)
|
||||
#ifdef FONTCACHE
|
||||
fprintf(stderr, " To control font cache:\n");
|
||||
fprintf(stderr, "\t fc [hi-mark [low-mark [balance]]]\n");
|
||||
fprintf(stderr, "\t both mark values spcecified in KB\n");
|
||||
fprintf(stderr, "\t balance value spcecified in percent (10 - 90)\n");
|
||||
fprintf(stderr, "\t both mark values specified in KB\n");
|
||||
fprintf(stderr, "\t balance value specified in percent (10 - 90)\n");
|
||||
fprintf(stderr, " Show font cache statistics:\n");
|
||||
fprintf(stderr, "\t fc s\n");
|
||||
#endif
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
.\" $Xorg: xset.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $
|
||||
.\" Copyright 1988, 1998 The Open Group
|
||||
.\"
|
||||
.\"
|
||||
.\" Permission to use, copy, modify, distribute, and sell this software and its
|
||||
.\" documentation for any purpose is hereby granted without fee, provided that
|
||||
.\" the above copyright notice appear in all copies and that both that
|
||||
.\" copyright notice and this permission notice appear in supporting
|
||||
.\" documentation.
|
||||
.\"
|
||||
.\"
|
||||
.\" The above copyright notice and this permission notice 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.
|
||||
@@ -17,14 +16,12 @@
|
||||
.\" 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.
|
||||
.\"
|
||||
.\"
|
||||
.\" Except as contained in this notice, the name of The Open Group shall
|
||||
.\" not be used in advertising or otherwise to promote the sale, use or
|
||||
.\" other dealings in this Software without prior written authorization
|
||||
.\" from The Open Group.
|
||||
.\"
|
||||
.\" $XFree86: xc/programs/xset/xset.man,v 3.14 2001/12/14 20:02:22 dawes Exp $
|
||||
.\"
|
||||
.\"
|
||||
.TH XSET 1 __xorgversion__
|
||||
.SH NAME
|
||||
xset - user preference utility for X
|
||||
@@ -40,27 +37,27 @@ xset - user preference utility for X
|
||||
.br
|
||||
[+dpms] [-dpms]
|
||||
.br
|
||||
[dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]]
|
||||
[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]
|
||||
[fp=\fIpathlist\fP]
|
||||
[-fp=\fIpathlist\fP]
|
||||
[+fp=\fIpathlist\fP]
|
||||
[fp-\fIpathlist\fP]
|
||||
[fp+\fIpathlist\fP]
|
||||
.br
|
||||
[fp default] [fp rehash]
|
||||
.br
|
||||
[-led [\fIinteger\fP|named \fIindicator\fP]]
|
||||
[led [\fIinteger\fP|named \fIindicator\fP]]
|
||||
.br
|
||||
.br
|
||||
[led {on|off}]
|
||||
.br
|
||||
[mouse [\fIaccel_mult\fP[/\fIaccel_div\fP] [\fIthreshold\fP]]] [mouse default]
|
||||
.br
|
||||
[p \fIpixel\fP \fIcolor\fP]
|
||||
.br
|
||||
[-r [keycode]] [r [keycode]]
|
||||
[-r [keycode]] [r [keycode]]
|
||||
[r {on|off}] [r rate \fIdelay\fP [\fIrate\fP]]
|
||||
.br
|
||||
[s [\fIlength\fP [\fIperiod\fP]]] [s {blank|noblank}]
|
||||
@@ -163,8 +160,8 @@ font path. They must be followed by a comma-separated list of entries.
|
||||
.PP
|
||||
.TP 8
|
||||
.B "\+fp \fRor\fP fp\+"
|
||||
This \fB\+fp\fP and \fBfp\+\fP options prepend and append elements to the
|
||||
current font path, respectively. They must be followed by a comma-separated
|
||||
This \fB\+fp\fP and \fBfp\+\fP options prepend and append elements to the
|
||||
current font path, respectively. They must be followed by a comma-separated
|
||||
list of entries.
|
||||
.PP
|
||||
.TP 8
|
||||
@@ -200,7 +197,7 @@ will go `acceleration' times as fast when the device travels more than
|
||||
transition range. This way, the pointing device can be used for precise
|
||||
alignment when it is moved slowly, yet it can be set to travel across
|
||||
the screen in a flick of the wrist when desired. One or both
|
||||
parameters for the
|
||||
parameters for the
|
||||
.B m
|
||||
option can be omitted, but if only one is
|
||||
given, it will be interpreted as the acceleration.
|
||||
@@ -243,14 +240,14 @@ if it makes sense for the particular keycode. Keycodes below 8 are
|
||||
not typically valid for this command. Example: "\fBxset\ -r\ 10\fP" will
|
||||
disable autorepeat for the "1" key on the top row of an IBM PC keyboard.
|
||||
|
||||
If the server supports the XFree86-Misc extension, or the XKB extension,
|
||||
If the server supports the XFree86-Misc extension, or the XKB extension,
|
||||
then a parameter
|
||||
of 'rate' is accepted and should be followed by zero, one or two numeric
|
||||
values. The first specifies the delay before autorepeat starts and
|
||||
the second specifies the repeat rate. In the case that the server
|
||||
supports the XKB extension, the delay is the number of milliseconds
|
||||
before autorepeat starts, and the rate is the number of repeats
|
||||
per second. If the rate or delay is not given, it will be set
|
||||
per second. If the rate or delay is not given, it will be set
|
||||
to the default value.
|
||||
.PP
|
||||
.TP 8
|
||||
|
||||
Reference in New Issue
Block a user