Merge lp://qastaging/~vanvugt/compiz-core/fix-alt-bugs-2 into lp://qastaging/compiz-core

Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: 3047
Merged at revision: 3048
Proposed branch: lp://qastaging/~vanvugt/compiz-core/fix-alt-bugs-2
Merge into: lp://qastaging/compiz-core
Diff against target: 68 lines (+16/-18)
2 files modified
src/event.cpp (+11/-17)
src/screen.cpp (+5/-1)
To merge this branch: bzr merge lp://qastaging/~vanvugt/compiz-core/fix-alt-bugs-2
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Review via email: mp+96521@code.qastaging.launchpad.net

Description of the change

Improved the fix for LP: #943194 so that it now works with GTK-2 menus too.
The first attempt only worked with GTK-3 it seems.

This also required that the fix for LP: #806255 be redesigned to avoid
XGrabKeyboard completely. Because that was part of what broke GTK-2 menus.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Hey Daniel, thanks for working on that! Are you sure that the fix for LP: #806255 was what made gtk2 menus regressed? (we don't have this commit in the proposed snapshot and it was broken beforehand).

Anyway, I'm trying backporting both commits then :)

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Yes, I definitely had to remove the XGrabKeyboard (fix for LP: #806255). I also had to change the XGrabKey mode to GrabModeSync to ensure the Alt keypress event was replayed correctly to the underlying app by XAllowEvents in alwaysHandleEvent.

I hope ubuntu downstream gets a new snapshot when 0.9.7.2 is done. Or even before then...

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

We are almost shipping trunk right now (rev 3039 minus rev 3036)
There is the lim merge we need to discuss as it will require a FFe that we denied (or reverted, or maybe conditionnally built, or having garantees the code isn't executed if the unity side isn't there), but that's a side talk. We tried to qualified rev 3035 at some point (and it's already frozen for 2 weeks) but we saw this alt regression which didn't let us ship it…

Revision history for this message
Alan Griffiths (alan-griffiths) :
review: Approve
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Tested and everything works fine (xul/qt apps)! Really nice work Daniel :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches