diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
commit | 4097e27114d227692d53c5d28487e12a3833cd24 (patch) | |
tree | d5c2a62c4db97de94f92150340612c64d3997669 /spectro/dispwin.h | |
parent | f8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff) | |
parent | 5514d94483c98e3320b202b1bb882023a7d12027 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'spectro/dispwin.h')
-rwxr-xr-x[-rw-r--r--] | spectro/dispwin.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/spectro/dispwin.h b/spectro/dispwin.h index 47fd256..8130d5f 100644..100755 --- a/spectro/dispwin.h +++ b/spectro/dispwin.h @@ -118,10 +118,10 @@ typedef struct { CGDirectDisplayID ddid; #endif /* UNIX_APPLE */ #if defined(UNIX_X11) - int screen; /* Screen to select */ - int uscreen; /* Underlying screen */ - int rscreen; /* Underlying RAMDAC screen */ - Atom icc_atom; /* ICC profile root atom for this display */ + int screen; /* X11 (possibly virtual) Screen */ + int uscreen; /* Underlying Xinerma/XRandr screen */ + int rscreen; /* Underlying RAMDAC screen (user override) */ + Atom icc_atom; /* ICC profile root/output atom for this display */ unsigned char *edid; /* 128 or 256 bytes of monitor EDID, NULL if none */ int edid_len; /* 128 or 256 */ @@ -272,9 +272,9 @@ struct _dispwin { #if defined(UNIX_X11) Display *mydisplay; - int myscreen; /* Usual or virtual screen with Xinerama */ - int myuscreen; /* Underlying screen */ - int myrscreen; /* Underlying RAMDAC screen */ + int myscreen; /* Overall X11 (possibly virtual) Screen */ + int myuscreen; /* Underlying Xinerma/Xrandr screen */ + int myrscreen; /* Underlying RAMDAC screen (user override) */ Atom icc_atom; /* ICC profile root atom for this display */ unsigned char *edid; /* 128 or 256 bytes of monitor EDID, NULL if none */ int edid_len; /* 128 or 256 */ |