fontconfig libX11 libxcb xcb-proto mesa pixman xserver xkeyboard-config git update 15 June 2015release/external

xserver          commit fa12f2c150b2f50de9dac4a2b09265f13af353af
libxcb           commit f85661c3bca97faa72431df92a3867be39a74e23
libxcb/xcb-proto commit fef8a4cdc2cacd9541a656026371a3d338dadb8e
xkeyboard-config commit 61fb58a95a071cc1c212f6d3808908c086219fe0
libX11           commit f0286b2770ece10aef5e2e8c004260217f12fd25
pixman           commit eebc1b78200aff075dbcae9c8d00edad1f830d91
fontconfig       commit f6d61c9beed856a925bd60c025b55284b2d88161
mesa             commit 932d1613d1e15ec22555e5ec09105c49eb850e36

1 files changed, 63 insertions, 0 deletions

diff --git a/xorg-server/test/input.c b/xorg-server/test/input.c
index a4615c9c9..91ee43c46 100644
--- a/xorg-server/test/input.c
+++ b/xorg-server/test/input.c
@@ -1358,6 +1358,68 @@ dix_valuator_mode(void)
 }
 
 static void
+dix_input_valuator_masks_unaccel(void)
+{
+    ValuatorMask *mask = NULL;
+    double x, ux;
+
+    /* set mask normally */
+    mask = valuator_mask_new(MAX_VALUATORS);
+    assert(!valuator_mask_has_unaccelerated(mask));
+    valuator_mask_set_double(mask, 0, 1.0);
+    assert(!valuator_mask_has_unaccelerated(mask));
+    valuator_mask_unset(mask, 0);
+    assert(!valuator_mask_has_unaccelerated(mask));
+
+    /* all unset, now set accel mask */
+    valuator_mask_set_unaccelerated(mask, 0, 1.0, 2.0);
+    assert(valuator_mask_has_unaccelerated(mask));
+    assert(valuator_mask_isset(mask, 0));
+    assert(!valuator_mask_isset(mask, 1));
+    assert(valuator_mask_get_accelerated(mask, 0) ==  1.0);
+    assert(valuator_mask_get_unaccelerated(mask, 0) ==  2.0);
+    assert(valuator_mask_fetch_unaccelerated(mask, 0, &x, &ux));
+    assert(x == 1.0);
+    assert(ux == 2.0);
+    x = 0xff;
+    ux = 0xfe;
+    assert(!valuator_mask_fetch_unaccelerated(mask, 1, &x, &ux));
+    assert(x == 0xff);
+    assert(ux == 0xfe);
+
+    /* all unset, now set normally again */
+    valuator_mask_unset(mask, 0);
+    assert(!valuator_mask_has_unaccelerated(mask));
+    assert(!valuator_mask_isset(mask, 0));
+    valuator_mask_set_double(mask, 0, 1.0);
+    assert(!valuator_mask_has_unaccelerated(mask));
+    valuator_mask_unset(mask, 0);
+    assert(!valuator_mask_has_unaccelerated(mask));
+
+    valuator_mask_zero(mask);
+    assert(!valuator_mask_has_unaccelerated(mask));
+
+    valuator_mask_set_unaccelerated(mask, 0, 1.0, 2.0);
+    valuator_mask_set_unaccelerated(mask, 1, 3.0, 4.5);
+    assert(valuator_mask_isset(mask, 0));
+    assert(valuator_mask_isset(mask, 1));
+    assert(!valuator_mask_isset(mask, 2));
+    assert(valuator_mask_has_unaccelerated(mask));
+    assert(valuator_mask_get_accelerated(mask, 0) == 1.0);
+    assert(valuator_mask_get_accelerated(mask, 1) == 3.0);
+    assert(valuator_mask_get_unaccelerated(mask, 0) == 2.0);
+    assert(valuator_mask_get_unaccelerated(mask, 1) == 4.5);
+    assert(valuator_mask_fetch_unaccelerated(mask, 0, &x, &ux));
+    assert(x == 1.0);
+    assert(ux == 2.0);
+    assert(valuator_mask_fetch_unaccelerated(mask, 1, &x, &ux));
+    assert(x == 3.0);
+    assert(ux == 4.5);
+
+    valuator_mask_free(&mask);
+}
+
+static void
 include_bit_test_macros(void)
 {
     uint8_t mask[9] = { 0 };
@@ -1847,6 +1909,7 @@ main(int argc, char **argv)
     dix_enqueue_events();
     dix_double_fp_conversion();
     dix_input_valuator_masks();
+    dix_input_valuator_masks_unaccel();
     dix_input_attributes();
     dix_init_valuators();
     dix_event_to_core_conversion();