xserver: Branch 'server-1.9-branch'

[Jeremy Huddleston]

 test/input.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit acd78f7fdcd348ef4d368003b537a26ab6a5cec6
Author: Chase Douglas <chase.douglas at ubuntu.com>
Date:   Thu Oct 21 22:41:09 2010 -0400

    test: input - set valuators mask for event to core conversion
    
    Commit de8be07cc0a8163b6ef04455706fd5ca2cebe587 adds a requirement to
    event to core conversion that at least one of the X or Y valuators are
    set in the valuator mask. This commit fixes the event conversion test to
    be compliant.
    
    Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 290af0418f8c94355e42ad81aa7779b90e173fc9)
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/test/input.c b/test/input.c
index b90d3b4..f08e13b 100644
--- a/test/input.c
+++ b/test/input.c
@@ -182,6 +182,8 @@ static void dix_event_to_core(int type)
     ev.time     = time;
     ev.root_y   = x;
     ev.root_x   = y;
+    SetBit(ev.valuators.mask, 0);
+    SetBit(ev.valuators.mask, 1);
     ev.root     = ROOT_WINDOW_ID;
     ev.corestate = state;
     ev.detail.key = detail;