summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2006-11-16 13:35:46 -0800
committerKeith Packard <keithp@neko.keithp.com>2006-11-16 13:35:46 -0800
commit8edabfeba65562f026111b35ec14a9801b4b6a5c (patch)
tree6fa9a443d2f3e6c209cfbe3efdf021e3f67c74b3
parent7ac8dba76fe33b13620e023699bf971fe8c99fb2 (diff)
Remove RandR output options.
Options are to be implemented as properties instead.
-rw-r--r--include/X11/extensions/Xrandr.h10
-rw-r--r--src/XrrCrtc.c6
-rw-r--r--src/XrrOutput.c2
3 files changed, 4 insertions, 14 deletions
diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
index de0739d..c1de54a 100644
--- a/include/X11/extensions/Xrandr.h
+++ b/include/X11/extensions/Xrandr.h
@@ -206,7 +206,6 @@ XRRSetScreenSize (Display *dpy, Window window,
int mmWidth, int mmHeight);
typedef unsigned long XRRModeFlags;
-typedef unsigned int XRROutputOptions;
typedef struct _XRRModeInfo {
RRMode id;
@@ -225,11 +224,6 @@ typedef struct _XRRModeInfo {
XRRModeFlags modeFlags;
} XRRModeInfo;
-typedef struct _XRROutputConfig {
- RROutput output;
- XRROutputOptions options;
-} XRROutputConfig;
-
typedef struct _XRRScreenResources {
Time timestamp;
Time configTimestamp;
@@ -252,12 +246,10 @@ typedef struct _XRROutputInfo {
RRCrtc crtc;
char *name;
int nameLen;
- XRROutputOptions current_options;
unsigned long mm_width;
unsigned long mm_height;
Connection connection;
SubpixelOrder subpixel_order;
- XRROutputOptions possible_options;
int ncrtc;
RRCrtc *crtcs;
int nclone;
@@ -338,7 +330,7 @@ XRRSetCrtcConfig (Display *dpy,
int x, int y,
RRMode mode,
Rotation rotation,
- XRROutputConfig *outputs,
+ RROutput *outputs,
int noutputs);
int
diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c
index 535327e..a1372a1 100644
--- a/src/XrrCrtc.c
+++ b/src/XrrCrtc.c
@@ -121,7 +121,7 @@ XRRSetCrtcConfig (Display *dpy,
int x, int y,
RRMode mode,
Rotation rotation,
- XRROutputConfig *outputs,
+ RROutput *outputs,
int noutputs)
{
XExtDisplayInfo *info = XRRFindDisplay(dpy);
@@ -135,7 +135,7 @@ XRRSetCrtcConfig (Display *dpy,
GetReq (RRSetCrtcConfig, req);
req->reqType = info->codes->major_opcode;
req->randrReqType = X_RRSetCrtcConfig;
- req->length += noutputs << 1;
+ req->length += noutputs;
req->crtc = crtc;
req->timestamp = timestamp;
req->configTimestamp = resources->configTimestamp;
@@ -143,7 +143,7 @@ XRRSetCrtcConfig (Display *dpy,
req->y = y;
req->mode = mode;
req->rotation = rotation;
- Data32 (dpy, outputs, noutputs << 3);
+ Data32 (dpy, outputs, noutputs << 2);
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
rep.status = RRSetConfigFailed;
diff --git a/src/XrrOutput.c b/src/XrrOutput.c
index ce25bb3..c908bbc 100644
--- a/src/XrrOutput.c
+++ b/src/XrrOutput.c
@@ -90,12 +90,10 @@ XRRGetOutputInfo (Display *dpy, XRRScreenResources *resources, RROutput output)
xoi->timestamp = rep.timestamp;
xoi->crtc = rep.crtc;
- xoi->current_options = rep.currentOptions;
xoi->mm_width = rep.mmWidth;
xoi->mm_height = rep.mmHeight;
xoi->connection = rep.connection;
xoi->subpixel_order = rep.subpixelOrder;
- xoi->possible_options = rep.possibleOptions;
xoi->ncrtc = rep.nCrtcs;
xoi->crtcs = (RRCrtc *) (xoi + 1);
xoi->nmode = rep.nModes;