Commit graph

102 commits

Author SHA1 Message Date
Alan Coopersmith
f717637569 Strip trailing whitespace from source files
Performed with: `git ls-files | 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>
Part-of: <https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/99>
2025-08-02 14:39:03 -07:00
Benno Schulenberg
c85a6ff7bd hyphenate two compound adjectives, like for the other occurrence 2023-05-18 16:32:53 +02:00
Michael Wyraz
7131a5bec5 Be more descriptive about monitor types
Be more descriptive about user defined vs default monitors in randr and allow more than one virtual monitor per physical output
2023-04-27 04:38:45 +00:00
Alan Coopersmith
09602b2130 Fix spelling/wording issues
Found by using:
  codespell --builtin clear,rare,usage,informal,code,names

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2020-08-08 10:33:56 -07:00
Alan Coopersmith
eb2c0108e4 Update URLs for protocol specs to use xorgproto repo now
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-17 16:15:18 -08:00
Giuseppe Bilotta
29c53a28fa Spelling and grammar fixes
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
2018-02-28 10:26:40 -05:00
Keith Packard
e681f8de0c randr: Add non-desktop output property and behaviors [v3]
non-desktop devices are those to which the normal desktop environment
should not be extended. Examples are Head-mounted displays and the
Apple Touch Bar.

How an output device is set to non-desktop is not part of this
proposal; it is expected that the underlying operating system will
provide this information and have it reflected to X applications
through this extension.

v2: fix puncutation and duplicated 'the'.
v3: switch to 32-bit property named non-desktop to match Linux

Signed-off-by: Keith Packard <keithp@keithp.com>
2018-02-12 13:54:19 -05:00
Keith Packard
14f68c7b00 randr: Add Leases. [v4]
A "lease" is a set of crtc and output resources granted to another
application for use outside of X. These will not be usable through the
X protocol until the lease terminates. Leased outputs will be seen as
disconnected, leased CRTCs will be seen as not usable with any output.

v2:
	Delete output grabs
	Add LeaseNotify events
	Add FreeLease with option to terminate

v3:
	Clarify a couple of lease behaviors:

	* You can lease an in-use object, it makes the X server stop
	  using it, you don't get an error back.

	* There's no explicit 'Disabled' state for a crtc, when a crtc
	  is disabled, it just has a set of reported values for
	  GetCrtcInfo.

v4:
	Integrate into merged xorgproto repo

Signed-off-by: Keith Packard <keithp@keithp.com>
2018-02-12 13:54:13 -05:00
Giuseppe Bilotta
0e6b611a89 randr: MONITORINFO has outputs, not crtcs
Reviewed-by: Adam Jackson <ajax@redhat.com>
2018-02-06 14:13:19 -05:00
Christophe Fergeau
cf3272717e spec: Fix RRCrtcGetModes typo
The correct name is RRCrtcGetInfo.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
2015-09-25 11:09:33 -04:00
Dave Airlie
895ee52645 randrproto: clarify output XID lifetimes.
This just makes a note that randr won't make outputs disappear
dynamically.

Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2015-05-04 09:47:27 +10:00
Dave Airlie
98da0d6e48 randrproto: add tile property info for randr 1.5
expose this as an array of 8 32-bit values.

Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2015-03-30 15:15:40 +10:00
Keith Packard
4109f29861 Add Monitors, update version to 1.5 (v2)
v2: [airlied] add get_active to monitor get
interface, to allow normal vs configuration
clients to see active vs all monitors. (r-b by keithp)

Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2015-03-30 13:40:40 +10:00
Keith Packard
d501a4f08e Fix spelling errors in randrproto.txt
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2015-03-30 10:06:48 +10:00
Alan Coopersmith
b1ba68df8a randrproto 1.4.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-03-14 09:35:04 -07:00
Aaron Plattner
a4a6694c05 spec: RRCrtcChangeMask and RROutputChangeMask are not things
The correct names for these are RRCrtcChangeNotifyMask and
RROutputChangeNotifyMask, respectively.

v2: "when a the configuration" is also not a thing.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-01-21 10:49:26 -08:00
Aaron Plattner
1755cbe0f5 spec: Move the GUID property into a new section since xrandr-1.4.0 was already released
I pushed commit 19fc4c5a72 before I remembered
that xrandr-1.4.0 has already been released.  Move it to a new 1.4.1 section.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-01-06 09:42:54 -08:00
Alan Coopersmith
4d8e809684 Bug 73176 - randrproto typo (s/fundmentally/fundamentally)
https://bugs.freedesktop.org/show_bug.cgi?id=73176

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-01-05 10:40:11 -08:00
Aaron Plattner
19fc4c5a72 Add a "GUID" property
This property represents the globally-unique identifier of the connected
display, if one is available.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
2014-01-03 13:37:56 -08:00
Alan Coopersmith
4fcbd8584e 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@oracle.com>
2012-10-02 22:04:21 -07:00
Alan Coopersmith
f876e00d29 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@oracle.com>
2012-10-02 22:04:21 -07:00
Alan Coopersmith
ed09b382e4 spec: Add PROVIDER_CAPS encoding to Appendix A
Uses values found in randr.h

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-10-02 22:04:21 -07:00
Alan Coopersmith
c69dfe0cd3 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@oracle.com>
2012-10-02 22:04:20 -07:00
Alan Coopersmith
3672b5430c 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@oracle.com>
2012-10-02 22:04:20 -07:00
Alan Coopersmith
722cf0c2ba 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@oracle.com>
2012-10-02 22:04:20 -07:00
Alan Coopersmith
534dea4512 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@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
2012-10-02 22:04:14 -07:00
Alan Coopersmith
ed0233e46f 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@oracle.com>
2012-08-28 00:07:28 -07:00
Alan Coopersmith
ddc00f44df spec: Correct size of outputs in RRSetCrtcConfig encoding
Each OUTPUT is 4 bytes, not 8.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-08-28 00:07:28 -07:00
Alan Coopersmith
7339eaea12 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@oracle.com>
2012-08-28 00:07:28 -07:00
Alan Coopersmith
afe532b119 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@oracle.com>
2012-08-28 00:07:28 -07:00
Alan Coopersmith
a74417d782 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@oracle.com>
2012-08-28 00:07:28 -07:00
Alan Coopersmith
b52f4e39b6 spec: add missing brackets between requests in encoding section
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-08-28 00:07:27 -07:00
Dave Airlie
5f5cb27676 bump to 1.4.0 (for release.sh)
a trivial commit to make release.sh work.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-07-12 22:48:03 +10:00
Alan Coopersmith
74637d53fa 1.4 spec: update Extension Versioning section to include 1.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
2012-07-12 18:38:51 +10:00
Alan Coopersmith
7b4b49760f 1.4 spec: Add descriptions of new RRSELECTMASK bits
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
2012-07-12 18:38:02 +10:00
Alan Coopersmith
75a1d1aa8f 1.4 spec: Change "LISTof ATOM" to "LISTofATOM" to match other LIST types
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
2012-07-12 18:36:07 +10:00
Dave Airlie
ef99bda581 randr: add provider object (v8)
A provider object represents a GPU or virtual device that provides
rendering or output services to the X server. This protocol
allow controlling provider objects for output and offload slave devices.

v1.1: fix typo add missing define

v2: rename nProperties back to nAtoms, makes server simpler to c-n-p,
add missing Get request/reply

v3: bring back configure property, no point in diverging from the
output property code without good reason.
also fix typo pointed out on irc by rei4dan.

v3.1: drop cut-n-paste, increase RRNumberRequests

v4: reviewed by Aaron, address comments:
Fix provider error code
add missing notify, remove dri2 references, fix c-n-p issues.

v5: add provider change notify event with current role.
v5.1: fix cut-n-paste

v6:
document flags, fix whitespace, add better errors for SetProviderRoles,
add new events, fix pending language.

v6.1: add missing change notify event struct + missing padding

v7: fix a bunch more tab/spaces, add appendix sections for requests, events
and errors, remove multimaster flag in favour of max master counter,
move some members around to follow other events.

v7.1 fix maxMaster + wrong comment, one whitespace
v7.2 bump to being randr 1.4, fix some too generic names.
v7.3 remove dynamic flag, fix some language

v8 overhaul complete protocol, remove set provider roles, add specific
methods for setting offload sinks and output sources, add a list
of associated providers into the get provider info struct.

Earlier-review-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-07-05 21:08:55 +01:00
Dave Airlie
e0c94fa3a9 Revert the unused 1.4.0 protocol
This patch reverts:
Revert "Make SetCrtcConfigs take flags bits to allow partial configuration changes"

This reverts commit 105a161a3f.

Revert "Define new semantics for scanout pixmap destruction."

This reverts commit 0d32bb0780.

Revert "Fix spelling errors, add description of SCANOUTPIXMAPINFO fields."

This reverts commit 3e28d3098f.

Revert "Add some informative text about the reasons for the PCP and ST bits"

This reverts commit ebab32deea.

Revert "RandR version 1.4 additions"

This reverts commit dd14a22755.

None of this was ever used in the X server and I think it should
probably be addressed in smaller pieces later.

Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-06-27 10:35:31 +01:00
Aaron Plattner
40cce2d010 Add "Border" and "BorderDimensions" properties
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
2011-08-04 10:13:03 -07:00
Aaron Plattner
e151e053fb Be more specific about property types
RandR output properties are X properties, which have a type atom, a
"format" (i.e. an element size) and a number of items.  Be explicit
about these fields when describing properties in the protocol
document.  E.g., instead of specifying "int32 [2 * n] / Atom pairs,"
say "Type: INTEGER / Format: 32 / Num. items: 2*n."

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-08-02 18:24:47 -07:00
Adam Jackson
b5c977ad70 Remove nonsense paragraph about dual-link DVI
I've never heard of any hardware that behaves so.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-05-19 16:26:27 -04:00
Keith Packard
105a161a3f Make SetCrtcConfigs take flags bits to allow partial configuration changes
Instead of requiring a complete new configuration to be computed,
allow the client to send a partial configuration with only the changed
values included. This simplifies clients so that they need not change
things they don't understand.

This also removes the 'CurrentScanoutPixmap' hack as that is no longer
necessary.

Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-16 22:48:52 -08:00
Keith Packard
0d32bb0780 Define new semantics for scanout pixmap destruction.
This is not yet implemented in the X server...

Signed-off-by: Keith Packard <keithp@keithp.com>
2010-12-06 22:40:57 -08:00
Keith Packard
3e28d3098f Fix spelling errors, add description of SCANOUTPIXMAPINFO fields.
Review results from Aaron Plattner.

Signed-off-by: Keith Packard <keithp@keithp.com>
2010-12-06 22:40:57 -08:00
Keith Packard
ebab32deea Add some informative text about the reasons for the PCP and ST bits
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-12-06 22:40:57 -08:00
Keith Packard
dd14a22755 RandR version 1.4 additions
This adds the specification and protocol header definitions for the
RandR 1.4 protocol changes, including

 * Per crtc pixmaps and pixmap origins
 * Sprite position and image transforms
 * SetCrtcConfigs request

Signed-off-by: Keith Packard <keithp@keithp.com>
2010-12-06 22:40:57 -08:00
Keith Packard
1325b01124 Whitespace cleanups in randrproto.txt
This just eliminates some ugly space/tab combos

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
2010-12-06 22:40:22 -08:00
Keith Packard
8289b93b9a New properties claimed to be in version 1.4 instead of 1.3.1
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-05 20:50:22 -07:00
Keith Packard
240bb6051d Bump version to 1.3.1
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-05 20:21:28 -07:00
Keith Packard
d9ee6abdef Remove trailing white space from randrproto.txt 2009-10-05 19:25:02 -07:00