Merge lp://qastaging/~vanvugt/mir/retain-set-type into lp://qastaging/mir
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~vanvugt/mir/retain-set-type |
| Merge into: | lp://qastaging/mir |
| Diff against target: |
163 lines (+35/-24) 4 files modified
include/client/mir_toolkit/mir_surface.h (+6/-2) src/utils/ping.c (+4/-4) tests/acceptance-tests/test_client_library.cpp (+7/-4) tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp (+18/-14) |
| To merge this branch: | bzr merge lp://qastaging/~vanvugt/mir/retain-set-type |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
Undeprecate mir_surface_
function that can replace it.
For windowed XMir we're going to need it. In X, windows don't have types
for some indefinite period after their creation. Optionally at some point,
some toolkits might tell us the type via _NET_WM_WINDOW_TYPE but
pure/old X apps won't bother to declare a type at all.
So to support the case where an X window does decide to give itself a type
later (usually while it's unmapped/hidden) we need mir_surface_
Or something else that doesn't exist yet.
Description of the change
This is just a revert of r2245.
Unmerged revisions
- 2324. By Daniel van Vugt
-
test_client_
library. cpp: Fix weird type/state mixup (which apparently was
a preexisting problem). - 2323. By Daniel van Vugt
-
Undeprecate mir_surface_
set_type until such time as we have some other
function that can replace it.For windowed XMir we're going to need it. In X, windows don't have types
for some indefinite period after their creation. Optionally at some point,
some toolkits might tell us the type via _NET_WM_WINDOW_TYPE but
pure/old X apps won't bother to declare a type at all.So to support the case where an X window does decide to give itself a type
later (usually while it's unmapped/hidden) we need mir_surface_set_type.
Or something else that doesn't exist yet.
