diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-10-04 20:03:35 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-10-04 20:03:35 -0700 |
| commit | 369d4e7d2030c707cf2ce37d06c1d23b0570910c (patch) | |
| tree | aab5c74a18b0ce3d85dd9e65cbc195ef67284832 /randrproto.h | |
| parent | 3c354e7245dd7830b5600716185017831aff1316 (diff) | |
| download | xorg-proto-randrproto-369d4e7d2030c707cf2ce37d06c1d23b0570910c.tar.gz | |
Remove mode origins. Add preferred mode count.
Switched from identifying source of mode line to listing which modes are
preferred by each output. This enables better CRTC sharing by making modes
less arbitrarily different.
Diffstat (limited to 'randrproto.h')
| -rw-r--r-- | randrproto.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/randrproto.h b/randrproto.h index d55e547..90549bd 100644 --- a/randrproto.h +++ b/randrproto.h @@ -48,7 +48,6 @@ #define RRCrtc CARD32 #define RRModeFlags CARD32 #define RROutputOptions CARD32 -#define RRModeOrigin CARD8 #define Rotation CARD16 #define SizeID CARD16 @@ -196,11 +195,8 @@ typedef struct _xRRModeInfo { CARD16 vTotal B16; CARD16 nameLength B16; RRModeFlags modeFlags B32; - RRModeOrigin origin; - CARD8 pad1; - CARD16 pad2 B16; } xRRModeInfo; -#define sz_xRRModeInfo 44 +#define sz_xRRModeInfo 40 typedef struct { RROutput output B32; @@ -289,9 +285,9 @@ typedef struct { CARD8 subpixelOrder; CARD16 nCrtcs B16; CARD16 nModes B16; + CARD16 nPreferred B16; CARD16 nClones B16; CARD16 nameLength B16; - CARD16 pad1 B16; RROutputOptions possibleOptions B32; } xRRGetOutputInfoReply; #define sz_xRRGetOutputInfoReply 36 @@ -378,7 +374,7 @@ typedef struct { Window window B32; xRRModeInfo modeInfo; } xRRCreateModeReq; -#define sz_xRRCreateModeReq 52 +#define sz_xRRCreateModeReq 48 typedef struct { BYTE type; @@ -601,7 +597,10 @@ typedef struct { } xRROutputPropertyNotifyEvent; #define sz_xRROUtputPropertyNotifyEvent 32 - +#undef RROutputOptions +#undef RRModeFlags +#undef RRCrtc +#undef RRMode #undef RROutput #undef RRMode #undef RRCrtc |