diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-20 22:42:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-20 22:42:55 +0200 |
| commit | 934184bfecd402aae891b8740d788b486aa7269f (patch) | |
| tree | c23fb0afd169dc6846ea23bda21260fcffd1e3e6 /X11/extensions/randr.h | |
| parent | 57dd848fb6dd7cf15820172e2abc9fb9de2b4268 (diff) | |
| parent | 4ba9be2882d9f1567809edb0a31fcdf11320d41f (diff) | |
| download | vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.gz vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.bz2 vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/dlopen.h
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/randr/rrxinerama.c
Diffstat (limited to 'X11/extensions/randr.h')
| -rw-r--r-- | X11/extensions/randr.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/X11/extensions/randr.h b/X11/extensions/randr.h index 3c6721bc5..6fcda8748 100644 --- a/X11/extensions/randr.h +++ b/X11/extensions/randr.h @@ -40,11 +40,11 @@ typedef unsigned long XRandrModeFlags; #define RANDR_NAME "RANDR" #define RANDR_MAJOR 1 -#define RANDR_MINOR 4 +#define RANDR_MINOR 5 #define RRNumberErrors 4 #define RRNumberEvents 2 -#define RRNumberRequests 42 +#define RRNumberRequests 45 #define X_RRQueryVersion 0 /* we skip 1 to make old clients fail pretty immediately */ @@ -104,6 +104,11 @@ typedef unsigned long XRandrModeFlags; #define X_RRDeleteProviderProperty 40 #define X_RRGetProviderProperty 41 +/* v1.5 */ +#define X_RRGetMonitors 42 +#define X_RRSetMonitor 43 +#define X_RRDeleteMonitor 44 + /* Event selection bits */ #define RRScreenChangeNotifyMask (1L << 0) /* V1.2 additions */ @@ -181,6 +186,7 @@ typedef unsigned long XRandrModeFlags; #define RR_PROPERTY_BORDER "Border" #define RR_PROPERTY_BORDER_DIMENSIONS "BorderDimensions" #define RR_PROPERTY_GUID "GUID" +#define RR_PROPERTY_RANDR_TILE "TILE" /* roles this device can carry out */ #define RR_Capability_None 0 |