x11proto-randr: Changes to 'upstream-unstable'
.gitignore | 3
Makefile.am | 4 -
configure.ac | 6 +
randr.h | 8 ++
randrproto.txt | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
5 files changed, 190 insertions(+), 9 deletions(-)
New commits:
commit 94e22fecc66590f81ca280517505c721a5f54497
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Mar 6 15:03:09 2009 +0100
Bump to 1.3.0
diff --git a/configure.ac b/configure.ac
index 0ea6a83..320e560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.2.99.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit 5cc58adb620d37694a9d57cd26c40b4cb2d1de68
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Feb 25 17:08:45 2009 +0100
Bump to 1.2.99.4
diff --git a/configure.ac b/configure.ac
index 4707389..0ea6a83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.2.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.2.99.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit 7bd01756e684bb841f32fa30832eb7980f92ac9c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 17 13:58:19 2009 -0500
Zero reply from GetPanning means panning not supported.
Don't throw BadRRCrtc for this case, that's just mean.
diff --git a/randrproto.txt b/randrproto.txt
index be4285d..1af2090 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1092,7 +1092,8 @@ dynamic changes in the display environment.
Version 1.3 adds panning support again. If multiple crtcs are active
the panning behavior can be defined per crtc individually.
RRGetPanning returns information about the currently set panning
- configuration for the specified crtc.
+ configuration for the specified crtc. If the CRTC does not support
+ panning, all fields (except timestamp) will be 0.
'timestamp' indicates when the configuration was last set.
commit 1c7e20d115bc470479f32afd703ca7966754c54f
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 20:06:28 2009 -0200
Janitor: Correct make distcheck and dont distribute autogen.sh
diff --git a/.gitignore b/.gitignore
index c0562cd..2468418 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ configure
install-sh
missing
randrproto.pc
+randrproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 59e0378..ec0cf19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ pkgconfig_DATA = randrproto.pc
randrdocdir = $(datadir)/doc/$(PACKAGE)
randrdoc_DATA = randrproto.txt
-EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA)
+EXTRA_DIST = randrproto.pc.in $(randrdoc_DATA)
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -17,6 +17,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 5c0cc88..4707389 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,11 @@ AC_PREREQ([2.57])
AC_INIT([RandrProto], [1.2.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
randrproto.pc])
commit 1ff5e2cdfa2636317099a0917c9819ff4a81b025
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Dec 16 23:35:49 2008 +0100
Fix typo in 83f3f29dd3ac5d3875b5edef5805d6adb6a02698.
diff --git a/randr.h b/randr.h
index 502ba7d..c624d96 100644
--- a/randr.h
+++ b/randr.h
@@ -153,7 +153,7 @@ typedef unsigned long XRandrModeFlags;
#define RR_PROPERTY_RANDR_EDID "EDID"
#define RR_PROPERTY_SIGNAL_FORMAT "SignalFormat"
-#define RR_PROPERTY_SIGNAL_FORMAT "SignalProperties"
+#define RR_PROPERTY_SIGNAL_PROPERTIES "SignalProperties"
#define RR_PROPERTY_CONNECTOR_TYPE "ConnectorType"
#define RR_PROPERTY_CONNECTOR_NUMBER "ConnectorNumber"
#define RR_PROPERTY_COMPATIBILITY_LIST "CompatibilityList"
commit 83f3f29dd3ac5d3875b5edef5805d6adb6a02698
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Dec 16 18:20:00 2008 +0100
Add standard property name defines.
diff --git a/randr.h b/randr.h
index eafcda5..502ba7d 100644
--- a/randr.h
+++ b/randr.h
@@ -151,6 +151,12 @@ typedef unsigned long XRandrModeFlags;
/* Conventional RandR output properties */
-#define RR_PROPERTY_RANDR_EDID "RANDR_EDID"
+#define RR_PROPERTY_RANDR_EDID "EDID"
+#define RR_PROPERTY_SIGNAL_FORMAT "SignalFormat"
+#define RR_PROPERTY_SIGNAL_FORMAT "SignalProperties"
+#define RR_PROPERTY_CONNECTOR_TYPE "ConnectorType"
+#define RR_PROPERTY_CONNECTOR_NUMBER "ConnectorNumber"
+#define RR_PROPERTY_COMPATIBILITY_LIST "CompatibilityList"
+#define RR_PROPERTY_CLONE_LIST "CloneList"
#endif /* _RANDR_H_ */
commit 6a480445e94c39df2bc9663e7590ab41cd17c465
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Dec 16 18:13:48 2008 +0100
Should read "EDID", not "EdidData".
diff --git a/randrproto.txt b/randrproto.txt
index 8e8cace..be4285d 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1400,7 +1400,7 @@ doesn't handle a mandatory property correctly.
9.1 Known properties
- "EdidData" aka RR_PROPERTY_RANDR_EDIDDATA
+ "EDID" aka RR_PROPERTY_RANDR_EDID
Type: int8 [n]
Flags: Immutable
Range/List: -
commit 2aae5ec72ea285a051deaae98515587e1c77d7a5
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Dec 16 18:09:08 2008 +0100
Add description of standard properties.
diff --git a/randrproto.txt b/randrproto.txt
index e55140d..8e8cace 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1377,7 +1377,173 @@ factors, such as re-cabling a monitor, etc.
❧❧❧❧❧❧❧❧❧❧❧
-9. Extension Versioning
+9. Properties
+
+Properties are used for output specific parameters, and for announcing
+static or rarely changing data. Announced data is typically
+immutable. Properties are also used for evaluating new parameters
+before adding them to the RandR protocol.
+
+The following properties are hereby declared official, and drivers SHOULD
+prefix driver specific properties with '_', unless they are planned to be
+added to this specification. List values, that are not declared by the table
+below, and will remain driver specific or are not planned to be added to this
+specification, SHOULD be prefixed with "_" as well in order to avoid name
+space or semantics clashes with future extensions of these values.
+
+Beginning with version 1.3 of the RandR extension, certain properties
+are mandatory and MUST be provided by implementations. Earlier
+versions of the RandR extension MAY provide these properties as well,
+as long as the semantics are not altered. Clients SHOULD fall back
+gracefully to lower version functionality, though, if the driver
+doesn't handle a mandatory property correctly.
+
+9.1 Known properties
+
+ "EdidData" aka RR_PROPERTY_RANDR_EDIDDATA
+ Type: int8 [n]
+ Flags: Immutable
+ Range/List: -
+
+ Raw EDID data from the device attached to the according
+ output. Should include main EDID data and all extension
+ blocks.
+
+ "SignalFormat" aka RR_PROPERTY_SIGNAL_FORMAT
+ Type: int32 / Atom
+ Flags: -
+ Range/List: unknown VGA TMDS LVDS Composite Composite-PAL
+ Composite-NTSC Composite-SECAM SVideo
+ Component DisplayPort
+
+ Signal format / physical protocol format that is used for the
+ specified output. valid-values lists all possible formats on this
+ output, which SHOULD be a subset of the list above and MUST be static.
+ Values with dashes (Composite-PAL) describe more specific versions of
+ the base values (Composite) and SHOULD be used if known to the driver.
+ A driver MAY change this property of an output if the underlying
+ hardware indicates a protocol change (e.g. TV formats). Clients are
+ allowed to change the signal format in order to select a different
+ signal format (e.g. Composite etc.) or physical protocol (e.g. VGA or
+ TMDS on DVI-I).
+ Laptop panels SHOULD not be detected with this property, but rather by
+ ConnectorType.
+
+ "SignalProperties" aka RR_PROPERTY_SIGNAL_FORMAT
+ Type: int32 [n] / Atom
+ Flags: -
+ Range/List: For Composite signals:
+ NTSC NTSC-M NTSC-J NTSC-N NTSC-4.43 NTSC-film
+ PAL PAL-B PAL-G PAL-H PAL-H PAL-I PAL-M PAL-D
+ PAL-N PAL-Nc PAL-L PAL-60
+ SECAM SECAM-L SECAM-B SECAM-G SECAM-D SECAM-K
+ SECAM-H SECAM-K
+ For TMDS signals:
+ SingleLink DualLink
+ For DisplayPort signals:
+ Lane1 Lane2 Lane4 LowSpeed HiSpeed
+
+ Properties of the signal format that is currently used for the
+ specified output. valid-values lists all possible properties on this
+ output, which SHOULD be a subset of the list above. It will change if
+ SignalFormat changes. Multiple properties are allowed.
+ Values with dashes (PAL-B) describe more specific versions of the base
+ values (PAL) and SHOULD be used if known to the driver. A driver MAY
+ change this property of an output if the underlying hardware indicates
+ a signal change (e.g. TV formats). Clients are allowed to change the
+ properties in order to select a different signal subformat.
+
+ "ConnectorType" aka RR_PROPERTY_CONNECTOR_TYPE
+ Type: int32 / Atom
+ Flags: Immutable, Static
+ Range/List: unknown VGA DVI DVI‐I DVI‐A DVI‐D HDMI Panel
+ TV TV-Composite TV-SVideo TV-Component
+ TV-SCART TV-C4 DisplayPort
+
+ Connector type, as far as known to the driver.
+ Values with dashes (TV‐Composite) describe more specific versions of
+ the base values (TV). The former SHOULD be used if the connector is
+ not capable of producing other signal formats. The later SHOULD be
+ used if the exact connector is unknown, or the connector is a
+ multi‐format connector that is not described otherwise. DVI, for
+ instance, SHOULD be handled like a DVI‐I connector, unless additional
+ information is available to the user agent. PANEL describes
+ laptop‐internal (normally LVDS) displays. TV, TV‐SCART, TV‐Component,
+ and TV‐C4 with signal format VGA are valid combinations and describe
+ RGB TV signals.
+
+ "ConnectorNumber" aka RR_PROPERTY_CONNECTOR_NUMBER
+ Type: int32
+ Flags: Immutable, Static
+ Range/List: 0-
+
+ Outputs that route their signal to the same connector MUST
+ have the same connector number. Outputs with the same
+ connector number MUST route their signal to the same
+ connector, except if it is 0, which indicates unknown
+ connectivity. 1 is called the primary connector, 2 the
+ secondary. 3 is typically a TV connector, but that is completely
+ driver / hardware dependent.
+ Outputs with the same connector number SHOULD have the same
+ connector type. Meaning and client behavior for mismatching
+ connector types is undefined at the moment.
+
+ "CompatibilityList" aka RR_PROPERTY_COMPATIBILITY_LIST
+ Type: int32 [2*n] / Atom pairs
+ Flags: Immutable
+ Range/List: 0-
+
+ Some combinations of outputs on some cards cannot be served at all,
+ because the according encoder is only capable of driving one output at
+ a time.
+ This property lists all output + signal format pairs that can be
+ driven together with this output. NULL atoms specify any output / any
+ signal format, respectively.
+ This property MUST be symmetric, but may change with changing signal
+ format. I.e. if the property for DVI-1/TMDS specifies VGA-1/VGA to be
+ available, VGA-1/VGA has to list DVI-1/TMDS as well.
+
+ "CloneList" aka RR_PROPERTY_CLONE_LIST
+ Type: int32 [2*n] / Atom pairs
+ Flags: Immutable
+ Range/List: 0-
+
+ Some combinations of outputs on some cards cannot be served
+ independently from each other, because they are wired up to the same
+ encoder outputs.
+ This property lists all output + signal format pairs that are
+ driven together with this output, and thus can only be programmed in
+ clone mode with the same CRTC.
+ This property MUST be symmetric, but may change with changing signal
+ format. I.e. if the property for DVI-1/VGA specifies VGA-1/VGA to be
+ cloned, VGA-1/VGA has to list DVI-1/VGA as well.
+ Outputs / format pairs listed in this property MUST be included in the
+ CompatibilityList.
+
+
+9.2 Properties introduced with version 1.2 of the RandR extension
+
+Property Immutable Mandatory since
+──────── ───────── ───────────────
+EdidData yes n/a
+
+EdidData is provided by the RandR frontend, thus not driver specific.
+
+
+9.3 Properties introduced with version 1.3 of the RandR extension
+
+Property Immutable Mandatory since
+──────── ───────── ───────────────
+SignalFormat no RandR 1.3
+SignalProperties no not mandatory
+ConnectorType yes: static RandR 1.3
+ConnectorNumber yes: static not mandatory
+CompatibilityList yes not mandatory
+CloneList yes not mandatory
+
+ ❧❧❧❧❧❧❧❧❧❧❧
+
+10. Extension Versioning
The RandR extension was developed in parallel with the implementation
to ensure the feasibility of various portions of the design. As
@@ -1407,6 +1573,7 @@ list of what each version provided:
1.3: Added cheap version of RRGetScreenResources. Added CRTC
transformations. Added panning. Added primary outputs.
+ Added standard properties.
Compatibility between 0.0 and 1.0 was *NOT* preserved, and 0.0 clients
will fail against 1.0 servers. The wire encoding op-codes were
@@ -1421,12 +1588,12 @@ with 1.1.
❧❧❧❧❧❧❧❧❧❧❧
-10. Relationship with other extensions
+11. Relationship with other extensions
Two other extensions have a direct relationship with this extension. This
section attempts to explain how these three are supposed to work together.
-10.1 XFree86-VidModeExtension
+11.1 XFree86-VidModeExtension
XFree86-VidModeExtension changes the configuration of a single monitor
attached to the screen without changing the configuration of the screen
@@ -1443,7 +1610,7 @@ All of the utility of this extension is subsumed by RandR version 1.2, RandR
should be used in preference to XFree86-VidModeExtension where both are
present.
-10.2 Xinerama
+11.2 Xinerama
Xinerama provides a mechanism for describing the relationship between the
overall screen display and monitors placed within that area. As such, it
Reply to: