diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 /xorg-server/randr | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
Diffstat (limited to 'xorg-server/randr')
| -rw-r--r-- | xorg-server/randr/randrstr.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xorg-server/randr/randrstr.h b/xorg-server/randr/randrstr.h index 212b0a9be..a16302f4d 100644 --- a/xorg-server/randr/randrstr.h +++ b/xorg-server/randr/randrstr.h @@ -933,6 +933,14 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type, pointer value, Bool sendevent, Bool pending); extern _X_EXPORT int + RRConfigureProviderProperty(RRProviderPtr provider, Atom property, + Bool pending, Bool range, Bool immutable, + int num_values, INT32 *values); + +extern _X_EXPORT Bool + RRPostProviderPendingProperties(RRProviderPtr provider); + +extern _X_EXPORT int ProcRRGetProviderProperty(ClientPtr client); extern _X_EXPORT int |