Merge lp://qastaging/~samuel-thibault/compiz/shortcuts into lp://qastaging/compiz/0.9.13
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~samuel-thibault/compiz/shortcuts |
Merge into: | lp://qastaging/compiz/0.9.13 |
Diff against target: |
830 lines (+434/-47) 13 files modified
include/core/action.h (+8/-0) include/core/screen.h (+4/-0) include/core/window.h (+1/-0) plugins/colorfilter/src/colorfilter.cpp (+6/-0) plugins/ezoom/src/ezoom.cpp (+6/-0) plugins/neg/src/neg.cpp (+5/-0) plugins/showmouse/src/showmouse.cpp (+6/-0) src/action.cpp (+37/-21) src/event.cpp (+56/-11) src/privateaction.h (+2/-0) src/privatescreen.h (+14/-0) src/screen.cpp (+279/-7) src/window.cpp (+10/-8) |
To merge this branch: | bzr merge lp://qastaging/~samuel-thibault/compiz/shortcuts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Pending | ||
Review via email:
|
Description of the change
This is a rework of the previous work of Colomban Wendling (https:/
This depends on my branch https:/
Unmerged revisions
- 4144. By Samuel thibault
-
fix memleak
- 4143. By Samuel thibault
-
Fix ButtonRelease/
XI_ButtonReleas e KeyRelease/ XI_KeyRelease confusion - 4142. By Samuel thibault
-
Enable grab ignore on colorfilter plugin too
- 4141. By Samuel thibault
-
xi2: save/restore masks instead of disabling/enabling compiz mask
Unity also uses xi2, so we need to restore its mask, and not the mask that
Compiz uses. This changeset completely replaces xi2SelectNoInput with
xi2DisableInput, which returns the mask which was active, so that xi2EnableInput
can reenable that same mask. - 4140. By Samuel thibault
-
Factorize XI2 SelectEvents code into privatescreen
- 4139. By Samuel thibault
-
screen: factorize XI2 to core event translation
- 4138. By Samuel thibault
-
screen: Fix uninitialized variable
- 4137. By Samuel thibault
-
Fix getting events for our own grabs
If a grab was taken by one of our own plugins, we have to ignore the X grab.
- 4136. By Samuel thibault
-
Allow plugins to ignore keyboard grabs
by using XInput2 events when available, converting them into core events before handing them to plugins.
Based on the work of Colomban Wendling
Thanks for your work, it's really appreciated and something I really had in mind since long time...
However, a part few cleanups (and a bit more of C++11 features usage), we've to think as this will deal with Unity, since there we're using XI2 already for some input monitor operations (mostly for edge events and for monitoring the mouse position when menus are opened, plus few other things), and the fact is that we disable such events when we don't need them.
Now, in theory we could move all that to compiz, introducing new actions types, but the problem now is that we can't really deal with all this work now that we're focused in GNOME
Another possibility is just to make unity to save the state on load with XIGetSelectedEvents and resume that state when we disable it, but in general I'd prefer the events not to be selected unless there's anything else that need them.
Another possibility is just make unity to keep them always enabled, and never toggle them.
In any case, it would be cool if you could test it with your changes, and in case propose a fix for it too. As without that change we can't land compiz in ubuntu (and thus upstream) easily as it could be prone to regressions.