diff options
Diffstat (limited to 'app/xrandr')
| -rw-r--r-- | app/xrandr/ChangeLog | 99 | ||||
| -rw-r--r-- | app/xrandr/Makefile.in | 9 | ||||
| -rw-r--r-- | app/xrandr/aclocal.m4 | 38 | ||||
| -rw-r--r-- | app/xrandr/compile | 347 | ||||
| -rw-r--r-- | app/xrandr/configure | 54 | ||||
| -rw-r--r-- | app/xrandr/configure.ac | 3 | ||||
| -rw-r--r-- | app/xrandr/man/Makefile.in | 7 | ||||
| -rw-r--r-- | app/xrandr/xrandr.c | 43 |
8 files changed, 203 insertions, 397 deletions
diff --git a/app/xrandr/ChangeLog b/app/xrandr/ChangeLog index 25dd0a8bf..5be4d027e 100644 --- a/app/xrandr/ChangeLog +++ b/app/xrandr/ChangeLog @@ -1,3 +1,90 @@ +commit 9887ed4989e0abd48004598be0eb5cb06fa40bd1 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Fri Aug 1 23:14:42 2014 -0700 + + xrandr 1.4.3 + + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + +commit 20d76f773cf8de474cf7a3f1082961605732c3f1 +Merge: 00477d8 193a358 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Fri Aug 1 23:10:46 2014 -0700 + + Merge commit '193a358' + + Conflicts: + xrandr.c + +commit 193a358563a59c1a3fc55f55029c605e2419c80b +Author: Stéphane Aulery <lkppo@free.fr> +Date: Sat Jun 29 16:50:25 2013 -0700 + + Mention of --brightness with -h option + + Reported by jidanni at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709569 + + Signed-off-by: Stéphane Aulery <lkppo@free.fr> + Reviewed-By: Matt Dew <marcoz@osource.org> + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + +commit 00477d88297eaa6c87aa144548590c32540e3928 +Author: Connor Behan <connor.behan@gmail.com> +Date: Tue Jun 10 23:56:12 2014 -0700 + + Allow -x and -y switches to undo themselves + + People who want to dick around might think it is safe to run "xrandr -x" + before they know any of the other syntax. When "xrandr -x" again does + not get back to a normal screen, they are stuck having to read a manpage + with reflected text. + + Signed-off-by: Connor Behan <connor.behan@gmail.com> + Reviewed-by: Aaron Plattner <aplattner@nvidia.com> + Tested-by: Aaron Plattner <aplattner@nvidia.com> + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + +commit 7d464312fb84c080a6e287edd21a794193a0dd78 +Author: Connor Behan <connor.behan@gmail.com> +Date: Sun Jun 1 16:35:50 2014 -0700 + + Remove duplicate printing of the axis + + Even in verbose mode, why print the same information twice? + + Signed-off-by: Connor Behan <connor.behan@gmail.com> + Reviewed-by: Aaron Plattner <aplattner@nvidia.com> + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + +commit 792f05ea20d5191425154470760e36dcf023c6e9 +Author: Dominik Behr <dbehr@chromium.org> +Date: Tue Apr 1 18:38:05 2014 -0700 + + xrandr: use full range for gamma table generation + + Calculate gamma table using full [0,65536) range and do not make any + assumptions about relation of gamma table size and significant bits. + + Gamma table size has nothing to do with number of significant bits in hardware. + In particular we are dealing now with gamma table that has 17 entries and 8 + bit precision, there are other GPUs with 10 bit precision and less than 256 + entries using partial linear approximation. Deriving assumed gamma table + significant bits from size of gamma table leads to incorrect calculations and + loss of precision. Also XRandR specification never mentions that gamma tables + need to be power of 2. + + Signed-off-by: Dominik Behr <dbehr@chromium.org> + Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> + +commit 866366d0825c3f488abd58960e4f76ae50de08d1 +Author: Thomas Klausner <wiz@NetBSD.org> +Date: Sat Mar 29 00:50:17 2014 +0100 + + Remove unnecessary parentheses. + + Reviewed-by: Hans de Goede <hdegoede@redhat.com> + Signed-off-by: Thomas Klausner <wiz@NetBSD.org> + commit 31f5fa6a47db154abb47cf16e9f6cc4d983ad371 Author: Aaron Plattner <aplattner@nvidia.com> Date: Thu Mar 27 11:37:07 2014 -0700 @@ -206,7 +293,7 @@ Date: Tue Feb 12 13:24:38 2013 -0800 Signed-off-by: Aaron Plattner <aplattner@nvidia.com> commit 3e5f160c4198a5160be5e9a3f21ba3f4130d4318 -Merge: dac72dbbc750 bd166184f6c1 +Merge: dac72db bd16618 Author: Aaron Plattner <aplattner@nvidia.com> Date: Tue Feb 12 12:30:20 2013 -0800 @@ -1472,7 +1559,7 @@ Date: Mon Dec 1 21:45:47 2008 +0100 Fix build outside of the source dir commit 63ba316bcbe8ad61ba63d9fe62c82e7d56dcc399 -Merge: a813c4da7f0b 1b95e32b4b0a +Merge: a813c4d 1b95e32 Author: Julien Cristau <jcristau@debian.org> Date: Mon Dec 1 21:33:35 2008 +0100 @@ -1950,7 +2037,7 @@ Date: Sun Feb 18 21:27:55 2007 -0800 Update version number to 1.2.0 for release. commit 13cef2baa884039e96f5dfd9245bb949aed99448 -Merge: 065f09cc304d a175972de6fb +Merge: 065f09c a175972 Author: Keith Packard <keithp@neko.keithp.com> Date: Sun Feb 18 21:26:50 2007 -0800 @@ -1992,7 +2079,7 @@ Date: Sat Feb 10 16:14:58 2007 -0800 Display set of available CRTCs per output in --verbose mode. commit 067cafb5cda0aa6e34773e888fd469ff657760c2 -Merge: 7c25c245bceb b0a00df69f83 +Merge: 7c25c24 b0a00df Author: Keith Packard <keithp@guitar.keithp.com> Date: Wed Jan 31 15:25:35 2007 -0800 @@ -2151,7 +2238,7 @@ Date: Tue Dec 19 16:27:46 2006 -0800 Actually respect the --fb option commit 7b32611632ab08b6a123db5df1c2b919b3a12104 -Merge: a0df3aa81205 4bb1a9cd6f9c +Merge: a0df3aa 4bb1a9c Author: Keith Packard <keithp@guitar.keithp.com> Date: Tue Dec 19 15:58:38 2006 -0800 @@ -2164,7 +2251,7 @@ Date: Tue Dec 19 15:58:21 2006 -0800 Correct format for sscanf to double variable "dpi" commit 4bb1a9cd6f9cc3ed61d7913528afa3f573092833 -Merge: b6c03827bae7 6ef400f35d7d +Merge: b6c0382 6ef400f Author: Keith Packard <keithp@bouzouki.jf.intel.com> Date: Wed Dec 13 11:36:36 2006 -0800 diff --git a/app/xrandr/Makefile.in b/app/xrandr/Makefile.in index c4ec871aa..d288cd21d 100644 --- a/app/xrandr/Makefile.in +++ b/app/xrandr/Makefile.in @@ -259,6 +259,7 @@ LIBS = @LIBS@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ @@ -351,7 +352,7 @@ all: config.h .SUFFIXES: .c .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -378,9 +379,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): @@ -391,7 +392,7 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ diff --git a/app/xrandr/aclocal.m4 b/app/xrandr/aclocal.m4 index ab0fe6a65..e6e77e261 100644 --- a/app/xrandr/aclocal.m4 +++ b/app/xrandr/aclocal.m4 @@ -799,6 +799,44 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001-2012 Free Software Foundation, Inc. diff --git a/app/xrandr/compile b/app/xrandr/compile index 7b31d3412..1b1d23216 100644 --- a/app/xrandr/compile +++ b/app/xrandr/compile @@ -1,351 +1,4 @@ #! /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 diff --git a/app/xrandr/configure b/app/xrandr/configure index 20ceb6f8a..5eb0415b5 100644 --- a/app/xrandr/configure +++ b/app/xrandr/configure @@ -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.2. +# Generated by GNU Autoconf 2.69 for xrandr 1.4.3. # # 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.2' -PACKAGE_STRING='xrandr 1.4.2' +PACKAGE_VERSION='1.4.3' +PACKAGE_STRING='xrandr 1.4.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -684,6 +684,9 @@ CPPFLAGS LDFLAGS CFLAGS CC +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -748,6 +751,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_maintainer_mode enable_dependency_tracking enable_selective_werror enable_strict_compilation @@ -1307,7 +1311,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.2 to adapt to many kinds of systems. +\`configure' configures xrandr 1.4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1377,7 +1381,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xrandr 1.4.2:";; + short | recursive ) echo "Configuration of xrandr 1.4.3:";; esac cat <<\_ACEOF @@ -1385,6 +1389,9 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --enable-dependency-tracking do not reject slow dependency extractors --disable-dependency-tracking @@ -1482,7 +1489,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xrandr configure 1.4.2 +xrandr configure 1.4.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1739,7 +1746,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.2, which was +It was created by xrandr $as_me 1.4.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2568,7 +2575,7 @@ fi # Define the identity of the package. PACKAGE='xrandr' - VERSION='1.4.2' + VERSION='1.4.3' cat >>confdefs.h <<_ACEOF @@ -2615,6 +2622,29 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS @@ -10601,6 +10631,10 @@ else am__EXEEXT_FALSE= fi +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -11006,7 +11040,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.2, which was +This file was extended by xrandr $as_me 1.4.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11072,7 +11106,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.2 +xrandr config.status 1.4.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/app/xrandr/configure.ac b/app/xrandr/configure.ac index ff4a7c1aa..fa7cb48c4 100644 --- a/app/xrandr/configure.ac +++ b/app/xrandr/configure.ac @@ -22,13 +22,14 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xrandr], [1.4.2], +AC_INIT([xrandr], [1.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrandr]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], diff --git a/app/xrandr/man/Makefile.in b/app/xrandr/man/Makefile.in index 091ceda15..2e8edd9b1 100644 --- a/app/xrandr/man/Makefile.in +++ b/app/xrandr/man/Makefile.in @@ -153,6 +153,7 @@ LIBS = @LIBS@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ @@ -239,7 +240,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .$(APP_MAN_SUFFIX) .man -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -264,9 +265,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-appmanDATA: $(appman_DATA) diff --git a/app/xrandr/xrandr.c b/app/xrandr/xrandr.c index e08a7d6b0..366f6dc63 100644 --- a/app/xrandr/xrandr.c +++ b/app/xrandr/xrandr.c @@ -139,6 +139,7 @@ usage(void) " --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" + " --brightness <value>\n" " --primary\n" " --noprimary\n" " --newmode <name> <clock MHz>\n" @@ -1394,7 +1395,7 @@ set_gamma(void) output_t *output; for (output = all_outputs; output; output = output->next) { - int i, size, shift; + int i, size; crtc_t *crtc; XRRCrtcGamma *crtc_gamma; float gammaRed; @@ -1429,14 +1430,6 @@ set_gamma(void) continue; } - /* - * The hardware color lookup table has a number of significant - * bits equal to ffs(size) - 1; compute all values so that - * they are in the range [0,size) then shift the values so - * that they occupy the MSBs of the 16-bit X Color. - */ - shift = 16 - (ffs(size) - 1); - crtc_gamma = XRRAllocGamma(size); if (!crtc_gamma) { fatal("Gamma allocation failed.\n"); @@ -1456,28 +1449,25 @@ set_gamma(void) for (i = 0; i < size; i++) { if (gammaRed == 1.0 && output->brightness == 1.0) - crtc_gamma->red[i] = i; + crtc_gamma->red[i] = (double)i / (double)(size - 1) * 65535.0; else crtc_gamma->red[i] = dmin(pow((double)i/(double)(size - 1), gammaRed) * output->brightness, - 1.0) * (double)(size - 1); - crtc_gamma->red[i] <<= shift; + 1.0) * 65535.0; if (gammaGreen == 1.0 && output->brightness == 1.0) - crtc_gamma->green[i] = i; + crtc_gamma->green[i] = (double)i / (double)(size - 1) * 65535.0; else crtc_gamma->green[i] = dmin(pow((double)i/(double)(size - 1), gammaGreen) * output->brightness, - 1.0) * (double)(size - 1); - crtc_gamma->green[i] <<= shift; + 1.0) * 65535.0; if (gammaBlue == 1.0 && output->brightness == 1.0) - crtc_gamma->blue[i] = i; + crtc_gamma->blue[i] = (double)i / (double)(size - 1) * 65535.0; else crtc_gamma->blue[i] = dmin(pow((double)i/(double)(size - 1), gammaBlue) * output->brightness, - 1.0) * (double)(size - 1); - crtc_gamma->blue[i] <<= shift; + 1.0) * 65535.0; } XRRSetCrtcGamma(dpy, crtc->crtc.xid, crtc_gamma); @@ -2582,6 +2572,8 @@ main (int argc, char **argv) Bool provsetoffsink = False; int major, minor; Bool current = False; + Bool toggle_x = False; + Bool toggle_y = False; program_name = argv[0]; for (i = 1; i < argc; i++) { @@ -2650,13 +2642,13 @@ main (int argc, char **argv) } if (!strcmp ("-x", argv[i])) { - reflection |= RR_Reflect_X; + toggle_x = True; setit = True; action_requested = True; continue; } if (!strcmp ("-y", argv[i])) { - reflection |= RR_Reflect_Y; + toggle_y = True; setit = True; action_requested = True; continue; @@ -3266,13 +3258,13 @@ main (int argc, char **argv) nelements = 1; format = 32; } - else if ((type == XA_ATOM)) + else if (type == XA_ATOM) { ulong_value = XInternAtom (dpy, prop->value, False); data = (unsigned char *) &ulong_value; nelements = 1; } - else if ((type == XA_STRING || type == AnyPropertyType)) + else if (type == XA_STRING || type == AnyPropertyType) { type = XA_STRING; data = (unsigned char *) prop->value; @@ -3835,6 +3827,9 @@ main (int argc, char **argv) { Rotation rotations = XRRConfigRotations(sc, ¤t_rotation); + if (toggle_x && !(current_rotation & RR_Reflect_X)) reflection |= RR_Reflect_X; + if (toggle_y && !(current_rotation & RR_Reflect_Y)) reflection |= RR_Reflect_Y; + if (query) { printf("Current rotation - %s\n", rotation_name (current_rotation)); @@ -3872,10 +3867,6 @@ main (int argc, char **argv) else printf ("neither axis"); printf ("\n"); - - if (reflection & RR_Reflect_X) printf("Setting reflection on X axis\n"); - - if (reflection & RR_Reflect_Y) printf("Setting reflection on Y axis\n"); } /* we should test configureNotify on the root window */ |