Remove output options. Clean up other sizes.

Output options will be controlled by properties instead.
Also found a few instances in randrproto.txt using the wrong
size for MODEINFO.

3 files changed, 7 insertions, 57 deletions

diff --git a/randr.h b/randr.h
index 7d3e123..935db85 100644
--- a/randr.h
+++ b/randr.h
@@ -36,7 +36,6 @@ typedef unsigned short	XRandrRotation;
 typedef unsigned short	XRandrSizeID;
 typedef unsigned short	XRandrSubpixelOrder;
 typedef unsigned long	XRandrModeFlags;
-typedef unsigned long	XRandrOutputOptions;
 
 #define RANDR_NAME		"RANDR"
 #define RANDR_MAJOR		1
@@ -133,10 +132,6 @@ typedef unsigned long	XRandrOutputOptions;
 #define BadRRCrtc		1
 #define BadRRMode		2
 
-#define RROutputOptionScaleNone		1
-#define RROutputOptionScaleMaxAspect	2
-#define RROutputOptionScaleMax		4
-
 /* Conventional RandR output properties */
 
 #define RR_PROPERTY_RANDR_EDID		"RANDR_EDID"
diff --git a/randrproto.h b/randrproto.h
index cff3061..314b9ae 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -47,7 +47,6 @@
 #define RRMode CARD32
 #define RRCrtc CARD32
 #define RRModeFlags CARD32
-#define RROutputOptions CARD32
 
 #define Rotation CARD16
 #define SizeID CARD16
