Update to xrandr 1.4.1
This commit is contained in:
matthieu
parent
d493922f59
commit
df07124fa5
@ -1,3 +1,100 @@
|
||||
commit c5334bb4137d6ea7b8c8b10d51131b9450d1106b
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Jul 16 23:30:27 2013 -0700
|
||||
|
||||
xrandr 1.4.1
|
||||
|
||||
commit 0e0b47341a45c138082d9f8047dcbdb91b90155d
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jul 13 00:11:41 2013 -0700
|
||||
|
||||
Combine usage message strings
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 38772ec3b5a7216a88676f95b5edc764dd0a23d6
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jul 13 00:07:26 2013 -0700
|
||||
|
||||
Declare capability_name() as returning const char *
|
||||
|
||||
Only used as an argument to printf. Clears gcc warnings:
|
||||
xrandr.c: In function ‘capability_name’:
|
||||
xrandr.c:237:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
|
||||
xrandr.c:239:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
|
||||
xrandr.c:241:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
|
||||
xrandr.c:243:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
|
||||
xrandr.c:245:5: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit f53d8511d26a26e9bd6b1bc665f6283f1efd98d9
|
||||
Author: Thomas <fischer@unix-ag.uni-kl.de>
|
||||
Date: Fri Nov 9 14:33:08 2012 +0000
|
||||
|
||||
Bug 56923 - Make command line options consistent (single vs double dash)
|
||||
|
||||
Most of xrandr's command line options follow the system of single
|
||||
dashes for single character options (e.g. "-v") and double dashes for
|
||||
long options ("--version"). The only exceptions are "-display" and
|
||||
"-help", most likely for historical reasons. To make the behavior
|
||||
consistent across all options, the following patch adds "--display"
|
||||
and "--help" as alternatives to the current inconsistency. The man
|
||||
page got updated as well, recommending double-dash variants for both
|
||||
options. The old behavior is still supported, so the patch should not
|
||||
break any existing usage/script.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit bd1502f50f0c230798bdce99dec6efc76791c024
|
||||
Author: Thomas Klausner <wiz@NetBSD.org>
|
||||
Date: Sun Jun 2 21:30:39 2013 +0200
|
||||
|
||||
Protect config.h like usual.
|
||||
|
||||
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit ace5e2b21b2a204f94c6452fa0d8f36699aec249
|
||||
Author: Andy Ritger <aritger@nvidia.com>
|
||||
Date: Thu May 2 01:20:27 2013 -0700
|
||||
|
||||
xrandr: calloc XRRModeInfo's passed to libXrandr.
|
||||
|
||||
The "--newmode" commandline option initializes an XRRModeInfo and passes
|
||||
it into XRRCreateMode(). calloc(3) it to avoid uninitialized fields.
|
||||
For consistency, calloc(3) all the places where umode_t's (the wrapper
|
||||
structure for XRRModeInfo) are allocated.
|
||||
|
||||
Signed-off-by: Andy Ritger <aritger@nvidia.com>
|
||||
Tested-by: Nikhil Mahale <nmahale@nvidia.com>
|
||||
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
|
||||
commit eb17ad8adc9400f6ed252872f13ccf5551f9e2e9
|
||||
Author: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Thu Feb 28 12:01:53 2013 -0800
|
||||
|
||||
Print spaces between XA_ATOM property values
|
||||
|
||||
Commit b26fd532b3dab222956ea27eef4e41345978b5b2 redid how xrandr prints
|
||||
properties. It neglected to put spaces between the values of XA_ATOM
|
||||
properties, so they all run together. For example,
|
||||
|
||||
audio: auto
|
||||
supported: force-dvioffautoon
|
||||
|
||||
Fix this by putting a space after each atom name. In addition, some drivers
|
||||
create property values with spaces in them, so put commas between entries to
|
||||
disambiguate. For example,
|
||||
|
||||
Broadcast RGB: Automatic
|
||||
supported: Automatic, Full, Limited 16:235
|
||||
|
||||
Do the same for properties with multiple valid ranges.
|
||||
|
||||
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 222f245fb3a00308cb3ff491f5c84ac9c69c3253
|
||||
Author: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Tue Feb 12 13:24:38 2013 -0800
|
||||
|
||||
@ -274,6 +274,8 @@ PACKAGE_URL = @PACKAGE_URL@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
|
||||
94
app/xrandr/aclocal.m4
vendored
94
app/xrandr/aclocal.m4
vendored
@ -20,6 +20,7 @@ If you have problems, you may need to regenerate the build system entirely.
|
||||
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
|
||||
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 1 (pkg-config-0.24)
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
@ -46,8 +47,12 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
|
||||
# ----------------------------------
|
||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
|
||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
|
||||
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
|
||||
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
|
||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
|
||||
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
|
||||
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
|
||||
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
||||
fi
|
||||
@ -60,7 +65,6 @@ if test -n "$PKG_CONFIG"; then
|
||||
AC_MSG_RESULT([no])
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
|
||||
fi[]dnl
|
||||
])# PKG_PROG_PKG_CONFIG
|
||||
|
||||
@ -69,32 +73,30 @@ fi[]dnl
|
||||
# Check to see whether a particular set of modules exists. Similar
|
||||
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
#
|
||||
#
|
||||
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
|
||||
# this or PKG_CHECK_MODULES is called, or make sure to call
|
||||
# PKG_CHECK_EXISTS manually
|
||||
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
# only at the first occurence in configure.ac, so if the first place
|
||||
# it's called might be skipped (such as if it is within an "if", you
|
||||
# have to call PKG_CHECK_EXISTS manually
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
||||
m4_ifval([$2], [$2], [:])
|
||||
m4_default([$2], [:])
|
||||
m4_ifvaln([$3], [else
|
||||
$3])dnl
|
||||
fi])
|
||||
|
||||
|
||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
# ---------------------------------------------
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$$1"; then
|
||||
[if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
else
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
PKG_CHECK_EXISTS([$3],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes ],
|
||||
[pkg_failed=yes])
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
@ -138,16 +140,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
AC_MSG_RESULT([no])
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
|
||||
ifelse([$4], , [AC_MSG_ERROR(dnl
|
||||
m4_default([$4], [AC_MSG_ERROR(
|
||||
[Package requirements ($2) were not met:
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
@ -155,28 +158,67 @@ $$1_PKG_ERRORS
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
_PKG_TEXT
|
||||
])],
|
||||
[AC_MSG_RESULT([no])
|
||||
$4])
|
||||
_PKG_TEXT])[]dnl
|
||||
])
|
||||
elif test $pkg_failed = untried; then
|
||||
ifelse([$4], , [AC_MSG_FAILURE(dnl
|
||||
AC_MSG_RESULT([no])
|
||||
m4_default([$4], [AC_MSG_FAILURE(
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
_PKG_TEXT
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
|
||||
[$4])
|
||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
|
||||
])
|
||||
else
|
||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
AC_MSG_RESULT([yes])
|
||||
ifelse([$3], , :, [$3])
|
||||
$3
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
||||
|
||||
|
||||
# PKG_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable pkgconfigdir as the location where a module
|
||||
# should install pkg-config .pc files. By default the directory is
|
||||
# $libdir/pkgconfig, but the default can be changed by passing
|
||||
# DIRECTORY. The user can override through the --with-pkgconfigdir
|
||||
# parameter.
|
||||
AC_DEFUN([PKG_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
[pkg-config installation directory @<:@]pkg_default[@:>@])
|
||||
AC_ARG_WITH([pkgconfigdir],
|
||||
[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
|
||||
[with_pkgconfigdir=]pkg_default)
|
||||
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_INSTALLDIR
|
||||
|
||||
|
||||
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable noarch_pkgconfigdir as the location where a
|
||||
# module should install arch-independent pkg-config .pc files. By
|
||||
# default the directory is $datadir/pkgconfig, but the default can be
|
||||
# changed by passing DIRECTORY. The user can override through the
|
||||
# --with-noarch-pkgconfigdir parameter.
|
||||
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
[pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
|
||||
AC_ARG_WITH([noarch-pkgconfigdir],
|
||||
[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
|
||||
[with_noarch_pkgconfigdir=]pkg_default)
|
||||
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_NOARCH_INSTALLDIR
|
||||
|
||||
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
@ -1199,7 +1241,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.17])
|
||||
m4_define([vers_have], [1.16.2])
|
||||
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,,
|
||||
|
||||
@ -1,4 +1,351 @@
|
||||
#! /bin/sh
|
||||
# Wrapper for compilers which do not understand '-c -o'.
|
||||
|
||||
scriptversion=2012-10-14.11; # UTC
|
||||
|
||||
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# This file is maintained in Automake, please report
|
||||
# bugs to <bug-automake@gnu.org> or send patches to
|
||||
# <automake-patches@gnu.org>.
|
||||
|
||||
nl='
|
||||
'
|
||||
|
||||
# We need space, tab and new line, in precisely that order. Quoting is
|
||||
# there to prevent tools from complaining about whitespace usage.
|
||||
IFS=" "" $nl"
|
||||
|
||||
file_conv=
|
||||
|
||||
# func_file_conv build_file lazy
|
||||
# Convert a $build file to $host form and store it in $file
|
||||
# Currently only supports Windows hosts. If the determined conversion
|
||||
# type is listed in (the comma separated) LAZY, no conversion will
|
||||
# take place.
|
||||
func_file_conv ()
|
||||
{
|
||||
file=$1
|
||||
case $file in
|
||||
/ | /[!/]*) # absolute file, and not a UNC file
|
||||
if test -z "$file_conv"; then
|
||||
# lazily determine how to convert abs files
|
||||
case `uname -s` in
|
||||
MINGW*)
|
||||
file_conv=mingw
|
||||
;;
|
||||
CYGWIN*)
|
||||
file_conv=cygwin
|
||||
;;
|
||||
*)
|
||||
file_conv=wine
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
case $file_conv/,$2, in
|
||||
*,$file_conv,*)
|
||||
;;
|
||||
mingw/*)
|
||||
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
||||
;;
|
||||
cygwin/*)
|
||||
file=`cygpath -m "$file" || echo "$file"`
|
||||
;;
|
||||
wine/*)
|
||||
file=`winepath -w "$file" || echo "$file"`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# func_cl_dashL linkdir
|
||||
# Make cl look for libraries in LINKDIR
|
||||
func_cl_dashL ()
|
||||
{
|
||||
func_file_conv "$1"
|
||||
if test -z "$lib_path"; then
|
||||
lib_path=$file
|
||||
else
|
||||
lib_path="$lib_path;$file"
|
||||
fi
|
||||
linker_opts="$linker_opts -LIBPATH:$file"
|
||||
}
|
||||
|
||||
# func_cl_dashl library
|
||||
# Do a library search-path lookup for cl
|
||||
func_cl_dashl ()
|
||||
{
|
||||
lib=$1
|
||||
found=no
|
||||
save_IFS=$IFS
|
||||
IFS=';'
|
||||
for dir in $lib_path $LIB
|
||||
do
|
||||
IFS=$save_IFS
|
||||
if $shared && test -f "$dir/$lib.dll.lib"; then
|
||||
found=yes
|
||||
lib=$dir/$lib.dll.lib
|
||||
break
|
||||
fi
|
||||
if test -f "$dir/$lib.lib"; then
|
||||
found=yes
|
||||
lib=$dir/$lib.lib
|
||||
break
|
||||
fi
|
||||
if test -f "$dir/lib$lib.a"; then
|
||||
found=yes
|
||||
lib=$dir/lib$lib.a
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS=$save_IFS
|
||||
|
||||
if test "$found" != yes; then
|
||||
lib=$lib.lib
|
||||
fi
|
||||
}
|
||||
|
||||
# func_cl_wrapper cl arg...
|
||||
# Adjust compile command to suit cl
|
||||
func_cl_wrapper ()
|
||||
{
|
||||
# Assume a capable shell
|
||||
lib_path=
|
||||
shared=:
|
||||
linker_opts=
|
||||
for arg
|
||||
do
|
||||
if test -n "$eat"; then
|
||||
eat=
|
||||
else
|
||||
case $1 in
|
||||
-o)
|
||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
||||
eat=1
|
||||
case $2 in
|
||||
*.o | *.[oO][bB][jJ])
|
||||
func_file_conv "$2"
|
||||
set x "$@" -Fo"$file"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
func_file_conv "$2"
|
||||
set x "$@" -Fe"$file"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-I)
|
||||
eat=1
|
||||
func_file_conv "$2" mingw
|
||||
set x "$@" -I"$file"
|
||||
shift
|
||||
;;
|
||||
-I*)
|
||||
func_file_conv "${1#-I}" mingw
|
||||
set x "$@" -I"$file"
|
||||
shift
|
||||
;;
|
||||
-l)
|
||||
eat=1
|
||||
func_cl_dashl "$2"
|
||||
set x "$@" "$lib"
|
||||
shift
|
||||
;;
|
||||
-l*)
|
||||
func_cl_dashl "${1#-l}"
|
||||
set x "$@" "$lib"
|
||||
shift
|
||||
;;
|
||||
-L)
|
||||
eat=1
|
||||
func_cl_dashL "$2"
|
||||
;;
|
||||
-L*)
|
||||
func_cl_dashL "${1#-L}"
|
||||
;;
|
||||
-static)
|
||||
shared=false
|
||||
;;
|
||||
-Wl,*)
|
||||
arg=${1#-Wl,}
|
||||
save_ifs="$IFS"; IFS=','
|
||||
for flag in $arg; do
|
||||
IFS="$save_ifs"
|
||||
linker_opts="$linker_opts $flag"
|
||||
done
|
||||
IFS="$save_ifs"
|
||||
;;
|
||||
-Xlinker)
|
||||
eat=1
|
||||
linker_opts="$linker_opts $2"
|
||||
;;
|
||||
-*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
|
||||
func_file_conv "$1"
|
||||
set x "$@" -Tp"$file"
|
||||
shift
|
||||
;;
|
||||
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
|
||||
func_file_conv "$1" mingw
|
||||
set x "$@" "$file"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
shift
|
||||
done
|
||||
if test -n "$linker_opts"; then
|
||||
linker_opts="-link$linker_opts"
|
||||
fi
|
||||
exec "$@" $linker_opts
|
||||
exit 1
|
||||
}
|
||||
|
||||
eat=
|
||||
|
||||
case $1 in
|
||||
'')
|
||||
echo "$0: No command. Try '$0 --help' for more information." 1>&2
|
||||
exit 1;
|
||||
;;
|
||||
-h | --h*)
|
||||
cat <<\EOF
|
||||
Usage: compile [--help] [--version] PROGRAM [ARGS]
|
||||
|
||||
Wrapper for compilers which do not understand '-c -o'.
|
||||
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
|
||||
arguments, and rename the output as expected.
|
||||
|
||||
If you are trying to build a whole package this is not the
|
||||
right script to run: please start by reading the file 'INSTALL'.
|
||||
|
||||
Report bugs to <bug-automake@gnu.org>.
|
||||
EOF
|
||||
exit $?
|
||||
;;
|
||||
-v | --v*)
|
||||
echo "compile $scriptversion"
|
||||
exit $?
|
||||
;;
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
|
||||
func_cl_wrapper "$@" # Doesn't return...
|
||||
;;
|
||||
esac
|
||||
|
||||
ofile=
|
||||
cfile=
|
||||
|
||||
for arg
|
||||
do
|
||||
if test -n "$eat"; then
|
||||
eat=
|
||||
else
|
||||
case $1 in
|
||||
-o)
|
||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
||||
# So we strip '-o arg' only if arg is an object.
|
||||
eat=1
|
||||
case $2 in
|
||||
*.o | *.obj)
|
||||
ofile=$2
|
||||
;;
|
||||
*)
|
||||
set x "$@" -o "$2"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*.c)
|
||||
cfile=$1
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
shift
|
||||
done
|
||||
|
||||
if test -z "$ofile" || test -z "$cfile"; then
|
||||
# If no '-o' option was seen then we might have been invoked from a
|
||||
# pattern rule where we don't need one. That is ok -- this is a
|
||||
# normal compilation that the losing compiler can handle. If no
|
||||
# '.c' file was seen then we are probably linking. That is also
|
||||
# ok.
|
||||
exec "$@"
|
||||
fi
|
||||
|
||||
# Name of file we expect compiler to create.
|
||||
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
|
||||
|
||||
# Create the lock directory.
|
||||
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
|
||||
# that we are using for the .o file. Also, base the name on the expected
|
||||
# object file name, since that is what matters with a parallel build.
|
||||
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
|
||||
while true; do
|
||||
if mkdir "$lockdir" >/dev/null 2>&1; then
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
# FIXME: race condition here if user kills between mkdir and trap.
|
||||
trap "rmdir '$lockdir'; exit 1" 1 2 15
|
||||
|
||||
# Run the compile.
|
||||
"$@"
|
||||
ret=$?
|
||||
|
||||
if test -f "$cofile"; then
|
||||
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
|
||||
elif test -f "${cofile}bj"; then
|
||||
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
|
||||
fi
|
||||
|
||||
rmdir "$lockdir"
|
||||
exit $ret
|
||||
|
||||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
#! /bin/sh
|
||||
# Wrapper for compilers which do not understand `-c -o'.
|
||||
|
||||
scriptversion=2005-05-14.22
|
||||
|
||||
59
app/xrandr/configure
vendored
59
app/xrandr/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for xrandr 1.4.0.
|
||||
# Generated by GNU Autoconf 2.69 for xrandr 1.4.1.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -581,8 +581,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='xrandr'
|
||||
PACKAGE_TARNAME='xrandr'
|
||||
PACKAGE_VERSION='1.4.0'
|
||||
PACKAGE_STRING='xrandr 1.4.0'
|
||||
PACKAGE_VERSION='1.4.1'
|
||||
PACKAGE_STRING='xrandr 1.4.1'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@ -657,6 +657,8 @@ build_vendor
|
||||
build_cpu
|
||||
build
|
||||
INSTALL_CMD
|
||||
PKG_CONFIG_LIBDIR
|
||||
PKG_CONFIG_PATH
|
||||
PKG_CONFIG
|
||||
CHANGELOG_CMD
|
||||
STRICT_CFLAGS
|
||||
@ -761,6 +763,8 @@ LIBS
|
||||
CPPFLAGS
|
||||
CPP
|
||||
PKG_CONFIG
|
||||
PKG_CONFIG_PATH
|
||||
PKG_CONFIG_LIBDIR
|
||||
XRANDR_CFLAGS
|
||||
XRANDR_LIBS'
|
||||
|
||||
@ -1303,7 +1307,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.4.0 to adapt to many kinds of systems.
|
||||
\`configure' configures xrandr 1.4.1 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1373,7 +1377,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xrandr 1.4.0:";;
|
||||
short | recursive ) echo "Configuration of xrandr 1.4.1:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1404,6 +1408,10 @@ Some influential environment variables:
|
||||
you have headers in a nonstandard directory <include dir>
|
||||
CPP C preprocessor
|
||||
PKG_CONFIG path to pkg-config utility
|
||||
PKG_CONFIG_PATH
|
||||
directories to add to pkg-config's search path
|
||||
PKG_CONFIG_LIBDIR
|
||||
path overriding pkg-config's built-in search path
|
||||
XRANDR_CFLAGS
|
||||
C compiler flags for XRANDR, overriding pkg-config
|
||||
XRANDR_LIBS linker flags for XRANDR, overriding pkg-config
|
||||
@ -1474,7 +1482,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xrandr configure 1.4.0
|
||||
xrandr configure 1.4.1
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@ -1731,7 +1739,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.4.0, which was
|
||||
It was created by xrandr $as_me 1.4.1, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2560,7 +2568,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xrandr'
|
||||
VERSION='1.4.0'
|
||||
VERSION='1.4.1'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -4202,6 +4210,11 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
||||
@ -4314,7 +4327,6 @@ $as_echo "yes" >&6; }
|
||||
$as_echo "no" >&6; }
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
|
||||
fi
|
||||
# Make sure we can run config.sub.
|
||||
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
||||
@ -10325,10 +10337,9 @@ pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRANDR" >&5
|
||||
$as_echo_n "checking for XRANDR... " >&6; }
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$XRANDR_CFLAGS"; then
|
||||
pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS"
|
||||
else
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.4 xrender x11 xproto >= 7.0.17\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "xrandr >= 1.4 xrender x11 xproto >= 7.0.17") 2>&5
|
||||
@ -10336,17 +10347,16 @@ if test -n "$PKG_CONFIG"; then
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.4 xrender x11 xproto >= 7.0.17" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$XRANDR_LIBS"; then
|
||||
pkg_cv_XRANDR_LIBS="$XRANDR_LIBS"
|
||||
else
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.4 xrender x11 xproto >= 7.0.17\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "xrandr >= 1.4 xrender x11 xproto >= 7.0.17") 2>&5
|
||||
@ -10354,10 +10364,10 @@ if test -n "$PKG_CONFIG"; then
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.4 xrender x11 xproto >= 7.0.17" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
@ -10365,6 +10375,8 @@ fi
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
@ -10372,9 +10384,9 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
XRANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xrandr >= 1.4 xrender x11 xproto >= 7.0.17"`
|
||||
XRANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xrandr >= 1.4 xrender x11 xproto >= 7.0.17" 2>&1`
|
||||
else
|
||||
XRANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrandr >= 1.4 xrender x11 xproto >= 7.0.17"`
|
||||
XRANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xrandr >= 1.4 xrender x11 xproto >= 7.0.17" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$XRANDR_PKG_ERRORS" >&5
|
||||
@ -10388,9 +10400,10 @@ installed software in a non-standard prefix.
|
||||
|
||||
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.
|
||||
" "$LINENO" 5
|
||||
See the pkg-config man page for more details." "$LINENO" 5
|
||||
elif test $pkg_failed = untried; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
|
||||
@ -10401,14 +10414,14 @@ 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.
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
|
||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
||||
See \`config.log' for more details" "$LINENO" 5; }
|
||||
else
|
||||
XRANDR_CFLAGS=$pkg_cv_XRANDR_CFLAGS
|
||||
XRANDR_LIBS=$pkg_cv_XRANDR_LIBS
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
:
|
||||
|
||||
fi
|
||||
|
||||
ac_config_files="$ac_config_files Makefile man/Makefile"
|
||||
@ -10943,7 +10956,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.4.0, which was
|
||||
This file was extended by xrandr $as_me 1.4.1, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -11009,7 +11022,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
xrandr config.status 1.4.0
|
||||
xrandr config.status 1.4.1
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
|
||||
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xrandr], [1.4.0],
|
||||
AC_INIT([xrandr], [1.4.1],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrandr])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
@ -168,6 +168,8 @@ PACKAGE_URL = @PACKAGE_URL@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
xrandr \- primitive command line interface to RandR extension
|
||||
.SH SYNOPSIS
|
||||
.B "xrandr"
|
||||
[\-help] [\-display \fIdisplay\fP]
|
||||
[\-\-help] [\-\-display \fIdisplay\fP]
|
||||
[\-q] [\-v]
|
||||
[\-\-verbose]
|
||||
[\-\-dryrun]
|
||||
@ -84,7 +84,7 @@ There are a few global options. Other options modify the last output that is
|
||||
specified in earlier parameters in the command line. Multiple outputs may
|
||||
be modified at the same time by passing multiple \-\-output options followed
|
||||
immediately by their corresponding modifying options.
|
||||
.IP \-help
|
||||
.IP \-\-help
|
||||
Print out a summary of the usage and exit.
|
||||
.IP "\-v, \-\-version"
|
||||
Print out the RandR version reported by the X server and exit.
|
||||
@ -104,7 +104,7 @@ Performs all the actions specified except that no changes are made.
|
||||
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"
|
||||
.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).
|
||||
.IP "\-\-screen \fIsnum\fP"
|
||||
|
||||
@ -41,7 +41,9 @@
|
||||
#include <stdarg.h>
|
||||
#include <math.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
static char *program_name;
|
||||
static Display *dpy;
|
||||
@ -95,62 +97,62 @@ static const struct {
|
||||
static void
|
||||
usage(void)
|
||||
{
|
||||
printf("usage: %s [options]\n", program_name);
|
||||
printf(" where options are:\n");
|
||||
printf(" -display <display> or -d <display>\n");
|
||||
printf(" --help\n");
|
||||
printf(" -o <normal,inverted,left,right,0,1,2,3>\n");
|
||||
printf(" or --orientation <normal,inverted,left,right,0,1,2,3>\n");
|
||||
printf(" -q or --query\n");
|
||||
printf(" -s <size>/<width>x<height> or --size <size>/<width>x<height>\n");
|
||||
printf(" -r <rate> or --rate <rate> or --refresh <rate>\n");
|
||||
printf(" -v or --version\n");
|
||||
printf(" -x (reflect in x)\n");
|
||||
printf(" -y (reflect in y)\n");
|
||||
printf(" --screen <screen>\n");
|
||||
printf(" --verbose\n");
|
||||
printf(" --current\n");
|
||||
printf(" --dryrun\n");
|
||||
printf(" --nograb\n");
|
||||
printf(" --prop or --properties\n");
|
||||
printf(" --fb <width>x<height>\n");
|
||||
printf(" --fbmm <width>x<height>\n");
|
||||
printf(" --dpi <dpi>/<output>\n");
|
||||
printf(" --output <output>\n");
|
||||
printf(" --auto\n");
|
||||
printf(" --mode <mode>\n");
|
||||
printf(" --preferred\n");
|
||||
printf(" --pos <x>x<y>\n");
|
||||
printf(" --rate <rate> or --refresh <rate>\n");
|
||||
printf(" --reflect normal,x,y,xy\n");
|
||||
printf(" --rotate normal,inverted,left,right\n");
|
||||
printf(" --left-of <output>\n");
|
||||
printf(" --right-of <output>\n");
|
||||
printf(" --above <output>\n");
|
||||
printf(" --below <output>\n");
|
||||
printf(" --same-as <output>\n");
|
||||
printf(" --set <property> <value>\n");
|
||||
printf(" --scale <x>x<y>\n");
|
||||
printf(" --scale-from <w>x<h>\n");
|
||||
printf(" --transform <a>,<b>,<c>,<d>,<e>,<f>,<g>,<h>,<i>\n");
|
||||
printf(" --off\n");
|
||||
printf(" --crtc <crtc>\n");
|
||||
printf(" --panning <w>x<h>[+<x>+<y>[/<track:w>x<h>+<x>+<y>[/<border:l>/<t>/<r>/<b>]]]\n");
|
||||
printf(" --gamma <r>:<g>:<b>\n");
|
||||
printf(" --primary\n");
|
||||
printf(" --noprimary\n");
|
||||
printf(" --newmode <name> <clock MHz>\n");
|
||||
printf(" <hdisp> <hsync-start> <hsync-end> <htotal>\n");
|
||||
printf(" <vdisp> <vsync-start> <vsync-end> <vtotal>\n");
|
||||
printf(" [flags...]\n");
|
||||
printf(" Valid flags: +HSync -HSync +VSync -VSync\n");
|
||||
printf(" +CSync -CSync CSync Interlace DoubleScan\n");
|
||||
printf(" --rmmode <name>\n");
|
||||
printf(" --addmode <output> <name>\n");
|
||||
printf(" --delmode <output> <name>\n");
|
||||
printf(" --listproviders\n");
|
||||
printf(" --setprovideroutputsource <prov-xid> <source-xid>\n");
|
||||
printf(" --setprovideroffloadsink <prov-xid> <sink-xid>\n");
|
||||
printf("usage: %s [options]\n%s", program_name,
|
||||
" where options are:\n"
|
||||
" --display <display> or -d <display>\n"
|
||||
" --help\n"
|
||||
" -o <normal,inverted,left,right,0,1,2,3>\n"
|
||||
" or --orientation <normal,inverted,left,right,0,1,2,3>\n"
|
||||
" -q or --query\n"
|
||||
" -s <size>/<width>x<height> or --size <size>/<width>x<height>\n"
|
||||
" -r <rate> or --rate <rate> or --refresh <rate>\n"
|
||||
" -v or --version\n"
|
||||
" -x (reflect in x)\n"
|
||||
" -y (reflect in y)\n"
|
||||
" --screen <screen>\n"
|
||||
" --verbose\n"
|
||||
" --current\n"
|
||||
" --dryrun\n"
|
||||
" --nograb\n"
|
||||
" --prop or --properties\n"
|
||||
" --fb <width>x<height>\n"
|
||||
" --fbmm <width>x<height>\n"
|
||||
" --dpi <dpi>/<output>\n"
|
||||
" --output <output>\n"
|
||||
" --auto\n"
|
||||
" --mode <mode>\n"
|
||||
" --preferred\n"
|
||||
" --pos <x>x<y>\n"
|
||||
" --rate <rate> or --refresh <rate>\n"
|
||||
" --reflect normal,x,y,xy\n"
|
||||
" --rotate normal,inverted,left,right\n"
|
||||
" --left-of <output>\n"
|
||||
" --right-of <output>\n"
|
||||
" --above <output>\n"
|
||||
" --below <output>\n"
|
||||
" --same-as <output>\n"
|
||||
" --set <property> <value>\n"
|
||||
" --scale <x>x<y>\n"
|
||||
" --scale-from <w>x<h>\n"
|
||||
" --transform <a>,<b>,<c>,<d>,<e>,<f>,<g>,<h>,<i>\n"
|
||||
" --off\n"
|
||||
" --crtc <crtc>\n"
|
||||
" --panning <w>x<h>[+<x>+<y>[/<track:w>x<h>+<x>+<y>[/<border:l>/<t>/<r>/<b>]]]\n"
|
||||
" --gamma <r>:<g>:<b>\n"
|
||||
" --primary\n"
|
||||
" --noprimary\n"
|
||||
" --newmode <name> <clock MHz>\n"
|
||||
" <hdisp> <hsync-start> <hsync-end> <htotal>\n"
|
||||
" <vdisp> <vsync-start> <vsync-end> <vtotal>\n"
|
||||
" [flags...]\n"
|
||||
" Valid flags: +HSync -HSync +VSync -VSync\n"
|
||||
" +CSync -CSync CSync Interlace DoubleScan\n"
|
||||
" --rmmode <name>\n"
|
||||
" --addmode <output> <name>\n"
|
||||
" --delmode <output> <name>\n"
|
||||
" --listproviders\n"
|
||||
" --setprovideroutputsource <prov-xid> <source-xid>\n"
|
||||
" --setprovideroffloadsink <prov-xid> <sink-xid>\n");
|
||||
}
|
||||
|
||||
static void _X_NORETURN _X_ATTRIBUTE_PRINTF(1,2)
|
||||
@ -227,7 +229,7 @@ reflection_name (Rotation rotation)
|
||||
return "invalid reflection";
|
||||
}
|
||||
|
||||
static char *
|
||||
static const char *
|
||||
capability_name (int cap_bit)
|
||||
{
|
||||
switch (cap_bit) {
|
||||
@ -2508,7 +2510,8 @@ main (int argc, char **argv)
|
||||
|
||||
program_name = argv[0];
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (!strcmp ("-display", argv[i]) || !strcmp ("-d", argv[i])) {
|
||||
if (!strcmp ("-display", argv[i]) || !strcmp ("--display", argv[i]) ||
|
||||
!strcmp ("-d", argv[i])) {
|
||||
if (++i >= argc) argerr ("%s requires an argument\n", argv[i-1]);
|
||||
display_name = argv[i];
|
||||
continue;
|
||||
@ -2924,7 +2927,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
if (!strcmp ("--newmode", argv[i]))
|
||||
{
|
||||
umode_t *m = malloc (sizeof (umode_t));
|
||||
umode_t *m = calloc (1, sizeof (umode_t));
|
||||
double clock;
|
||||
|
||||
++i;
|
||||
@ -2966,7 +2969,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
if (!strcmp ("--rmmode", argv[i]))
|
||||
{
|
||||
umode_t *m = malloc (sizeof (umode_t));
|
||||
umode_t *m = calloc (1, sizeof (umode_t));
|
||||
|
||||
if (++i >= argc) argerr ("%s requires an argument\n", argv[i-1]);
|
||||
set_name (&m->name, argv[i], name_string|name_xid);
|
||||
@ -2979,7 +2982,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
if (!strcmp ("--addmode", argv[i]))
|
||||
{
|
||||
umode_t *m = malloc (sizeof (umode_t));
|
||||
umode_t *m = calloc (1, sizeof (umode_t));
|
||||
|
||||
if (i+2 >= argc) argerr ("%s requires two arguments\n", argv[i]);
|
||||
set_name (&m->output, argv[++i], name_string|name_xid);
|
||||
@ -2993,7 +2996,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
if (!strcmp ("--delmode", argv[i]))
|
||||
{
|
||||
umode_t *m = malloc (sizeof (umode_t));
|
||||
umode_t *m = calloc (1, sizeof (umode_t));
|
||||
|
||||
if (i+2 >= argc) argerr ("%s requires two arguments\n", argv[i]);
|
||||
set_name (&m->output, argv[++i], name_string|name_xid);
|
||||
@ -3560,6 +3563,8 @@ main (int argc, char **argv)
|
||||
print_output_property_value (False, 32, actual_type,
|
||||
(unsigned char *) &(propinfo->values[k * 2 + 1]));
|
||||
printf (")");
|
||||
if (k < propinfo->num_values / 2 - 1)
|
||||
printf (", ");
|
||||
}
|
||||
printf ("\n");
|
||||
}
|
||||
@ -3570,6 +3575,8 @@ main (int argc, char **argv)
|
||||
{
|
||||
print_output_property_value (False, 32, actual_type,
|
||||
(unsigned char *) &(propinfo->values[k]));
|
||||
if (k < propinfo->num_values - 1)
|
||||
printf (", ");
|
||||
}
|
||||
printf ("\n");
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user