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

[Daniel Kondor]

Daniel Kondor has proposed merging ~kondor-dani/compiz:annotate_fix2 into compiz:master.

Commit message:
Proposed fix for LP #1878545


Requested reviews:
  Dmitry Shachnev (mitya57)

For more details, see:
https://code.launchpad.net/~kondor-dani/compiz/+git/compiz/+merge/383958

Second iteration of fix for bug #1878545

Changes moved to separate commits.

Cause of bug (in plugins/annotate/src/annotate.cpp):
 -- "tool" variable in AnnoScreen::draw() gets overwritten between lines 305 and 322 (is it undefined behavior to save the c_str() of the value returned by CompOption::getStringOptionNamed()?)
 -- AnnoScreen::draw() needs to call handleEventSetEnabled() and glPaintOutputSetEnabled() to actually draw anything on the screen

Changes:
 -- store tool in a local std::string
 -- add missing calls to ensure result is drawn on the screen

-- 
Your team Compiz Maintainers is subscribed to branch compiz:master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 3953 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20200514/5853838a/attachment.diff>