xserver: Branch 'master'

[Adam Jackson]

 randr/rrdispatch.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 91c7acfc3447a0073dd1db260cf05115d94ce7e8
Author: Michal Srb <msrb at suse.com>
Date:   Mon Oct 7 17:57:14 2013 +0300

    randr: Allow RRSelectInput for ProviderChange and ResourceChange events
    
    [ajax: To be clear, we already have code to emit these events, and it
     looks like it works, but to get them you'd have had to also ask for one
     of the other notify types.  This makes it possible to listen for e.g.
     ProviderChange alone.]
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Michal Srb <msrb at suse.com>

diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
index 13ac6b1..314e4ea 100644
--- a/randr/rrdispatch.c
+++ b/randr/rrdispatch.c
@@ -92,7 +92,9 @@ ProcRRSelectInput(ClientPtr client)
                          RRCrtcChangeNotifyMask |
                          RROutputChangeNotifyMask |
                          RROutputPropertyNotifyMask |
-                         RRProviderPropertyNotifyMask)) {
+                         RRProviderChangeNotifyMask |
+                         RRProviderPropertyNotifyMask |
+                         RRResourceChangeNotifyMask)) {
         ScreenPtr pScreen = pWin->drawable.pScreen;
 
         rrScrPriv(pScreen);