Turn off hardware cursor when screen fade begins.
authorMatt Roper <matthew.d.roper@intel.com>
Mon, 29 Aug 2011 22:59:37 +0000 (15:59 -0700)
committerKristian Høgsberg <krh@bitplanet.net>
Wed, 31 Aug 2011 20:27:35 +0000 (16:27 -0400)
The compositor was never actually calling the output backend to turn off
the hardware cursor when the screen begins fading.  This would result in
a stuck hardware cursor and movable software cursor for the duration of
the fade/unfade.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
compositor/compositor.c

index 8d54a29..07de2c5 100644 (file)
@@ -812,8 +812,10 @@ wlsc_output_set_cursor(struct wlsc_output *output,
 
        prior_was_hardware = wl_list_empty(&device->sprite->link);
        if (force_sw || output->set_hardware_cursor(output, device) < 0) {
-               if (prior_was_hardware)
+               if (prior_was_hardware) {
                        wlsc_surface_damage(device->sprite);
+                       output->set_hardware_cursor(output, NULL);
+               }
                use_hardware_cursor = 0;
        } else if (!prior_was_hardware) {
                wlsc_surface_damage_below(device->sprite);