@@ -197,12 +196,6 @@ typedef struct _xRRModeInfo {
 #define sz_xRRModeInfo		    32
 
 typedef struct {
-    RROutput		output B32;
-    RROutputOptions	options B32;
-} xRROutputConfig;
-#define sz_xRROutputConfig	    8
-
-typedef struct {
     CARD8   reqType;
     CARD8   randrReqType;
     CARD16  length B16;
@@ -278,7 +271,6 @@ typedef struct {
     CARD32	length B32;
     Time	timestamp B32;
     RRCrtc	crtc B32;
-    RROutputOptions currentOptions B32;
     CARD32	mmWidth B32;
     CARD32	mmHeight B32;
     CARD8	connection;
@@ -288,9 +280,8 @@ typedef struct {
     CARD16	nPreferred B16;
     CARD16	nClones B16;
     CARD16	nameLength B16;
-    RROutputOptions possibleOptions B32;
 } xRRGetOutputInfoReply;
-#define sz_xRRGetOutputInfoReply	44
+#define sz_xRRGetOutputInfoReply	36
 
 typedef struct {
     CARD8	reqType;
@@ -597,7 +588,6 @@ typedef struct {
 } xRROutputPropertyNotifyEvent;
 #define sz_xRROUtputPropertyNotifyEvent	32
 
-#undef RROutputOptions
 #undef RRModeFlags
 #undef RRCrtc
 #undef RRMode
diff --git a/randrproto.txt b/randrproto.txt
index 20543bf..dccee75 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -276,16 +276,6 @@ MODEFLAG { HSyncPositive
 	   DoubleClock
 	   ClockDivideBy2 }
 
-OUTPUTOPTION { RROutputOptionScaleNone,
-	       RROutputOptionScaleMaxAspect,
-	       RROutputOptionScaleMax }
-
-	These options select paramaters of the output which are independent
-	of the output mode.
-	
-	The scale options are used for fixed panels and select between
-	different scaling options for non-native resolutions.
-	
 MODEINFO { id: MODE
 	   name: STRING
            width, height: CARD16
@@ -294,9 +284,6 @@ MODEINFO { id: MODE
            vSyncStart, vSyncEnd, vTotal: CARD16
            modeFlags: SETofMODEFLAG }
 
-OUTPUTCONFIG { output: OUTPUT
-	       options: SETofOUTPUTOPTION }
-
 REFRESH { rates: LISTofCARD16 }
 
                               ❧❧❧❧❧❧❧❧❧❧❧
@@ -553,13 +540,11 @@ dynamic changes in the display environment.
 	status: RRCONFIGSTATUS
 	timestamp: TIMESTAMP
 	crtc: CRTC
-	options: SETofOUTPUTOPTION
 	
 	name: STRING
 	connection: CONNECTION
 	subpixel-order: SUBPIXELORDER
         widthInMillimeters, heightInMillimeters: CARD32
-	possible-options: SETofOUTPUTOPTION
 	crtcs: LISTofCRTC
 	clones: LISTofOUTPUT
 	modes: LISTofOUTPUT
@@ -580,8 +565,6 @@ dynamic changes in the display environment.
 	'crtc' is the current source CRTC for video data, or Disabled if the
 	output is not connected to any CRTC.
 
-	'options' is the currently enabled set of options.
-	
 	'name' is a UTF-8 encoded string designed to be presented to the
 	user to indicate which output this is. E.g. "S-Video" or "DVI".
 
@@ -597,9 +580,6 @@ dynamic changes in the display environment.
 	size of the displayed area. If unknown, or not really fixed (e.g.,
 	for a projector), these	values are both zero.
 
-	'possible-options' indicate which options are supported by this
-	output device.
-	
 	'crtcs' is the list of CRTCs that this output may be connected to.
 	Attempting to connect this output to a different CRTC results in a
 	Match error.
@@ -1179,12 +1159,10 @@ A.1 Common Types
 	Return status for requests which depend on time.
 	
 ┌───
-    MODEINFO (40)				Added in version 1.2
+    MODEINFO (32)				Added in version 1.2
 	4	CARD32		id
 	2	CARD16		width in pixels
 	2	CARD16		height in pixels
-	4	CARD32		width in millimeters
-	4	CARD32		height in millimeters
 	4	CARD32		dot clock
 	2	CARD16		h sync start
 	2	CARD16		h sync end
@@ -1228,17 +1206,6 @@ A.1 Common Types
 	1		Disconnected
 	2		UnknownConnection
 └───
-┌───
-    OUTPUTOPTION
-	1		RROutputOptionScaleNone
-	2		RROutputOptionScaleMaxAspect
-	4		RROutputOptionScaleMax
-└───
-┌───
-    OUTPUTCONFIG
-    	4	CARD32		output
-	4	OUTPUTOPTION	set of output options
-└───
 
 
 A.2 Protocol Requests
@@ -1371,7 +1338,7 @@ A.2.1 Protocol Requests added with version 1.2
 	1	1			Reply
 	1				unused
 	2	CARD16			sequence number
-	4	c+o+10m+(b+p)/4		reply length
+	4	c+o+8m+(b+p)/4		reply length
 	4	TIMESTAMP		timestamp
 	4	TIMESTAMP		config-timestamp
 	2	c			number of CRTCs
@@ -1381,7 +1348,7 @@ A.2.1 Protocol Requests added with version 1.2
 	8				unused
 	4c	LISTofCRTC		crtcs
 	4o	LISTofOUTPUT		outputs
-	40m	LISTofMODEINFO		modeinfos
+	32m	LISTofMODEINFO		modeinfos
 	b	STRING8			mode names
 	p				unused, p=pad(b)
 └───
@@ -1396,10 +1363,9 @@ A.2.1 Protocol Requests added with version 1.2
 	1	1			Reply
 	1	RRCONFIGSTATUS		status
 	2	CARD16			sequence number
-	4	3+c+m+(n+p)/4		reply length
+	4	1+c+m+(n+p)/4		reply length
 	4	TIMESTAMP		timestamp
 	4	CRTC			current connected crtc
-	4	SETofOUTPUTOPTION	current output options
 	4	CARD32			width in millimeters
 	4	CARD32			height in millimeters
 	1	CONNECTION		connection
@@ -1409,7 +1375,6 @@ A.2.1 Protocol Requests added with version 1.2
 	2	p			number of preferred modes
 	2	o			number of clones
 	2	n			length of name
-	4	SETofOUTPUTOPTION	supported output options
 	4c	LISTofCRTC		crtcs
 	4m	LISTofMODE		modes
 	n	STRING8			name
@@ -1500,7 +1465,7 @@ A.2.1 Protocol Requests added with version 1.2
 	1	14			RandR opcode
 	2	12+(n+p)/4		length
 	4	WINDOW			window
-	40	MODEINFO		mode
+	32	MODEINFO		mode
 	n	STRING8			mode name
 	p				unused, p=pad(n)
       ▶
@@ -1572,7 +1537,7 @@ A.2.1 Protocol Requests added with version 1.2
 	4	MODE			mode
 	2	ROTATION		rotation/reflection
 	2				unused
-	8n	LISTofOUTPUTCONFIG	outputs
+	8n	LISTofOUTPUT		outputs
       ▶
 	1	1			Reply
 	1	RRCONFIGSTATUS		status