[Merge] ~kondor-dani/compiz:annotate_fix into compiz:master

[Daniel Kondor]

Diff comments:

> diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
> index f415d6c..834c972 100644
> --- a/plugins/annotate/src/annotate.cpp
> +++ b/plugins/annotate/src/annotate.cpp
> @@ -384,6 +385,8 @@ AnnoScreen::draw (CompAction         *action,
>  	    drawText (x, y, text, family, size, slant, weight,
>  		      fillColor, strokeColor, strokeWidth);
>  	}
> +	screen->handleEventSetEnabled (this, true);

This is unclear to me as well, but without it still nothing is drawn on the screen.

More precisely, if there is already something drawn (e.g. using the key combinations and not clearing it), then it works, but not of the screen is cleared.

My guess is that this is needed to handle and / or raise damage events for the region drawn (in AnnoScreen::handleEvent()), but I'm not sure.

> +	gScreen->glPaintOutputSetEnabled (this, true);
>      }
>  
>      return true;


-- 
https://code.launchpad.net/~kondor-dani/compiz/+git/compiz/+merge/383948
Your team Compiz Maintainers is subscribed to branch compiz:master.