Merge lp://qastaging/~mterry/mir/no-nested-display-config into lp://qastaging/mir/0.1
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~mterry/mir/no-nested-display-config |
Merge into: | lp://qastaging/mir/0.1 |
Diff against target: |
58 lines (+14/-3) 2 files modified
src/server/graphics/nested/nested_display.cpp (+12/-3) src/server/graphics/nested/nested_display.h (+2/-0) |
To merge this branch: | bzr merge lp://qastaging/~mterry/mir/no-nested-display-config |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir development team | Pending | ||
Review via email:
|
Commit message
Bandaid for greeter turning screen on.
Description of the change
(This is just a port of https:/
Workaround for Greeter turning the screen on.
This is just a workaround for the issue with the split greeter. While display is off another greeter is spawned to be shown as soon as display is turned on again. A greeter is a nested mir server. On initialization nested servers send the initial display configuration to the hosting server. Obviously that configuration contains power_mode == MirPowerMode:
u-s-c sets the focus onto the recently started greeter as soon as the session has a surface with buffers in. On that focus change the the stored display configuration (given they have one) is applied. Which turns the display on.
This change disables sending the first/initial nested display configuration.
We clearly need a better solution for that issue so we can remove that workaround as soon as we have one.
Unmerged revisions
- 1183. By Michael Terry
-
Port Andreas Pokorny's patch from devel to trunk