diff options
| author | Keith Packard <keithp@mandolin.keithp.com> | 2006-11-01 00:25:45 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@mandolin.keithp.com> | 2006-11-01 00:25:45 -0800 |
| commit | 6676505b6012c97d2f711a84237fa14a62d1d33d (patch) | |
| tree | f84de4eab5383eab2df021883e6e7a822d768f2b | |
| parent | ab4207db14d70384f017cc2a22379d7c358b60e0 (diff) | |
| download | xorg-lib-libXrandr-6676505b6012c97d2f711a84237fa14a62d1d33d.tar.gz | |
Moving physical size from mode to output.
Follows protocol change which places physical size
information in the output rather than (inappropriately)
in each mode line.
| -rw-r--r-- | include/X11/extensions/Xrandr.h | 4 | ||||
| -rw-r--r-- | src/XrrOutput.c | 2 | ||||
| -rw-r--r-- | src/XrrScreen.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h index 418e97c..de0739d 100644 --- a/include/X11/extensions/Xrandr.h +++ b/include/X11/extensions/Xrandr.h @@ -212,8 +212,6 @@ typedef struct _XRRModeInfo { RRMode id; unsigned int width; unsigned int height; - unsigned long mmWidth; - unsigned long mmHeight; unsigned long dotClock; unsigned int hSyncStart; unsigned int hSyncEnd; @@ -255,6 +253,8 @@ typedef struct _XRROutputInfo { char *name; int nameLen; XRROutputOptions current_options; + unsigned long mm_width; + unsigned long mm_height; Connection connection; SubpixelOrder subpixel_order; XRROutputOptions possible_options; diff --git a/src/XrrOutput.c b/src/XrrOutput.c index 8ae3efa..a497457 100644 --- a/src/XrrOutput.c +++ b/src/XrrOutput.c @@ -91,6 +91,8 @@ 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; diff --git a/src/XrrScreen.c b/src/XrrScreen.c index 1b79c8f..c9f5204 100644 --- a/src/XrrScreen.c +++ b/src/XrrScreen.c @@ -150,8 +150,6 @@ XRRGetScreenResources (Display *dpy, Window window) xrsr->modes[i].id = modeInfo.id; xrsr->modes[i].width = modeInfo.width; xrsr->modes[i].height = modeInfo.height; - xrsr->modes[i].mmWidth = modeInfo.mmWidth; - xrsr->modes[i].mmHeight = modeInfo.mmHeight; xrsr->modes[i].dotClock = modeInfo.dotClock; xrsr->modes[i].hSyncStart = modeInfo.hSyncStart; xrsr->modes[i].hSyncEnd = modeInfo.hSyncEnd; |