summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add monitors, update to version 1.5 (v2)libXrandr-1.5.0Keith Packard2015-03-314-2/+233
| | | | | | | | | | v2: [airlied] xrandr was giving the outputs from 0 for each monitor instead of incrementing the pointer. add get_active support. Reviewed-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
* libXrandr: Clean up compiler warningsKeith Packard2015-03-317-54/+54
| | | | | | | | This removes warnings about shadowing local variables with the same name, and type mismatches with _XRead32. Reviewed-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
* Remove fallback for _XEatDataWords, require libX11 1.6 for itMichael Joost2013-11-222-21/+1
| | | | | | | | | | | | | _XEatDataWords was orignally introduced with the May 2013 security patches, and in order to ease the process of delivering those, fallback versions of _XEatDataWords were included in the X extension library patches so they could be applied to older versions that didn't have libX11 1.6 yet. Now that we're past that hurdle, we can drop the fallbacks and just require libX11 1.6 for building new versions of the extension libraries. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* libXrandr 1.4.2libXrandr-1.4.2Alan Coopersmith2013-09-071-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Add copyright notice from src/XrrProvider.c to COPYINGAlan Coopersmith2013-09-071-0/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* XRRUpdateConfiguration: Check if getting screen for root failsPauli Nieminen2013-07-051-0/+3
| | | | | | | | | | XRRRootToScreen might return -1 if it fails to find screen for the root window. Following code uses screen number unconditionally to index the screen array. Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* XRRGetProviderInfo returned bad associated_capability list in 64-bitAlan Coopersmith2013-07-051-1/+10
| | | | | | | | | | | | | | | | | Unlike most of the values returned by this function, which are arrays of XIDs (long int), associated_capability is defined as an array of unsigned int. _XRead32 reads 32-bit values from the wire protocol and writes them to the provided buffer as an array of long ints, even if that means expanding them from 32-bit to 64-bit. Doing that for associated_capability resulted in a garbage value between each actual value, and overflowing the provided buffer into the space for the provider name (which is written later and would overwrite the overflowed data). Created xhiv libXrandr/XRRGetProviderInfo test case to test & confirm. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
* libXrandr 1.4.1libXrandr-1.4.1Alan Coopersmith2013-05-311-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Make XRRGet*Property() always initialize returned valuesAlan Coopersmith2013-05-042-2/+14
| | | | | | | | | | | | Avoids memory corruption and other errors when callers access them without checking to see if the calls returned an error value. Callers are still required to check for errors, this just reduces the damage when they don't. (Same as reported against libX11 XGetWindowProperty by Ilja Van Sprundel) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* integer overflow in XRRGetProviderProperty() [CVE-2013-1986 4/4]Alan Coopersmith2013-05-041-8/+14
| | | | | | | | | | If the reported number of properties is too large, the calculations to allocate memory for them may overflow, leaving us returning less memory to the caller than implied by the value written to *nitems. (Same as reported against libX11 XGetWindowProperty by Ilja Van Sprundel) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* integer overflow in XRRGetOutputProperty() [CVE-2013-1986 3/4]Alan Coopersmith2013-05-041-8/+14
| | | | | | | | | | If the reported number of properties is too large, the calculations to allocate memory for them may overflow, leaving us returning less memory to the caller than implied by the value written to *nitems. (Same as reported against libX11 XGetWindowProperty by Ilja Van Sprundel) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* integer overflow in XRRQueryProviderProperty() [CVE-2013-1986 2/4]Alan Coopersmith2013-05-041-4/+9
| | | | | | Same problem as XRRQueryOutputProperty() that it was cloned from Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* integer overflow in XRRQueryOutputProperty() [CVE-2013-1986 1/4]Alan Coopersmith2013-05-041-4/+9
| | | | | | | | | | | rep.length is a CARD32, while rbytes was a signed int, so rbytes = sizeof (XRRPropertyInfo) + rep.length * sizeof (long); could result in integer overflow, leading to an undersized malloc and reading data off the connection and writing it past the end of the allocated buffer. Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Use _XEatDataWords to avoid overflow of rep.length bit shiftingAlan Coopersmith2013-05-038-17/+34
| | | | | | rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Replace deprecated Automake INCLUDES variable with AM_CPPFLAGSbaserock/morphAlan Coopersmith2013-01-181-1/+1
| | | | | | | | | | | | | Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html - Support for the long-deprecated INCLUDES variable will be removed altogether in Automake 1.14. The AM_CPPFLAGS variable should be used instead. This variable was deprecated in Automake releases prior to 1.10, which is the current minimum level required to build X. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* autogen.sh: Implement GNOME Build APIColin Walters2013-01-151-1/+3
| | | | | | http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson <ajax@redhat.com>
* configure: Remove AM_MAINTAINER_MODEAdam Jackson2013-01-151-1/+0
| | | | Signed-off-by: Adam Jackson <ajax@redhat.com>
* Constify a couple string arguments that are just copied, not modifiedAlan Coopersmith2012-09-063-4/+4
| | | | | | | | | | | Fixes compiler warnings when building app/xrandr: xrandr.c: In function ‘crtc_set_transform’: xrandr.c:1459:9: warning: passing argument 4 of ‘XRRSetCrtcTransform’ discards qualifiers from pointer target type X11/extensions/Xrandr.h:419:1: note: expected ‘char *’ but argument is of type ‘const char *’ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
* libXrandr: bump to 1.4.0 for releaselibXrandr-1.4.0Dave Airlie2012-07-261-1/+1
| | | | | | This adds support for the provider queries and events. Signed-off-by: Dave Airlie <airlied@redhat.com>
* libXrandr: add support for provider objects.Dave Airlie2012-07-195-2/+724
| | | | | | | This adds the client side libXrandr support for randr 1.4, and provider objects. Signed-off-by: Dave Airlie <airlied@redhat.com>
* Fill in nameLen in XRROutputInfoDaniel Stone2012-02-291-0/+1
| | | | | | | | | Even though it probably makes more sense to just strlen() the name, for some reason there's a nameLen field in XRROutputInfo, so might as well actually fill it in. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reported-by: Leif Middelschulte <leif.middelschulte@gmail.com>
* Strip trailing whitespaceAlan Coopersmith2011-09-1614-95/+95
| | | | | | | Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' git diff -w & git diff -b show no diffs from this change Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* libXrandr 1.3.2libXrandr-1.3.2Alan Coopersmith2011-06-291-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Xrandr.man: Document how to request notifications.Cyril Brulebois2011-04-011-1/+3
| | | | | | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
* Xrandr.man: Fix parenthesis escaping.Cyril Brulebois2011-04-011-1/+1
| | | | | | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
* Xrandr.man: Fix missing closing parenthesis.Cyril Brulebois2011-04-011-1/+1
| | | | | | | | Also fix the closing tag (\fP instead of \fI). Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
* Xrandr.man: Build full sentences for easier reading.Cyril Brulebois2011-04-011-3/+3
| | | | | | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
* Xrandr.man: Fix typo.Cyril Brulebois2011-04-011-1/+1
| | | | | | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
* Xrandr.man: Try to make some sense.Cyril Brulebois2011-04-011-2/+2
| | | | | | | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Magnus Kessler <Magnus.Kessler@gmx.net> Signed-off-by: Cyril Brulebois <kibi@debian.org>
* Xrandr.man: Build full sentences, possibly easier to read.Cyril Brulebois2011-03-311-2/+5
| | | | | | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
* Xrandr.man: Fix grammar.Cyril Brulebois2011-03-311-2/+2
| | | | | | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
* Xrandr.man: Remove trailing spaces.Cyril Brulebois2011-03-311-26/+26
| | | | | | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
* config: comment, minor upgrade, quote and layout configure.acGaetan Nadon2011-02-031-41/+44
| | | | | | | | | | | | Group statements per section as per Autoconf standard layout Quote statements where appropriate. Autoconf recommends not using dnl instead of # for comments Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. Add AC_CONFIG_SRCDIR([Makefile.am]) This helps automated maintenance and release activities. Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
* config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERSGaetan Nadon2011-01-281-1/+1
| | | | Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* config: remove unrequired AC_CONFIG_AUX_DIRGaetan Nadon2011-01-281-1/+0
| | | | | | | The default location for the generation of configuation files is the current package root directory. These files are config.* and friends. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* config: remove AC_PROG_CC as it overrides AC_PROG_C_C99Gaetan Nadon2011-01-271-1/+0
| | | | | | | | XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls AC_PROG_C_C99. This sets gcc with -std=gnu99. If AC_PROG_CC macro is called afterwards, it resets CC to gcc. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* libXrandr 1.3.1libXrandr-1.3.1Alan Coopersmith2010-10-281-1/+2
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Fix configure.ac comment for RandR instead of RenderAlan Coopersmith2010-10-281-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Sun's copyrights now belong to OracleAlan Coopersmith2010-10-281-2/+2
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Purge cvs tags.Jesse Adkins2010-10-061-3/+0
| | | | | Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* man: store shadow man pages in git rather than generating themGaetan Nadon2010-08-1715-32/+37
| | | | | | | | | | Simplify the build process and the makefile. Local fix in CVS for bug 5628 is not required as the problem has been fixed in util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* Use make rules instead of shell for loops to generate shadow man pagesAlan Coopersmith2010-07-081-7/+5
| | | | | | Allows parallel make and simpler build logs/error reporting Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* config: upgrade to util-macros 1.8 for additional man page supportAlan Coopersmith2010-07-082-14/+4
| | | | | | | | | | | | | Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS The existing statement can now be removed from the configuration file. Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) Enables silent rule and use platform appropriate version of sed. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Purge macros NEED_EVENTS and NEED_REPLIESFernando Carrijo2010-07-081-2/+0
| | | | | | Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Add parameter safety checkLeif Middelschulte2010-05-261-1/+1
| | | | | | | | | As mentioned in bugzilla ticket 28150. Calling '_XRRValidateCache' with 'improper' arguments results in a SEGV. This patch adds a parameter validation to the mentioned function. Signed-off-by: Leif Middelschulte <leif.middelschulte@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* config: update AC_PREREQ statement to 2.60Gaetan Nadon2010-03-291-1/+1
| | | | | | | | | | Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* config: remove the pkgconfig pc.in file from EXTRA_DISTGaetan Nadon2010-03-291-1/+0
| | | | | | Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* config: move CWARNFLAGS from configure.ac to Makefile.amGaetan Nadon2010-02-162-4/+5
| | | | | | | Compiler warning flags should be explicitly set in the makefile rather than being merged with other packages compiler flags. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* COPYING: add missing copyright noticesGaetan Nadon2010-01-171-0/+45
| | | | | | | | | Refer to: Xrandr.h XrrConfig.c Copyright © 2006 Intel Corporation Copyright © 2008 Red Hat, Inc. Copyright © 2006 Keith Packard Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* Update Sun license notices to current X.Org standard formAlan Coopersmith2010-01-141-22/+19
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
View Lorry Controller Status