xrandr 1.3.2
This commit is contained in:
Brice Goglin
parent
145d78caf6
commit
1ef8b969a4
|
|
@ -5,10 +5,11 @@ x11-xserver-utils (7.4+3) UNRELEASED; urgency=low
|
|||
* Add README.source from xsfbs, and bump Standards-Version to 3.8.2.
|
||||
|
||||
[ Brice Goglin ]
|
||||
* xrandr 1.3.2.
|
||||
* Suggests: xorg-docs-core since some manpages reference it in their
|
||||
SEE ALSO section. Thanks Vincent Lefevre. Closes: #541220.
|
||||
|
||||
-- Brice Goglin <bgoglin@debian.org> Thu, 20 Aug 2009 09:00:06 +0200
|
||||
-- Brice Goglin <bgoglin@debian.org> Fri, 11 Sep 2009 21:55:44 +0200
|
||||
|
||||
x11-xserver-utils (7.4+2) unstable; urgency=low
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,98 @@
|
|||
commit 5da0cb3533aa829588b2e6d715d511691fa1e45f
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Thu Sep 10 13:18:35 2009 +0200
|
||||
|
||||
Bump to 1.3.2
|
||||
|
||||
commit e5861530a6c3bb6219217e5f3ddc71f13b9509c4
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Thu Sep 10 13:17:56 2009 +0200
|
||||
|
||||
Add missing 'static's to get rid of warnings.
|
||||
|
||||
commit ab875be43651befa654a24719f1ea365dde09073
|
||||
Author: Bart Massey <bart@cs.pdx.edu>
|
||||
Date: Thu Feb 7 14:03:24 2008 -0800
|
||||
|
||||
changed a bunch of string to number conversions for reliability
|
||||
|
||||
commit 25325aae2e80cb33af17682a6cd1bcd292a5f445
|
||||
Author: Bart Massey <bart@cs.pdx.edu>
|
||||
Date: Fri Sep 4 15:36:51 2009 +0200
|
||||
|
||||
Warn if one of the outputs given did not exist
|
||||
|
||||
commit 713a8ea5646f7c893b52afeb3c2443b21b837e46
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Tue Aug 11 16:11:39 2009 +0200
|
||||
|
||||
Bump to 1.3.1
|
||||
|
||||
Also finally bump xrandr requirement to 1.3
|
||||
|
||||
commit b9166441bdb08ef76b9c6712da5902b0dcbf03f3
|
||||
Author: Federico Mena Quintero <federico@novell.com>
|
||||
Date: Mon Jul 20 16:44:52 2009 -0500
|
||||
|
||||
bfo#22864 - grab the server around all modifications to CRTCs
|
||||
|
||||
We were not grabbed while disabling the CRTCs that should be off, so other clients could think
|
||||
that there was an intermediate stage with no enabled outputs.
|
||||
|
||||
Signed-off-by: Federico Mena Quintero <federico@novell.com>
|
||||
|
||||
commit 68d5134142e3c616f3996c7ea8d08c887ce56118
|
||||
Author: Éric Piel <E.A.B.Piel@tudelft.nl>
|
||||
Date: Tue Jul 14 21:36:32 2009 +0200
|
||||
|
||||
xrandr: Document --nograb option
|
||||
|
||||
Op 08-07-09 15:19, Matthias Hopf schreef:
|
||||
> On Jul 07, 09 22:02:51 +0200, Éric Piel wrote:
|
||||
>> Op 21-05-09 13:23, Éric Piel schreef:
|
||||
>>> This documents the --nograb option with whichever I could understand of
|
||||
>>> the advantages and drawbacks of grabbing the screen.
|
||||
>>>
|
||||
>>> Also fixes the formatting in the xrandr 1.3 options.
|
||||
>> Please review and apply.
|
||||
>
|
||||
> Please resend as attachment.
|
||||
>
|
||||
Please find attached the git patch.
|
||||
|
||||
Thanks,
|
||||
Eric
|
||||
|
||||
>From 34e7c1036ba0e0d7827563deaffea9371031fa0b Mon Sep 17 00:00:00 2001
|
||||
From: Eric Piel <eric.piel@tremplin-utc.net>
|
||||
Date: Thu, 21 May 2009 13:01:52 +0200
|
||||
Subject: [PATCH] xrandr: Document --nograb option
|
||||
|
||||
This documents the --nograb option with whichever I could understand of
|
||||
the advantages and drawback of grabbing the screen.
|
||||
|
||||
Also fixes the formatting in the xrandr 1.3 options
|
||||
|
||||
commit 73e38a31e5b7c68f8f3227a47d98ec55097999c7
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Mon Jul 6 18:30:05 2009 +0200
|
||||
|
||||
Fix missing prototype warning.
|
||||
|
||||
commit 3408ca77af6a45b15b89bdd1ce9d5aac9646f6b8
|
||||
Author: Matthias Hopf <mhopf@suse.de>
|
||||
Date: Mon Jul 6 18:28:23 2009 +0200
|
||||
|
||||
Report program version as well with --version.
|
||||
|
||||
This has bitten us too often already (the infamous uncloning bug).
|
||||
|
||||
commit 47502f66f7c51ad575d63f28de49f285c4de7062
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed Apr 1 11:03:10 2009 -0400
|
||||
|
||||
xrandr 1.3.0
|
||||
|
||||
commit beb228842c77fab4a446e028dd501a01f0fb3fd3
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Tue Feb 17 13:45:32 2009 -0500
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.10.2 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
|
@ -399,7 +399,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
$(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
mkid -fID $$unique
|
||||
tags: TAGS
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,10 +1,10 @@
|
|||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
# Inc.
|
||||
|
||||
timestamp='2008-11-15'
|
||||
timestamp='2006-07-02'
|
||||
|
||||
# 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
|
||||
|
|
@ -56,8 +56,8 @@ version="\
|
|||
GNU config.guess ($timestamp)
|
||||
|
||||
Originally written by Per Bothner.
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
|
|
@ -139,6 +139,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
|||
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
||||
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
||||
|
||||
case "${UNAME_MACHINE}" in
|
||||
i?86)
|
||||
test -z "$VENDOR" && VENDOR=pc
|
||||
;;
|
||||
*)
|
||||
test -z "$VENDOR" && VENDOR=unknown
|
||||
;;
|
||||
esac
|
||||
test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
|
||||
|
||||
# Note: order is significant - the case branches are not exclusive.
|
||||
|
||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
|
|
@ -161,7 +171,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
arm*) machine=arm-unknown ;;
|
||||
sh3el) machine=shl-unknown ;;
|
||||
sh3eb) machine=sh-unknown ;;
|
||||
sh5el) machine=sh5le-unknown ;;
|
||||
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
||||
esac
|
||||
# The Operating System including object format, if it has switched
|
||||
|
|
@ -330,21 +339,8 @@ 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.*:* | i86xen:SunOS:5.*:*)
|
||||
eval $set_cc_for_build
|
||||
SUN_ARCH="i386"
|
||||
# If there is a compiler, see if it is configured for 64-bit objects.
|
||||
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
|
||||
# This test works for both compilers.
|
||||
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||
if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \
|
||||
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||
grep IS_64BIT_ARCH >/dev/null
|
||||
then
|
||||
SUN_ARCH="x86_64"
|
||||
fi
|
||||
fi
|
||||
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
i86pc:SunOS:5.*:*)
|
||||
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
sun4*:SunOS:6*:*)
|
||||
# According to config.sub, this is the proper way to canonicalize
|
||||
|
|
@ -545,7 +541,7 @@ EOF
|
|||
echo rs6000-ibm-aix3.2
|
||||
fi
|
||||
exit ;;
|
||||
*:AIX:*:[456])
|
||||
*:AIX:*:[45])
|
||||
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
||||
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
||||
IBM_ARCH=rs6000
|
||||
|
|
@ -794,7 +790,7 @@ EOF
|
|||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit ;;
|
||||
*:MINGW*:*)
|
||||
i*:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit ;;
|
||||
i*:windows32*:*)
|
||||
|
|
@ -804,18 +800,12 @@ EOF
|
|||
i*:PW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-pw32
|
||||
exit ;;
|
||||
*:Interix*:[3456]*)
|
||||
case ${UNAME_MACHINE} in
|
||||
x86)
|
||||
echo i586-pc-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
EM64T | authenticamd | genuineintel)
|
||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
IA64)
|
||||
echo ia64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
esac ;;
|
||||
x86:Interix*:[3456]*)
|
||||
echo i586-pc-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
EM64T:Interix*:[3456]*)
|
||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
echo i${UNAME_MACHINE}-pc-mks
|
||||
exit ;;
|
||||
|
|
@ -849,14 +839,7 @@ EOF
|
|||
echo ${UNAME_MACHINE}-pc-minix
|
||||
exit ;;
|
||||
arm*:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ARM_EABI__
|
||||
then
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
else
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
||||
fi
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
avr32*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
|
|
@ -868,16 +851,16 @@ EOF
|
|||
echo crisv32-axis-linux-gnu
|
||||
exit ;;
|
||||
frv:Linux:*:*)
|
||||
echo frv-unknown-linux-gnu
|
||||
echo frv-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
ia64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
m32r*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
m68*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
mips:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
|
|
@ -900,7 +883,7 @@ EOF
|
|||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
|
||||
;;
|
||||
mips64:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
|
|
@ -923,16 +906,16 @@ EOF
|
|||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
|
||||
;;
|
||||
or32:Linux:*:*)
|
||||
echo or32-unknown-linux-gnu
|
||||
echo or32-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
ppc:Linux:*:*)
|
||||
echo powerpc-unknown-linux-gnu
|
||||
echo powerpc-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
ppc64:Linux:*:*)
|
||||
echo powerpc64-unknown-linux-gnu
|
||||
echo powerpc64-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
alpha:Linux:*:*)
|
||||
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
||||
|
|
@ -946,42 +929,36 @@ EOF
|
|||
esac
|
||||
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
||||
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
||||
exit ;;
|
||||
padre:Linux:*:*)
|
||||
echo sparc-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
|
||||
exit ;;
|
||||
parisc:Linux:*:* | hppa:Linux:*:*)
|
||||
# Look for CPU level
|
||||
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
||||
PA7*) echo hppa1.1-unknown-linux-gnu ;;
|
||||
PA8*) echo hppa2.0-unknown-linux-gnu ;;
|
||||
*) echo hppa-unknown-linux-gnu ;;
|
||||
PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
|
||||
PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
|
||||
*) echo hppa-${VENDOR}-linux-gnu ;;
|
||||
esac
|
||||
exit ;;
|
||||
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
||||
echo hppa64-unknown-linux-gnu
|
||||
echo hppa64-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
s390:Linux:*:* | s390x:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-ibm-linux
|
||||
exit ;;
|
||||
sh64*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
sh*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
vax:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-dec-linux-gnu
|
||||
exit ;;
|
||||
x86_64:Linux:*:*)
|
||||
echo x86_64-unknown-linux-gnu
|
||||
exit ;;
|
||||
xtensa*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo x86_64-${VENDOR}-linux-gnu
|
||||
exit ;;
|
||||
i*86:Linux:*:*)
|
||||
# The BFD linker knows what the default object file format is, so
|
||||
|
|
@ -996,15 +973,18 @@ EOF
|
|||
p'`
|
||||
case "$ld_supported_targets" in
|
||||
elf32-i386)
|
||||
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
||||
TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
|
||||
;;
|
||||
a.out-i386-linux)
|
||||
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
||||
echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
|
||||
exit ;;
|
||||
coff-i386)
|
||||
echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
|
||||
exit ;;
|
||||
"")
|
||||
# Either a pre-BFD a.out linker (linux-gnuoldld) or
|
||||
# one that does not give us useful --help.
|
||||
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
|
||||
echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
|
||||
exit ;;
|
||||
esac
|
||||
# Determine whether the default compiler is a.out or elf
|
||||
|
|
@ -1038,7 +1018,7 @@ EOF
|
|||
p
|
||||
}'`"
|
||||
test x"${LIBC}" != x && {
|
||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||
echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
|
||||
exit
|
||||
}
|
||||
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
|
||||
|
|
@ -1229,9 +1209,6 @@ EOF
|
|||
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
||||
echo i586-pc-beos
|
||||
exit ;;
|
||||
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
|
||||
echo i586-pc-haiku
|
||||
exit ;;
|
||||
SX-4:SUPER-UX:*:*)
|
||||
echo sx4-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
|
|
@ -1241,15 +1218,6 @@ EOF
|
|||
SX-6:SUPER-UX:*:*)
|
||||
echo sx6-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-7:SUPER-UX:*:*)
|
||||
echo sx7-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-8:SUPER-UX:*:*)
|
||||
echo sx8-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-8R:SUPER-UX:*:*)
|
||||
echo sx8r-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
Power*:Rhapsody:*:*)
|
||||
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||
exit ;;
|
||||
|
|
@ -1500,9 +1468,9 @@ This script, last modified $timestamp, has failed to recognize
|
|||
the operating system you are using. It is advised that you
|
||||
download the most up to date version of the config scripts from
|
||||
|
||||
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
||||
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
|
||||
and
|
||||
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
|
||||
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
|
||||
|
||||
If the version you run ($0) is already up to date, please
|
||||
send the following data and any information you think might be
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
# Inc.
|
||||
|
||||
timestamp='2008-09-08'
|
||||
timestamp='2006-09-20'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
|
|
@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
|
|||
version="\
|
||||
GNU config.sub ($timestamp)
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
|
|
@ -245,19 +245,17 @@ case $basic_machine in
|
|||
| bfin \
|
||||
| c4x | clipper \
|
||||
| d10v | d30v | dlx | dsp16xx \
|
||||
| fido | fr30 | frv \
|
||||
| fr30 | frv \
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||
| maxq | mb | microblaze | mcore | mep | metag \
|
||||
| maxq | mb | microblaze | mcore \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
| mips64octeon | mips64octeonel \
|
||||
| mips64orion | mips64orionel \
|
||||
| mips64r5900 | mips64r5900el \
|
||||
| mips64vr | mips64vrel \
|
||||
| mips64orion | mips64orionel \
|
||||
| mips64vr4100 | mips64vr4100el \
|
||||
| mips64vr4300 | mips64vr4300el \
|
||||
| mips64vr5000 | mips64vr5000el \
|
||||
|
|
@ -288,7 +286,7 @@ case $basic_machine in
|
|||
| v850 | v850e \
|
||||
| we32k \
|
||||
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
| z8k | z80)
|
||||
| z8k)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m6811 | m68hc11 | m6812 | m68hc12)
|
||||
|
|
@ -326,21 +324,19 @@ case $basic_machine in
|
|||
| clipper-* | craynv-* | cydra-* \
|
||||
| d10v-* | d30v-* | dlx-* \
|
||||
| elxsi-* \
|
||||
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
||||
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
|
||||
| h8300-* | h8500-* \
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
| m32c-* | m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* \
|
||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||
| mips16-* \
|
||||
| mips64-* | mips64el-* \
|
||||
| mips64octeon-* | mips64octeonel-* \
|
||||
| mips64orion-* | mips64orionel-* \
|
||||
| mips64r5900-* | mips64r5900el-* \
|
||||
| mips64vr-* | mips64vrel-* \
|
||||
| mips64orion-* | mips64orionel-* \
|
||||
| mips64vr4100-* | mips64vr4100el-* \
|
||||
| mips64vr4300-* | mips64vr4300el-* \
|
||||
| mips64vr5000-* | mips64vr5000el-* \
|
||||
|
|
@ -368,18 +364,14 @@ case $basic_machine in
|
|||
| sparclite-* \
|
||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
||||
| tahoe-* | thumb-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||
| tron-* \
|
||||
| v850-* | v850e-* | vax-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
| xstormy16-* | xtensa*-* \
|
||||
| xstormy16-* | xtensa-* \
|
||||
| ymp-* \
|
||||
| z8k-* | z80-*)
|
||||
;;
|
||||
# Recognize the basic CPU types without company name, with glob match.
|
||||
xtensa*)
|
||||
basic_machine=$basic_machine-unknown
|
||||
| z8k-*)
|
||||
;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
|
|
@ -451,22 +443,10 @@ case $basic_machine in
|
|||
basic_machine=ns32k-sequent
|
||||
os=-dynix
|
||||
;;
|
||||
blackfin)
|
||||
basic_machine=bfin-unknown
|
||||
os=-linux
|
||||
;;
|
||||
blackfin-*)
|
||||
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
c90)
|
||||
basic_machine=c90-cray
|
||||
os=-unicos
|
||||
;;
|
||||
cegcc)
|
||||
basic_machine=arm-unknown
|
||||
os=-cegcc
|
||||
;;
|
||||
convex-c1)
|
||||
basic_machine=c1-convex
|
||||
os=-bsd
|
||||
|
|
@ -495,8 +475,8 @@ case $basic_machine in
|
|||
basic_machine=craynv-cray
|
||||
os=-unicosmp
|
||||
;;
|
||||
cr16)
|
||||
basic_machine=cr16-unknown
|
||||
cr16c)
|
||||
basic_machine=cr16c-unknown
|
||||
os=-elf
|
||||
;;
|
||||
crds | unos)
|
||||
|
|
@ -534,10 +514,6 @@ case $basic_machine in
|
|||
basic_machine=m88k-motorola
|
||||
os=-sysv3
|
||||
;;
|
||||
dicos)
|
||||
basic_machine=i686-pc
|
||||
os=-dicos
|
||||
;;
|
||||
djgpp)
|
||||
basic_machine=i586-pc
|
||||
os=-msdosdjgpp
|
||||
|
|
@ -692,14 +668,6 @@ case $basic_machine in
|
|||
basic_machine=m68k-isi
|
||||
os=-sysv
|
||||
;;
|
||||
m68knommu)
|
||||
basic_machine=m68k-unknown
|
||||
os=-linux
|
||||
;;
|
||||
m68knommu-*)
|
||||
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
m88k-omron*)
|
||||
basic_machine=m88k-omron
|
||||
;;
|
||||
|
|
@ -715,10 +683,6 @@ case $basic_machine in
|
|||
basic_machine=i386-pc
|
||||
os=-mingw32
|
||||
;;
|
||||
mingw32ce)
|
||||
basic_machine=arm-unknown
|
||||
os=-mingw32ce
|
||||
;;
|
||||
miniframe)
|
||||
basic_machine=m68000-convergent
|
||||
;;
|
||||
|
|
@ -845,14 +809,6 @@ case $basic_machine in
|
|||
basic_machine=i860-intel
|
||||
os=-osf
|
||||
;;
|
||||
parisc)
|
||||
basic_machine=hppa-unknown
|
||||
os=-linux
|
||||
;;
|
||||
parisc-*)
|
||||
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
pbd)
|
||||
basic_machine=sparc-tti
|
||||
;;
|
||||
|
|
@ -969,9 +925,6 @@ case $basic_machine in
|
|||
basic_machine=sh-hitachi
|
||||
os=-hms
|
||||
;;
|
||||
sh5el)
|
||||
basic_machine=sh5le-unknown
|
||||
;;
|
||||
sh64)
|
||||
basic_machine=sh64-unknown
|
||||
;;
|
||||
|
|
@ -1061,10 +1014,6 @@ case $basic_machine in
|
|||
basic_machine=tic6x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
tile*)
|
||||
basic_machine=tile-unknown
|
||||
os=-linux-gnu
|
||||
;;
|
||||
tx39)
|
||||
basic_machine=mipstx39-unknown
|
||||
;;
|
||||
|
|
@ -1140,10 +1089,6 @@ case $basic_machine in
|
|||
basic_machine=z8k-unknown
|
||||
os=-sim
|
||||
;;
|
||||
z80-*-coff)
|
||||
basic_machine=z80-unknown
|
||||
os=-sim
|
||||
;;
|
||||
none)
|
||||
basic_machine=none-none
|
||||
os=-none
|
||||
|
|
@ -1264,7 +1209,7 @@ case $os in
|
|||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* | -cegcc* \
|
||||
| -chorusos* | -chorusrdb* \
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
|
|
@ -1274,7 +1219,7 @@ case $os in
|
|||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
||||
| -skyos* | -haiku* | -rdos* | -toppers*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
|
|
@ -1404,9 +1349,6 @@ case $os in
|
|||
-zvmoe)
|
||||
os=-zvmoe
|
||||
;;
|
||||
-dicos*)
|
||||
os=-dicos
|
||||
;;
|
||||
-none)
|
||||
;;
|
||||
*)
|
||||
|
|
@ -1472,9 +1414,6 @@ case $basic_machine in
|
|||
m68*-cisco)
|
||||
os=-aout
|
||||
;;
|
||||
mep-*)
|
||||
os=-elf
|
||||
;;
|
||||
mips*-cisco)
|
||||
os=-elf
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.63 for xrandr 1.3.0.
|
||||
# Generated by GNU Autoconf 2.63 for xrandr 1.3.2.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
|
|
@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='xrandr'
|
||||
PACKAGE_TARNAME='xrandr'
|
||||
PACKAGE_VERSION='1.3.0'
|
||||
PACKAGE_STRING='xrandr 1.3.0'
|
||||
PACKAGE_VERSION='1.3.2'
|
||||
PACKAGE_STRING='xrandr 1.3.2'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
|
||||
# Factoring default headers for most tests.
|
||||
|
|
@ -1317,7 +1317,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 xrandr 1.3.0 to adapt to many kinds of systems.
|
||||
\`configure' configures xrandr 1.3.2 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1387,7 +1387,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xrandr 1.3.0:";;
|
||||
short | recursive ) echo "Configuration of xrandr 1.3.2:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1486,7 +1486,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xrandr configure 1.3.0
|
||||
xrandr configure 1.3.2
|
||||
generated by GNU Autoconf 2.63
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
|
|
@ -1500,7 +1500,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 xrandr $as_me 1.3.0, which was
|
||||
It was created by xrandr $as_me 1.3.2, which was
|
||||
generated by GNU Autoconf 2.63. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2216,7 +2216,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xrandr'
|
||||
VERSION='1.3.0'
|
||||
VERSION='1.3.2'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -2384,26 +2384,14 @@ fi
|
|||
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
|
||||
|
||||
|
||||
XORG_MACROS_needed_version=1.2
|
||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
|
||||
{ $as_echo "$as_me:$LINENO: checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}" >&5
|
||||
$as_echo_n "checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... " >&6; }
|
||||
XORG_MACROS_version=1.2.1
|
||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
|
||||
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&5
|
||||
$as_echo "$as_me: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&5
|
||||
$as_echo "$as_me: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: yes, $XORG_MACROS_version" >&5
|
||||
$as_echo "yes, $XORG_MACROS_version" >&6; }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
|
@ -4236,7 +4224,7 @@ if test "x$GCC" = xyes ; then
|
|||
-Wbad-function-cast"
|
||||
case `gcc -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement"
|
||||
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
|
|
@ -4507,12 +4495,12 @@ if test -n "$XRANDR_CFLAGS"; then
|
|||
pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.2.99.3 xrender x11\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xrandr >= 1.2.99.3 xrender x11") 2>&5
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.3 xrender x11\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xrandr >= 1.3 xrender x11") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2.99.3 xrender x11" 2>/dev/null`
|
||||
pkg_cv_XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.3 xrender x11" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
|
|
@ -4523,12 +4511,12 @@ if test -n "$XRANDR_LIBS"; then
|
|||
pkg_cv_XRANDR_LIBS="$XRANDR_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.2.99.3 xrender x11\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xrandr >= 1.2.99.3 xrender x11") 2>&5
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.3 xrender x11\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xrandr >= 1.3 xrender x11") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2.99.3 xrender x11" 2>/dev/null`
|
||||
pkg_cv_XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.3 xrender x11" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
|
|
@ -4546,14 +4534,14 @@ else
|
|||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
XRANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xrandr >= 1.2.99.3 xrender x11" 2>&1`
|
||||
XRANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xrandr >= 1.3 xrender x11" 2>&1`
|
||||
else
|
||||
XRANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors "xrandr >= 1.2.99.3 xrender x11" 2>&1`
|
||||
XRANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors "xrandr >= 1.3 xrender x11" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$XRANDR_PKG_ERRORS" >&5
|
||||
|
||||
{ { $as_echo "$as_me:$LINENO: error: Package requirements (xrandr >= 1.2.99.3 xrender x11) were not met:
|
||||
{ { $as_echo "$as_me:$LINENO: error: Package requirements (xrandr >= 1.3 xrender x11) were not met:
|
||||
|
||||
$XRANDR_PKG_ERRORS
|
||||
|
||||
|
|
@ -4564,7 +4552,7 @@ Alternatively, you may set the environment variables XRANDR_CFLAGS
|
|||
and XRANDR_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&5
|
||||
$as_echo "$as_me: error: Package requirements (xrandr >= 1.2.99.3 xrender x11) were not met:
|
||||
$as_echo "$as_me: error: Package requirements (xrandr >= 1.3 xrender x11) were not met:
|
||||
|
||||
$XRANDR_PKG_ERRORS
|
||||
|
||||
|
|
@ -5255,7 +5243,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 xrandr $as_me 1.3.0, which was
|
||||
This file was extended by xrandr $as_me 1.3.2, which was
|
||||
generated by GNU Autoconf 2.63. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -5318,7 +5306,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
|||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_version="\\
|
||||
xrandr config.status 1.3.0
|
||||
xrandr config.status 1.3.2
|
||||
configured by $0, generated by GNU Autoconf 2.63,
|
||||
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
|
@ -6098,16 +6086,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
|
|||
|
||||
|
||||
case $ac_file$ac_mode in
|
||||
"depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
|
||||
# are listed without --file. Let's play safe and only enable the eval
|
||||
# if we detect the quoting.
|
||||
case $CONFIG_FILES in
|
||||
*\'*) eval set x "$CONFIG_FILES" ;;
|
||||
*) set x $CONFIG_FILES ;;
|
||||
esac
|
||||
shift
|
||||
for mf
|
||||
do
|
||||
"depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
|
||||
# Strip MF so we end up with the name of the file.
|
||||
mf=`echo "$mf" | sed -e 's/:.*$//'`
|
||||
# Check whether this is an Automake generated Makefile or not.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ dnl
|
|||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(xrandr,[1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrandr)
|
||||
AC_INIT(xrandr,[1.3.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrandr)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ XORG_CWARNFLAGS
|
|||
|
||||
AC_CHECK_LIB(m,floor)
|
||||
# Checks for pkg-config packages
|
||||
PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.99.3 xrender x11)
|
||||
PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3 xrender x11)
|
||||
XRANDR_CFLAGS="$CWARNFLAGS $XRANDR_CFLAGS"
|
||||
AC_SUBST(XRANDR_CFLAGS)
|
||||
AC_SUBST(XRANDR_LIBS)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# depcomp - compile a program generating dependencies as side-effects
|
||||
|
||||
scriptversion=2007-03-29.01
|
||||
scriptversion=2006-10-15.18
|
||||
|
||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
|
||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
|
||||
# Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -215,39 +215,34 @@ aix)
|
|||
# current directory. Also, the AIX compiler puts `$object:' at the
|
||||
# start of each line; $object doesn't have directory information.
|
||||
# Version 6 uses the directory in both cases.
|
||||
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
||||
test "x$dir" = "x$object" && dir=
|
||||
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
||||
stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
|
||||
tmpdepfile="$stripped.u"
|
||||
if test "$libtool" = yes; then
|
||||
tmpdepfile1=$dir$base.u
|
||||
tmpdepfile2=$base.u
|
||||
tmpdepfile3=$dir.libs/$base.u
|
||||
"$@" -Wc,-M
|
||||
else
|
||||
tmpdepfile1=$dir$base.u
|
||||
tmpdepfile2=$dir$base.u
|
||||
tmpdepfile3=$dir$base.u
|
||||
"$@" -M
|
||||
fi
|
||||
stat=$?
|
||||
|
||||
if test -f "$tmpdepfile"; then :
|
||||
else
|
||||
stripped=`echo "$stripped" | sed 's,^.*/,,'`
|
||||
tmpdepfile="$stripped.u"
|
||||
fi
|
||||
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
|
||||
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||
do
|
||||
test -f "$tmpdepfile" && break
|
||||
done
|
||||
if test -f "$tmpdepfile"; then
|
||||
outname="$stripped.o"
|
||||
# Each line is of the form `foo.o: dependent.h'.
|
||||
# Do two passes, one to just change these to
|
||||
# `$object: dependent.h' and one to simply `dependent.h:'.
|
||||
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
||||
# That's a tab and a space in the [].
|
||||
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
||||
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
|
||||
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
|
||||
else
|
||||
# The sourcefile does not contain any dependencies, so just
|
||||
# store a dummy comment line, to avoid errors with the Makefile
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
# install - install a program, script, or datafile
|
||||
|
||||
scriptversion=2006-12-25.00
|
||||
scriptversion=2006-10-14.15
|
||||
|
||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||
|
|
@ -48,7 +48,7 @@ IFS=" "" $nl"
|
|||
# set DOITPROG to echo to test this script
|
||||
|
||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
||||
doit=${DOITPROG-}
|
||||
doit="${DOITPROG-}"
|
||||
if test -z "$doit"; then
|
||||
doit_exec=exec
|
||||
else
|
||||
|
|
@ -58,49 +58,34 @@ fi
|
|||
# Put in absolute file names if you don't have them in your path;
|
||||
# or use environment vars.
|
||||
|
||||
chgrpprog=${CHGRPPROG-chgrp}
|
||||
chmodprog=${CHMODPROG-chmod}
|
||||
chownprog=${CHOWNPROG-chown}
|
||||
cmpprog=${CMPPROG-cmp}
|
||||
cpprog=${CPPROG-cp}
|
||||
mkdirprog=${MKDIRPROG-mkdir}
|
||||
mvprog=${MVPROG-mv}
|
||||
rmprog=${RMPROG-rm}
|
||||
stripprog=${STRIPPROG-strip}
|
||||
|
||||
posix_glob='?'
|
||||
initialize_posix_glob='
|
||||
test "$posix_glob" != "?" || {
|
||||
if (set -f) 2>/dev/null; then
|
||||
posix_glob=
|
||||
else
|
||||
posix_glob=:
|
||||
fi
|
||||
}
|
||||
'
|
||||
mvprog="${MVPROG-mv}"
|
||||
cpprog="${CPPROG-cp}"
|
||||
chmodprog="${CHMODPROG-chmod}"
|
||||
chownprog="${CHOWNPROG-chown}"
|
||||
chgrpprog="${CHGRPPROG-chgrp}"
|
||||
stripprog="${STRIPPROG-strip}"
|
||||
rmprog="${RMPROG-rm}"
|
||||
mkdirprog="${MKDIRPROG-mkdir}"
|
||||
|
||||
posix_glob=
|
||||
posix_mkdir=
|
||||
|
||||
# Desired mode of installed file.
|
||||
mode=0755
|
||||
|
||||
chgrpcmd=
|
||||
chmodcmd=$chmodprog
|
||||
chowncmd=
|
||||
mvcmd=$mvprog
|
||||
rmcmd="$rmprog -f"
|
||||
chgrpcmd=
|
||||
stripcmd=
|
||||
|
||||
rmcmd="$rmprog -f"
|
||||
mvcmd="$mvprog"
|
||||
src=
|
||||
dst=
|
||||
dir_arg=
|
||||
dst_arg=
|
||||
|
||||
copy_on_change=false
|
||||
dstarg=
|
||||
no_target_directory=
|
||||
|
||||
usage="\
|
||||
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
||||
usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
||||
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
||||
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
||||
or: $0 [OPTION]... -d DIRECTORIES...
|
||||
|
|
@ -110,55 +95,65 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
|
|||
In the 4th, create DIRECTORIES.
|
||||
|
||||
Options:
|
||||
--help display this help and exit.
|
||||
--version display version info and exit.
|
||||
|
||||
-c (ignored)
|
||||
-C install only if different (preserve the last data modification time)
|
||||
-d create directories instead of installing files.
|
||||
-g GROUP $chgrpprog installed files to GROUP.
|
||||
-m MODE $chmodprog installed files to MODE.
|
||||
-o USER $chownprog installed files to USER.
|
||||
-s $stripprog installed files.
|
||||
-t DIRECTORY install into DIRECTORY.
|
||||
-T report an error if DSTFILE is a directory.
|
||||
-c (ignored)
|
||||
-d create directories instead of installing files.
|
||||
-g GROUP $chgrpprog installed files to GROUP.
|
||||
-m MODE $chmodprog installed files to MODE.
|
||||
-o USER $chownprog installed files to USER.
|
||||
-s $stripprog installed files.
|
||||
-t DIRECTORY install into DIRECTORY.
|
||||
-T report an error if DSTFILE is a directory.
|
||||
--help display this help and exit.
|
||||
--version display version info and exit.
|
||||
|
||||
Environment variables override the default commands:
|
||||
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
||||
RMPROG STRIPPROG
|
||||
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
|
||||
"
|
||||
|
||||
while test $# -ne 0; do
|
||||
case $1 in
|
||||
-c) ;;
|
||||
-c) shift
|
||||
continue;;
|
||||
|
||||
-C) copy_on_change=true;;
|
||||
|
||||
-d) dir_arg=true;;
|
||||
-d) dir_arg=true
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-g) chgrpcmd="$chgrpprog $2"
|
||||
shift;;
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
--help) echo "$usage"; exit $?;;
|
||||
|
||||
-m) mode=$2
|
||||
shift
|
||||
shift
|
||||
case $mode in
|
||||
*' '* | *' '* | *'
|
||||
'* | *'*'* | *'?'* | *'['*)
|
||||
echo "$0: invalid mode: $mode" >&2
|
||||
exit 1;;
|
||||
esac
|
||||
shift;;
|
||||
continue;;
|
||||
|
||||
-o) chowncmd="$chownprog $2"
|
||||
shift;;
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-s) stripcmd=$stripprog;;
|
||||
-s) stripcmd=$stripprog
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-t) dst_arg=$2
|
||||
shift;;
|
||||
-t) dstarg=$2
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-T) no_target_directory=true;;
|
||||
-T) no_target_directory=true
|
||||
shift
|
||||
continue;;
|
||||
|
||||
--version) echo "$0 $scriptversion"; exit $?;;
|
||||
|
||||
|
|
@ -170,22 +165,21 @@ while test $# -ne 0; do
|
|||
|
||||
*) break;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
||||
if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
|
||||
# When -d is used, all remaining arguments are directories to create.
|
||||
# When -t is used, the destination is already specified.
|
||||
# Otherwise, the last argument is the destination. Remove it from $@.
|
||||
for arg
|
||||
do
|
||||
if test -n "$dst_arg"; then
|
||||
if test -n "$dstarg"; then
|
||||
# $@ is not empty: it contains at least $arg.
|
||||
set fnord "$@" "$dst_arg"
|
||||
set fnord "$@" "$dstarg"
|
||||
shift # fnord
|
||||
fi
|
||||
shift # arg
|
||||
dst_arg=$arg
|
||||
dstarg=$arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
|
@ -230,7 +224,7 @@ for src
|
|||
do
|
||||
# Protect names starting with `-'.
|
||||
case $src in
|
||||
-*) src=./$src;;
|
||||
-*) src=./$src ;;
|
||||
esac
|
||||
|
||||
if test -n "$dir_arg"; then
|
||||
|
|
@ -248,22 +242,22 @@ do
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if test -z "$dst_arg"; then
|
||||
if test -z "$dstarg"; then
|
||||
echo "$0: no destination specified." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
dst=$dst_arg
|
||||
dst=$dstarg
|
||||
# Protect names starting with `-'.
|
||||
case $dst in
|
||||
-*) dst=./$dst;;
|
||||
-*) dst=./$dst ;;
|
||||
esac
|
||||
|
||||
# If destination is a directory, append the input filename; won't work
|
||||
# if double slashes aren't ignored.
|
||||
if test -d "$dst"; then
|
||||
if test -n "$no_target_directory"; then
|
||||
echo "$0: $dst_arg: Is a directory" >&2
|
||||
echo "$0: $dstarg: Is a directory" >&2
|
||||
exit 1
|
||||
fi
|
||||
dstdir=$dst
|
||||
|
|
@ -384,19 +378,26 @@ do
|
|||
# directory the slow way, step by step, checking for races as we go.
|
||||
|
||||
case $dstdir in
|
||||
/*) prefix='/';;
|
||||
-*) prefix='./';;
|
||||
*) prefix='';;
|
||||
/*) prefix=/ ;;
|
||||
-*) prefix=./ ;;
|
||||
*) prefix= ;;
|
||||
esac
|
||||
|
||||
eval "$initialize_posix_glob"
|
||||
case $posix_glob in
|
||||
'')
|
||||
if (set -f) 2>/dev/null; then
|
||||
posix_glob=true
|
||||
else
|
||||
posix_glob=false
|
||||
fi ;;
|
||||
esac
|
||||
|
||||
oIFS=$IFS
|
||||
IFS=/
|
||||
$posix_glob set -f
|
||||
$posix_glob && set -f
|
||||
set fnord $dstdir
|
||||
shift
|
||||
$posix_glob set +f
|
||||
$posix_glob && set +f
|
||||
IFS=$oIFS
|
||||
|
||||
prefixes=
|
||||
|
|
@ -458,54 +459,41 @@ do
|
|||
# ignore errors from any of these, just make sure not to ignore
|
||||
# errors from the above "$doit $cpprog $src $dsttmp" command.
|
||||
#
|
||||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
|
||||
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
|
||||
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
|
||||
{ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
|
||||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
|
||||
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
|
||||
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
|
||||
&& { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
|
||||
|
||||
# If -C, don't bother to copy if it wouldn't change the file.
|
||||
if $copy_on_change &&
|
||||
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
||||
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
||||
# Now rename the file to the real destination.
|
||||
{ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
|
||||
|| {
|
||||
# The rename failed, perhaps because mv can't rename something else
|
||||
# to itself, or perhaps because mv is so ancient that it does not
|
||||
# support -f.
|
||||
|
||||
eval "$initialize_posix_glob" &&
|
||||
$posix_glob set -f &&
|
||||
set X $old && old=:$2:$4:$5:$6 &&
|
||||
set X $new && new=:$2:$4:$5:$6 &&
|
||||
$posix_glob set +f &&
|
||||
# Now remove or move aside any old file at destination location.
|
||||
# We try this two ways since rm can't unlink itself on some
|
||||
# systems and the destination file might be busy for other
|
||||
# reasons. In this case, the final cleanup might fail but the new
|
||||
# file should still install successfully.
|
||||
{
|
||||
if test -f "$dst"; then
|
||||
$doit $rmcmd -f "$dst" 2>/dev/null \
|
||||
|| { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
|
||||
&& { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
|
||||
|| {
|
||||
echo "$0: cannot unlink or rename $dst" >&2
|
||||
(exit 1); exit 1
|
||||
}
|
||||
else
|
||||
:
|
||||
fi
|
||||
} &&
|
||||
|
||||
test "$old" = "$new" &&
|
||||
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
||||
then
|
||||
rm -f "$dsttmp"
|
||||
else
|
||||
# Rename the file to the real destination.
|
||||
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
||||
|
||||
# The rename failed, perhaps because mv can't rename something else
|
||||
# to itself, or perhaps because mv is so ancient that it does not
|
||||
# support -f.
|
||||
{
|
||||
# Now remove or move aside any old file at destination location.
|
||||
# We try this two ways since rm can't unlink itself on some
|
||||
# systems and the destination file might be busy for other
|
||||
# reasons. In this case, the final cleanup might fail but the new
|
||||
# file should still install successfully.
|
||||
{
|
||||
test ! -f "$dst" ||
|
||||
$doit $rmcmd -f "$dst" 2>/dev/null ||
|
||||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
||||
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
|
||||
} ||
|
||||
{ echo "$0: cannot unlink or rename $dst" >&2
|
||||
(exit 1); exit 1
|
||||
}
|
||||
} &&
|
||||
|
||||
# Now rename the file to the real destination.
|
||||
$doit $mvcmd "$dsttmp" "$dst"
|
||||
}
|
||||
fi || exit 1
|
||||
# Now rename the file to the real destination.
|
||||
$doit $mvcmd "$dsttmp" "$dst"
|
||||
}
|
||||
} || exit 1
|
||||
|
||||
trap '' 0
|
||||
fi
|
||||
|
|
|
|||
135
xrandr/xrandr.c
135
xrandr/xrandr.c
|
|
@ -37,6 +37,8 @@
|
|||
#include <stdarg.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#if RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 2)
|
||||
#define HAS_RANDR_1_2 1
|
||||
#endif
|
||||
|
|
@ -309,7 +311,7 @@ struct _output {
|
|||
crtc_t *current_crtc_info;
|
||||
|
||||
name_t mode;
|
||||
float refresh;
|
||||
double refresh;
|
||||
XRRModeInfo *mode_info;
|
||||
|
||||
name_t addmode;
|
||||
|
|
@ -332,6 +334,8 @@ struct _output {
|
|||
} gamma;
|
||||
|
||||
Bool primary;
|
||||
|
||||
Bool found;
|
||||
};
|
||||
|
||||
typedef enum _umode_action {
|
||||
|
|
@ -374,7 +378,7 @@ static int num_crtcs;
|
|||
static XRRScreenResources *res;
|
||||
static int fb_width = 0, fb_height = 0;
|
||||
static int fb_width_mm = 0, fb_height_mm = 0;
|
||||
static float dpi = 0;
|
||||
static double dpi = 0;
|
||||
static char *dpi_output = NULL;
|
||||
static Bool dryrun = False;
|
||||
static int minWidth, maxWidth, minHeight, maxHeight;
|
||||
|
|
@ -487,27 +491,27 @@ mode_geometry (XRRModeInfo *mode_info, Rotation rotation,
|
|||
}
|
||||
|
||||
/* v refresh frequency in Hz */
|
||||
static float
|
||||
static double
|
||||
mode_refresh (XRRModeInfo *mode_info)
|
||||
{
|
||||
float rate;
|
||||
double rate;
|
||||
|
||||
if (mode_info->hTotal && mode_info->vTotal)
|
||||
rate = ((float) mode_info->dotClock /
|
||||
((float) mode_info->hTotal * (float) mode_info->vTotal));
|
||||
rate = ((double) mode_info->dotClock /
|
||||
((double) mode_info->hTotal * (double) mode_info->vTotal));
|
||||
else
|
||||
rate = 0;
|
||||
return rate;
|
||||
}
|
||||
|
||||
/* h sync frequency in Hz */
|
||||
static float
|
||||
static double
|
||||
mode_hsync (XRRModeInfo *mode_info)
|
||||
{
|
||||
float rate;
|
||||
double rate;
|
||||
|
||||
if (mode_info->hTotal)
|
||||
rate = (float) mode_info->dotClock / (float) mode_info->hTotal;
|
||||
rate = (double) mode_info->dotClock / (double) mode_info->hTotal;
|
||||
else
|
||||
rate = 0;
|
||||
return rate;
|
||||
|
|
@ -630,6 +634,7 @@ add_output (void)
|
|||
if (!output)
|
||||
fatal ("out of memory\n");
|
||||
output->next = NULL;
|
||||
output->found = False;
|
||||
*outputs_tail = output;
|
||||
outputs_tail = &output->next;
|
||||
return output;
|
||||
|
|
@ -709,11 +714,11 @@ find_crtc_by_xid (RRCrtc crtc)
|
|||
}
|
||||
|
||||
static XRRModeInfo *
|
||||
find_mode (name_t *name, float refresh)
|
||||
find_mode (name_t *name, double refresh)
|
||||
{
|
||||
int m;
|
||||
XRRModeInfo *best = NULL;
|
||||
float bestDist = 0;
|
||||
double bestDist = 0;
|
||||
|
||||
for (m = 0; m < res->nmode; m++)
|
||||
{
|
||||
|
|
@ -725,7 +730,7 @@ find_mode (name_t *name, float refresh)
|
|||
}
|
||||
if ((name->kind & name_string) && !strcmp (name->string, mode->name))
|
||||
{
|
||||
float dist;
|
||||
double dist;
|
||||
|
||||
if (refresh)
|
||||
dist = fabs (mode_refresh (mode) - refresh);
|
||||
|
|
@ -770,7 +775,7 @@ find_mode_for_output (output_t *output, name_t *name)
|
|||
XRROutputInfo *output_info = output->output_info;
|
||||
int m;
|
||||
XRRModeInfo *best = NULL;
|
||||
float bestDist = 0;
|
||||
double bestDist = 0;
|
||||
|
||||
for (m = 0; m < output_info->nmode; m++)
|
||||
{
|
||||
|
|
@ -785,7 +790,7 @@ find_mode_for_output (output_t *output, name_t *name)
|
|||
}
|
||||
if ((name->kind & name_string) && !strcmp (name->string, mode->name))
|
||||
{
|
||||
float dist;
|
||||
double dist;
|
||||
|
||||
/* Stay away from doublescan modes unless refresh rate is specified. */
|
||||
if (!output->refresh && (mode->modeFlags & RR_DoubleScan))
|
||||
|
|
@ -1435,6 +1440,15 @@ apply (void)
|
|||
Status s;
|
||||
int c;
|
||||
|
||||
/*
|
||||
* Hold the server grabbed while messing with
|
||||
* the screen so that apps which notice the resize
|
||||
* event and ask for xinerama information from the server
|
||||
* receive up-to-date information
|
||||
*/
|
||||
if (grab_server)
|
||||
XGrabServer (dpy);
|
||||
|
||||
/*
|
||||
* Turn off any crtcs which are to be disabled or which are
|
||||
* larger than the target size
|
||||
|
|
@ -1481,15 +1495,6 @@ apply (void)
|
|||
panic (s, crtc);
|
||||
}
|
||||
|
||||
/*
|
||||
* Hold the server grabbed while messing with
|
||||
* the screen so that apps which notice the resize
|
||||
* event and ask for xinerama information from the server
|
||||
* receive up-to-date information
|
||||
*/
|
||||
if (grab_server)
|
||||
XGrabServer (dpy);
|
||||
|
||||
/*
|
||||
* Set the screen size
|
||||
*/
|
||||
|
|
@ -1525,6 +1530,7 @@ static void
|
|||
get_outputs (void)
|
||||
{
|
||||
int o;
|
||||
output_t *q;
|
||||
|
||||
for (o = 0; o < res->noutput; o++)
|
||||
{
|
||||
|
|
@ -1563,6 +1569,7 @@ get_outputs (void)
|
|||
}
|
||||
}
|
||||
}
|
||||
output->found = True;
|
||||
|
||||
/*
|
||||
* Automatic mode -- track connection state and enable/disable outputs
|
||||
|
|
@ -1593,6 +1600,14 @@ get_outputs (void)
|
|||
|
||||
set_output_info (output, res->outputs[o], output_info);
|
||||
}
|
||||
for (q = outputs; q; q = q->next)
|
||||
{
|
||||
if (!q->found)
|
||||
{
|
||||
fprintf(stderr, "warning: output %s not found; ignoring\n",
|
||||
q->output.string);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -1628,7 +1643,7 @@ mark_changing_crtcs (void)
|
|||
/*
|
||||
* Test whether 'crtc' can be used for 'output'
|
||||
*/
|
||||
Bool
|
||||
static Bool
|
||||
check_crtc_for_output (crtc_t *crtc, output_t *output)
|
||||
{
|
||||
int c;
|
||||
|
|
@ -1997,6 +2012,26 @@ pick_crtcs (void)
|
|||
}
|
||||
}
|
||||
|
||||
static int
|
||||
check_strtol(char *s)
|
||||
{
|
||||
char *endptr;
|
||||
int result = strtol(s, &endptr, 10);
|
||||
if (s == endptr)
|
||||
usage();
|
||||
return result;
|
||||
}
|
||||
|
||||
static int
|
||||
check_strtod(char *s)
|
||||
{
|
||||
char *endptr;
|
||||
double result = strtod(s, &endptr);
|
||||
if (s == endptr)
|
||||
usage();
|
||||
return result;
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
|
|
@ -2015,7 +2050,7 @@ main (int argc, char **argv)
|
|||
int i, j;
|
||||
SizeID current_size;
|
||||
short current_rate;
|
||||
float rate = -1;
|
||||
double rate = -1;
|
||||
int size = -1;
|
||||
int dirind = 0;
|
||||
Bool setit = False;
|
||||
|
|
@ -2071,12 +2106,12 @@ main (int argc, char **argv)
|
|||
|
||||
if (!strcmp ("-s", argv[i]) || !strcmp ("--size", argv[i])) {
|
||||
if (++i>=argc) usage ();
|
||||
if (sscanf (argv[i], "%dx%d", &width, &height) == 2)
|
||||
if (sscanf (argv[i], "%dx%d", &width, &height) == 2) {
|
||||
have_pixel_size = True;
|
||||
else {
|
||||
size = atoi (argv[i]);
|
||||
if (size < 0) usage();
|
||||
}
|
||||
} else {
|
||||
size = check_strtol(argv[i]);
|
||||
if (size < 0) usage();
|
||||
}
|
||||
setit = True;
|
||||
continue;
|
||||
}
|
||||
|
|
@ -2086,8 +2121,7 @@ main (int argc, char **argv)
|
|||
!strcmp ("--refresh", argv[i]))
|
||||
{
|
||||
if (++i>=argc) usage ();
|
||||
if (sscanf (argv[i], "%f", &rate) != 1)
|
||||
usage ();
|
||||
rate = check_strtod(argv[i]);
|
||||
setit = True;
|
||||
#if HAS_RANDR_1_2
|
||||
if (output)
|
||||
|
|
@ -2117,7 +2151,7 @@ main (int argc, char **argv)
|
|||
}
|
||||
if (!strcmp ("--screen", argv[i])) {
|
||||
if (++i>=argc) usage ();
|
||||
screen = atoi (argv[i]);
|
||||
screen = check_strtol(argv[i]);
|
||||
if (screen < 0) usage();
|
||||
continue;
|
||||
}
|
||||
|
|
@ -2128,8 +2162,8 @@ main (int argc, char **argv)
|
|||
if (!strcmp ("-o", argv[i]) || !strcmp ("--orientation", argv[i])) {
|
||||
char *endptr;
|
||||
if (++i>=argc) usage ();
|
||||
dirind = strtol(argv[i], &endptr, 0);
|
||||
if (*endptr != '\0') {
|
||||
dirind = strtol(argv[i], &endptr, 10);
|
||||
if (argv[i] == endptr) {
|
||||
for (dirind = 0; dirind < 4; dirind++) {
|
||||
if (strcmp (direction[dirind], argv[i]) == 0) break;
|
||||
}
|
||||
|
|
@ -2391,8 +2425,10 @@ main (int argc, char **argv)
|
|||
continue;
|
||||
}
|
||||
if (!strcmp ("--dpi", argv[i])) {
|
||||
char *strtod_error;
|
||||
if (++i>=argc) usage ();
|
||||
if (sscanf (argv[i], "%f", &dpi) != 1)
|
||||
dpi = strtod(argv[i], &strtod_error);
|
||||
if (argv[i] == strtod_error)
|
||||
{
|
||||
dpi = 0.0;
|
||||
dpi_output = argv[i];
|
||||
|
|
@ -2434,25 +2470,24 @@ main (int argc, char **argv)
|
|||
if (!strcmp ("--newmode", argv[i]))
|
||||
{
|
||||
umode_t *m = malloc (sizeof (umode_t));
|
||||
float clock;
|
||||
double clock;
|
||||
|
||||
++i;
|
||||
if (i + 9 >= argc) usage ();
|
||||
m->mode.name = argv[i];
|
||||
m->mode.nameLength = strlen (argv[i]);
|
||||
i++;
|
||||
if (sscanf (argv[i++], "%f", &clock) != 1)
|
||||
usage ();
|
||||
clock = check_strtod(argv[i++]);
|
||||
m->mode.dotClock = clock * 1e6;
|
||||
|
||||
if (sscanf (argv[i++], "%d", &m->mode.width) != 1) usage();
|
||||
if (sscanf (argv[i++], "%d", &m->mode.hSyncStart) != 1) usage();
|
||||
if (sscanf (argv[i++], "%d", &m->mode.hSyncEnd) != 1) usage();
|
||||
if (sscanf (argv[i++], "%d", &m->mode.hTotal) != 1) usage();
|
||||
if (sscanf (argv[i++], "%d", &m->mode.height) != 1) usage();
|
||||
if (sscanf (argv[i++], "%d", &m->mode.vSyncStart) != 1) usage();
|
||||
if (sscanf (argv[i++], "%d", &m->mode.vSyncEnd) != 1) usage();
|
||||
if (sscanf (argv[i++], "%d", &m->mode.vTotal) != 1) usage();
|
||||
m->mode.width = check_strtol(argv[i++]);
|
||||
m->mode.hSyncStart = check_strtol(argv[i++]);
|
||||
m->mode.hSyncEnd = check_strtol(argv[i++]);
|
||||
m->mode.hTotal = check_strtol(argv[i++]);
|
||||
m->mode.height = check_strtol(argv[i++]);
|
||||
m->mode.vSyncStart = check_strtol(argv[i++]);
|
||||
m->mode.vSyncEnd = check_strtol(argv[i++]);
|
||||
m->mode.vTotal = check_strtol(argv[i++]);
|
||||
m->mode.modeFlags = 0;
|
||||
while (i < argc) {
|
||||
int f;
|
||||
|
|
@ -2521,6 +2556,8 @@ main (int argc, char **argv)
|
|||
if (setit && !setit_1_2)
|
||||
query_1 = True;
|
||||
}
|
||||
if (version)
|
||||
printf("xrandr program version " VERSION "\n");
|
||||
|
||||
dpy = XOpenDisplay (display_name);
|
||||
|
||||
|
|
@ -3018,7 +3055,7 @@ main (int argc, char **argv)
|
|||
|
||||
printf (" %s (0x%x) %6.1fMHz",
|
||||
mode->name, (int)mode->id,
|
||||
(float)mode->dotClock / 1000000.0);
|
||||
(double)mode->dotClock / 1000000.0);
|
||||
for (f = 0; mode_flags[f].flag; f++)
|
||||
if (mode->modeFlags & mode_flags[f].flag)
|
||||
printf (" %s", mode_flags[f].string);
|
||||
|
|
@ -3079,7 +3116,7 @@ main (int argc, char **argv)
|
|||
{
|
||||
printf (" %s (0x%x) %6.1fMHz\n",
|
||||
mode->name, (int)mode->id,
|
||||
(float)mode->dotClock / 1000000.0);
|
||||
(double)mode->dotClock / 1000000.0);
|
||||
printf (" h: width %4d start %4d end %4d total %4d skew %4d clock %6.1fKHz\n",
|
||||
mode->width, mode->hSyncStart, mode->hSyncEnd,
|
||||
mode->hTotal, mode->hSkew, mode_hsync (mode) / 1000);
|
||||
|
|
|
|||
|
|
@ -112,6 +112,10 @@ When this option is present, or when no configuration changes are requested,
|
|||
xrandr will display the current state of the system.
|
||||
.IP "\-\-dryrun"
|
||||
Performs all the actions specified except that no changes are made.
|
||||
.IP "\-\-nograb"
|
||||
Apply the modifications without grabbing the screen. It avoids to block other
|
||||
applications during the update but it might also cause some applications that
|
||||
detect screen resize to receive old values.
|
||||
.IP "\-d, \-display \fIname\fP"
|
||||
This option selects the X display to use. Note this refers to the X
|
||||
screen abstraction, not the monitor (or output).
|
||||
|
|
@ -171,6 +175,7 @@ sin T cos T 0
|
|||
As a special argument, instead of
|
||||
passing a matrix, one can pass the string \fInone\fP, in which case the default
|
||||
values are used (a unit matrix without filter).
|
||||
.RE
|
||||
.IP "\-\-scale \fIx\fPx\fIy\fP"
|
||||
Changes the dimensions of the output picture. Values superior to 1 will lead to
|
||||
a compressed screen (screen dimension bigger than the dimension of the output
|
||||
|
|
|
|||
Loading…
Reference in New Issue