diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-10-04 20:04:09 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-10-04 20:04:09 -0700 |
| commit | ab4207db14d70384f017cc2a22379d7c358b60e0 (patch) | |
| tree | c74a28ced4cb1617ba052fa3a3ae3af4210e23b0 | |
| parent | dd0fb435a0168d4041ecd81024d6493295651c61 (diff) | |
Remove mode origins. Add preferred mode count.
| -rw-r--r-- | include/X11/extensions/Xrandr.h | 3 | ||||
| -rw-r--r-- | src/XrrOutput.c | 1 | ||||
| -rw-r--r-- | src/XrrScreen.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h index 827dcdc..418e97c 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 XRRModeOrigin; typedef unsigned int XRROutputOptions; typedef struct _XRRModeInfo { @@ -226,7 +225,6 @@ typedef struct _XRRModeInfo { char *name; unsigned int nameLength; XRRModeFlags modeFlags; - XRRModeOrigin origin; } XRRModeInfo; typedef struct _XRROutputConfig { @@ -265,6 +263,7 @@ typedef struct _XRROutputInfo { int nclone; RROutput *clones; int nmode; + int npreferred; RRMode *modes; } XRROutputInfo; diff --git a/src/XrrOutput.c b/src/XrrOutput.c index 872a83a..8ae3efa 100644 --- a/src/XrrOutput.c +++ b/src/XrrOutput.c @@ -97,6 +97,7 @@ XRRGetOutputInfo (Display *dpy, XRRScreenResources *resources, RROutput output) xoi->ncrtc = rep.nCrtcs; xoi->crtcs = (RRCrtc *) (xoi + 1); xoi->nmode = rep.nModes; + xoi->npreferred = rep.nPreferred; xoi->modes = (RRMode *) (xoi->crtcs + rep.nCrtcs); xoi->nclone = rep.nClones; xoi->clones = (RROutput *) (xoi->modes + rep.nModes); diff --git a/src/XrrScreen.c b/src/XrrScreen.c index 37e3aed..1b79c8f 100644 --- a/src/XrrScreen.c +++ b/src/XrrScreen.c @@ -162,7 +162,6 @@ XRRGetScreenResources (Display *dpy, Window window) xrsr->modes[i].vTotal = modeInfo.vTotal; xrsr->modes[i].nameLength = modeInfo.nameLength; xrsr->modes[i].modeFlags = modeInfo.modeFlags; - xrsr->modes[i].origin = modeInfo.origin; } /* |