proto/randrproto: Branch 'master' - 12 commits
Alan Coopersmith
alanc at kemper.freedesktop.org
Tue Oct 2 22:08:41 PDT 2012
randrproto.txt | 111 +++++++++++++++++++++++++++++++++------------------------
1 file changed, 66 insertions(+), 45 deletions(-)
New commits:
commit 4fcbd8584e55ff789522a38a41a33c34446d1455
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Aug 27 23:59:02 2012 -0700
spec: Correct lengths in encoding of OffloadSink & OutputSource
Make listed lengths match data shown & values in header for
RRSetProviderOffloadSink & RRSetProviderOutputSource
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index db7088d..2bf065f 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -2790,7 +2790,7 @@ A.2.3 Protocol Requests added with version 1.4
RRSetProviderOffloadSink
1 CARD8 major opcode
1 34 RandR opcode
- 2 2 length
+ 2 4 length
4 PROVIDER provider
4 PROVIDER offload sink provider
4 TIMESTAMP timestamp
@@ -2799,7 +2799,7 @@ A.2.3 Protocol Requests added with version 1.4
RRSetProviderOutputSource
1 CARD8 major opcode
1 35 RandR opcode
- 2 2 length
+ 2 4 length
4 PROVIDER provider
4 PROVIDER output source provider
4 TIMESTAMP timestamp
commit f876e00d29693e25c2b44ce33cd4a02f7a603eba
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Aug 27 23:59:02 2012 -0700
spec: Add config-timestamp to descriptions of OffloadSink & OutputSource
Present in header & encoding section, just not in the descriptions of
RRSetProviderOffloadSink & RRSetProviderOutputSource
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index 9887ded..db7088d 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1360,7 +1360,7 @@ dynamic changes in the display environment.
RRSetProviderOffloadSink
provider: PROVIDER
sink_provider: PROVIDER
- â–¶
+ config-timestamp: TIMESTAMP
└───
Errors: Provider
@@ -1371,7 +1371,7 @@ dynamic changes in the display environment.
RRSetProviderOutputSource
provider: PROVIDER
source_provider: PROVIDER
- â–¶
+ config-timestamp: TIMESTAMP
└───
Errors: Provider
commit ed09b382e42d2131034b98abc861c091c3d1771c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Aug 27 23:45:56 2012 -0700
spec: Add PROVIDER_CAPS encoding to Appendix A
Uses values found in randr.h
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index b52a7c5..9887ded 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -2169,6 +2169,13 @@ A.1 Common Types
2 UnknownConnection
└───
+┌───
+ PROVIDER_CAPS Added in version 1.4
+ 0x00000001 SourceOutput
+ 0x00000002 SinkOutput
+ 0x00000004 SourceOffload
+ 0x00000008 SinkOffload
+└───
A.2 Protocol Requests
commit c69dfe0cd310c122eae0b11c5547d5cd200ebbf5
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Aug 27 23:28:22 2012 -0700
spec: Make encoding of RRGetProviderInfo match header
The encoding is missing the 8 bytes of padding at the end of the
base reply struct before the variable length lists begin.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index 91b7d52..b52a7c5 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -2771,6 +2771,7 @@ A.2.3 Protocol Requests added with version 1.4
2 o number of outputs
2 a number of associated providers
2 n length of name
+ 8 unused
4c LISTofCRTC crtcs
4o LISTofOUTPUT outputs
4a LISTofPROVIDER associated providers
commit 3672b5430c9f665680e6a7a77f00202fc96243a0
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Aug 27 23:28:22 2012 -0700
spec: Make encoding of RRGetProviders match description & header
The description section matches randrproto.h - neither of which have
the "maximum masters" or "flags" members, but do have padding before
the providers list starts.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index 29cba1a..91b7d52 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -2747,11 +2747,10 @@ A.2.3 Protocol Requests added with version 1.4
1 1 Reply
1 unused
2 CARD16 sequence number
- 4 CARD32 length
+ 4 p length
4 TIMESTAMP timestamp
2 p number of Providers
- 2 CARD16 maximum masters
- 4 CARD32 flags
+ 18 unused
4p LISTofPROVIDERS providers
└───
┌───
commit 722cf0c2ba07e986cbedf9d687a87daddd04fa92
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Aug 26 23:38:38 2012 -0700
spec: Make description of RRProviderChangeNotify match encoding & header
The encoding section matches randrproto.h - neither of which have the
config-timestamp, root, or crtc members.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index a6fe431..29cba1a 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1680,20 +1680,15 @@ factors, such as re-cabling a monitor, etc.
┌───
RRProviderChangeNotify:
timestamp: TIMESTAMP time screen was reconfigured
- config-timestamp: TIMESTAMP time available config data was changed
window: WINDOW window requesting notification
provider: PROVIDER provider affected by change
- role: CRTC new role for provider
└───
This event is generated whenever the role for a provider has changed
and is sent to requesting clients. 'timestamp' indicates when the
- provider configuration was changed by a client.
- 'config-timestamp' says when the last time the available
- configurations changed. 'root' is the root of the screen the change
- occurred on, 'window' is window selecting for this event. The
- precise change can be detected by examining the new state of the
- system.
+ provider configuration was changed by a client. 'window' is the
+ window selecting for this event. The precise change can be detected
+ by examining the new state of the system.
┌───
RRProviderPropertyNotify:
commit 534dea4512b812b9f8a62b4bbdbfe60d650ef01f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Aug 26 22:50:05 2012 -0700
spec: correct sub-code values for RRProvider*Notify event encoding
These values match the RRNotify_* definitions in randrproto.h and
don't overlap with the RROutput*Notify codes from RandR 1.2.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
diff --git a/randrproto.txt b/randrproto.txt
index e0b67e3..a6fe431 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -2984,7 +2984,7 @@ A.3.2 Protocol Events added with version 1.4
┌───
RRProviderChangeNotify
1 Base + 1 code
- 1 1 sub-code
+ 1 3 sub-code
2 CARD16 sequence number
4 TIMESTAMP timestamp
4 WINDOW request window
@@ -2994,7 +2994,7 @@ A.3.2 Protocol Events added with version 1.4
┌───
RRProviderPropertyNotify
1 Base + 1 code
- 1 2 sub-code
+ 1 4 sub-code
2 CARD16 sequence number
4 WINDOW window
4 PROVIDER provider
@@ -3008,7 +3008,7 @@ A.3.2 Protocol Events added with version 1.4
┌───
RRResourceChangeNotify
1 Base + 1 code
- 1 2 sub-code
+ 1 5 sub-code
2 CARD16 sequence number
4 TIMESTAMP time
4 WINDOW window
commit ed0233e46fd2fe41b1c10e525423e90e0fa2bdc8
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Aug 26 20:51:03 2012 -0700
spec: Correct length calculation in encoding of gamma lists
The padding for RRGetCrtcGamma & RRSetCrtcGamma is a variable p,
not a fixed 2 bytes, since it depends on how many values are
included in the lists.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index 27fc2f3..e0b67e3 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -2569,7 +2569,7 @@ A.2.1 Protocol Requests added with version 1.2
1 1 Reply
1 unused
2 CARD16 sequence number
- 4 (6n+2)/4 reply length
+ 4 (6n+p)/4 reply length
2 n size
20 unused
2n LISTofCARD16 red
@@ -2581,7 +2581,7 @@ A.2.1 Protocol Requests added with version 1.2
RRSetCrtcGamma
1 CARD8 major opcode
1 24 RandR opcode
- 2 3+(6n+2)/4 length
+ 2 3+(6n+p)/4 length
4 CRTC crtc
2 n size
2 unused
commit ddc00f44df77ff3309b2b7cd77d3423781947b14
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Aug 26 20:40:06 2012 -0700
spec: Correct size of outputs in RRSetCrtcConfig encoding
Each OUTPUT is 4 bytes, not 8.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index 478c507..27fc2f3 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -2527,7 +2527,7 @@ A.2.1 Protocol Requests added with version 1.2
RRSetCrtcConfig
1 CARD8 major opcode
1 21 RandR opcode
- 2 7+2n length
+ 2 7+n length
4 CRTC crtc
4 TIMESTAMP timestamp
4 TIMESTAMP config timestamp
@@ -2536,7 +2536,7 @@ A.2.1 Protocol Requests added with version 1.2
4 MODE mode
2 ROTATION rotation/reflection
2 unused
- 8n LISTofOUTPUT outputs
+ 4n LISTofOUTPUT outputs
â–¶
1 1 Reply
1 RRCONFIGSTATUS status
commit 7339eaea1296de0e0f3ebc03d3606470ba143ac3
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Aug 26 19:00:35 2012 -0700
spec: Update data type sections
Make definitions more consistent about use of {} for enums, [] for structs
Reflect the incorporation of more types from the Render spec in 1.3
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index 8c6292a..478c507 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -212,9 +212,12 @@ are visible on the reconfigured screen).
3. Data Types
-The subpixel order is shared with the Render extension, and is documented
-there. The only datatype defined is the screen size, defined in the normal
-(0 degree) orientation.
+The subpixel order and transform data types are shared with the Render
+extension, and are documented there.
+
+The only datatype defined in the original extension is the screen size,
+defined in the normal (0 degree) orientation. Several more are added
+in later revisions.
â§â§â§â§â§â§â§â§â§â§â§
@@ -296,15 +299,9 @@ CONNECTION { Connected, Disconnected, UnknownConnection }
This value provides an indication of whether an output is actually
connected to a monitor or other presentation device.
-SUBPIXELORDER { SubPixelUnknown The subpixel order uses the Render
- SubPixelHorizontalRGB extensions definitions; they are here
- SubPixelHorizontalBGR only for convenience.
- SubPixelVerticalRGB
- SubPixelVerticalBGR
- SubPixelNone }
-SCREENSIZE { widthInPixels, heightInPixels: CARD16
- widthInMillimeters, heightInMillimeters: CARD16 }
+SCREENSIZE [ widthInPixels, heightInPixels: CARD16
+ widthInMillimeters, heightInMillimeters: CARD16 ]
MODEFLAG { HSyncPositive
HSyncNegative
@@ -321,15 +318,37 @@ MODEFLAG { HSyncPositive
DoubleClock
ClockDivideBy2 }
-MODEINFO { id: MODE
+MODEINFO [ id: MODE
name: STRING
width, height: CARD16
dotClock: CARD32
hSyncStart, hSyncEnd, hTotal, hSkew: CARD16
vSyncStart, vSyncEnd, vTotal: CARD16
- modeFlags: SETofMODEFLAG }
+ modeFlags: SETofMODEFLAG ]
+
+REFRESH [ rates: LISTofCARD16 ]
+
+ â§â§â§â§â§â§â§â§â§â§â§
+
+5.1 Data Types defined by the Render extension
+
+These data types use the Render extension definitions; they are shown here
+only for convenience:
+
+SUBPIXELORDER { SubPixelUnknown
+ SubPixelHorizontalRGB
+ SubPixelHorizontalBGR
+ SubPixelVerticalRGB
+ SubPixelVerticalBGR
+ SubPixelNone }
+
+FIXED 32-bit value (top 16 are integer portion, bottom 16 are fraction)
-REFRESH { rates: LISTofCARD16 }
+TRANSFORM [
+ p11, p12, p13: FIXED
+ p21, p22, p23: FIXED
+ p31, p32, p33: FIXED
+ ]
â§â§â§â§â§â§â§â§â§â§â§
commit afe532b119fe46d32513dc71c76c3a906e06c5a8
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Aug 26 18:58:06 2012 -0700
spec: Fix typos in text
At least I'm assuming "providre" is a typo, not just a non-American variant.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index e263108..8c6292a 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -259,7 +259,7 @@ RRCONFIGSTATUS { Success
configuration is unsupported by the hardware. The goal is to make
these limitations expressed by the protocol, but when that isn't
possible it is correct to return this error value. If, as a
- implentor, you find this error code required, please submit the
+ implementor, you find this error code required, please submit the
hardware constraints that exist so that a future version of the
extension can correctly capture the configuration constraints in
your system.
@@ -338,7 +338,7 @@ REFRESH { rates: LISTofCARD16 }
PROVIDER { XID }
PROVIDER_CAPS { SourceOutput, SinkOutput, SourceOffload, SinkOffload }
- Capabilties for this provider:
+ Capabilities for this provider:
SourceOutput: This device can source output buffers.
SinkOutput: This device can sink output buffers.
SourceOffload: This device can source offload buffers.
@@ -1307,7 +1307,7 @@ dynamic changes in the display environment.
└───
Errors: Window
- RRGetPRoviders returns the list of providers connected to the screen
+ RRGetProviders returns the list of providers connected to the screen
associated with 'window'.
'timestamp' indicates when the configuration was last set.
@@ -1329,7 +1329,7 @@ dynamic changes in the display environment.
Errors: Provider
RRGetProviderInfo return information about the specified provider.
- The capabilites of the current provider are returned, along with
+ The capabilities of the current provider are returned, along with
the list of providers currently associated with this provider and
the capability they are associated with. It also provides the list
of crtcs and outputs that this provider is responsible for.
@@ -1679,7 +1679,7 @@ factors, such as re-cabling a monitor, etc.
┌───
RRProviderPropertyNotify:
window: WINDOW window requesting notification
- provider: PROVIDER providre affected by change
+ provider: PROVIDER provider affected by change
atom: ATOM affected property
time: TIMESTAMP time property was changed
state: { NewValue, Deleted } new property state
@@ -2491,7 +2491,7 @@ A.2.1 Protocol Requests added with version 1.2
1 RRCONFIGSTATUS status
2 CARD16 sequence number
4 o+p reply length
- 4 TIMESTATMP timestamp
+ 4 TIMESTAMP timestamp
2 INT16 x
2 INT16 y
2 CARD16 width
@@ -2752,8 +2752,8 @@ A.2.3 Protocol Requests added with version 1.4
1 RRCONFIGSTATUS status
2 CARD16 sequence number
4 1+c+o+(a*2)+(n+p)/4 reply length
- 4 TIMESTATMP timestamp
- 4 CARD32 capabilites
+ 4 TIMESTAMP timestamp
+ 4 CARD32 capabilities
2 c number of crtcs
2 o number of outputs
2 a number of associated providers
commit a74417d782a39423e44a5a2e573816894635c234
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Aug 26 18:31:16 2012 -0700
spec: Correct length for RRCreateMode in encoding section
(1 + 1 + 2 + 4 + 32) / 4 is 10 words, not 12
10 also matches the sz_xRRCreateModeReq value of 40 in randrproto.h
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/randrproto.txt b/randrproto.txt
index 7ff573b..e263108 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -2443,7 +2443,7 @@ A.2.1 Protocol Requests added with version 1.2
RRCreateMode
1 CARD8 major opcode
1 16 RandR opcode
- 2 12+(n+p)/4 length
+ 2 10+(n+p)/4 length
4 WINDOW window
32 MODEINFO mode
n STRING8 mode name
More information about the xorg-commit
mailing list