Merge lp:~vanvugt/mir/async-is-not-sync into lp:mir
- async-is-not-sync
- Merge into development-branch
Proposed by
Daniel van Vugt
| Status: | Rejected |
|---|---|
| Rejected by: | Cemil Azizoglu |
| Proposed branch: | lp:~vanvugt/mir/async-is-not-sync |
| Merge into: | lp:mir |
| Prerequisite: | lp:~mir-team/mir/rename-mir_window_create |
| Diff against target: |
1348 lines (+132/-132) 52 files modified
benchmarks/frame-uniformity/touch_measuring_client.cpp (+1/-1) examples/basic.c (+1/-1) examples/client_helpers.cpp (+1/-1) examples/eglapp.c (+1/-1) examples/fingerpaint.c (+1/-1) examples/flicker.c (+1/-1) examples/multiwin.c (+3/-3) examples/progressbar.c (+1/-1) examples/release_at_exit.c (+1/-1) examples/tooltip.c (+1/-1) include/client/mir_toolkit/mir_screencast.h (+1/-1) include/client/mir_toolkit/mir_surface.h (+20/-20) playground/egldiamond_render_surface.c (+1/-1) playground/mir_demo_client_chain_jumping_buffers.c (+1/-1) playground/mir_demo_client_prerendered_frames.c (+1/-1) playground/render_surface.cpp (+1/-1) src/client/mir_surface_api.cpp (+5/-5) src/client/symbols.map (+1/-1) src/platforms/android/utils/test_android_hardware_sanity.cpp (+2/-2) src/server/graphics/nested/mir_client_host_connection.cpp (+1/-1) tests/acceptance-tests/test_buffer_stream_arrangement.cpp (+2/-2) tests/acceptance-tests/test_client_cookie.cpp (+1/-1) tests/acceptance-tests/test_client_cursor_api.cpp (+1/-1) tests/acceptance-tests/test_client_focus_notification.cpp (+1/-1) tests/acceptance-tests/test_client_input.cpp (+1/-1) tests/acceptance-tests/test_client_library.cpp (+26/-26) tests/acceptance-tests/test_client_library_errors.cpp (+5/-5) tests/acceptance-tests/test_client_logging.cpp (+1/-1) tests/acceptance-tests/test_client_surface_events.cpp (+2/-2) tests/acceptance-tests/test_client_surface_visibility.cpp (+1/-1) tests/acceptance-tests/test_client_surfaces.cpp (+11/-11) tests/acceptance-tests/test_confined_pointer.cpp (+1/-1) tests/acceptance-tests/test_custom_window_management.cpp (+8/-8) tests/acceptance-tests/test_display_configuration.cpp (+1/-1) tests/acceptance-tests/test_nested_mir.cpp (+1/-1) tests/acceptance-tests/test_new_display_configuration.cpp (+1/-1) tests/acceptance-tests/test_presentation_chain.cpp (+3/-3) tests/acceptance-tests/test_render_surface.cpp (+3/-3) tests/acceptance-tests/test_server_disconnect.cpp (+1/-1) tests/acceptance-tests/test_surface_morphing.cpp (+1/-1) tests/acceptance-tests/test_surface_placement.cpp (+2/-2) tests/acceptance-tests/test_system_compositor_window_manager.cpp (+1/-1) tests/integration-tests/client/test_mirsurface.cpp (+1/-1) tests/integration-tests/test_error_reporting.cpp (+1/-1) tests/integration-tests/test_surfaceloop.cpp (+2/-2) tests/mir_test_framework/any_surface.cpp (+1/-1) tests/mir_test_framework/connected_client_with_a_surface.cpp (+1/-1) tests/mir_test_framework/visible_surface.cpp (+1/-1) tests/performance-tests/test_client_startup.cpp (+1/-1) tests/privileged-tests/test_input_events.cpp (+1/-1) tests/test-clients/impolite-shutdown/scroll.cpp (+1/-1) tests/test-clients/mir-stress/src/client.cpp (+1/-1) |
| To merge this branch: | bzr merge lp:~vanvugt/mir/async-is-not-sync |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cemil Azizoglu (community) | Disapprove | ||
| Andreas Pokorny (community) | Disapprove | ||
| Mir CI Bot | continuous-integration | Approve | |
| Alan Griffiths | Needs Information | ||
| Alberto Aguirre (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Proof of concept to simplify spelling of the more commonly used synchronous functions:
s/mir_
s/mir_
Description of the change
Request for comments. If people like this we can do it for other functions too.
I think it's important we discuss this now. If the main priority for 1.0 is to get the client API right...
Yes, I've modified the 0.26 ABI. If it lands then we can backport to lp:mir/0.26
To post a comment you must log in.
Revision history for this message
| Mir CI Bot (mir-ci-bot) wrote : | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Cemil Azizoglu (cemil-azizoglu) wrote : | # |
We don't really use async anywhere else. I prefer not to do this. If people like it I don't mind abstaining.
review:
Disapprove
Revision history for this message
| Daniel van Vugt (vanvugt) wrote : | # |
I know we don't use it, but we should :) Wait to hear more thoughts...
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
Apart from "too late now" there are two arguments:
/1/ the "sync" version is more common and should have the shorter name
/2/ the "sync" version is more specialized and should have the longer name
The former is certainly true of our test and example code. (I'm not sure of a good codebase to assess it in the real world.)
The latter is also true. It also calls out that call might take some significant time to return.
I'm marginally in favour of what we have now.
review:
Disapprove
Revision history for this message
| Alberto Aguirre (albaguirre) wrote : | # |
Just going by our current main toolkits, gdk and qtubuntu, both of those use _sync versions...
So approve based on current toolkit usage.
review:
Approve
Revision history for this message
| Alberto Aguirre (albaguirre) wrote : | # |
SDL also seems to prefer the *_sync versions.
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
*Needs Discussion*
Hmm. If no downstream uses it should we simply remove the async option?
review:
Needs Information
Revision history for this message
| Alberto Aguirre (albaguirre) wrote : | # |
> *Needs Discussion*
>
> Hmm. If no downstream uses it should we simply remove the async option?
Maybe?
We can always introduce async methods later, after we have a good manual dispatch solution to address the callback safety concerns from a user's perspective.
Revision history for this message
| Alberto Aguirre (albaguirre) wrote : | # |
To add more things that use mir:
Kodi also uses *_sync functions...
content-hub uses apis in a synchronous fashion:
mir_wait_
- 3937. By Daniel van Vugt
-
Merge latest trunk
- 3938. By Daniel van Vugt
-
Merge latest trunk and fix lots of conflicts
- 3939. By Daniel van Vugt
-
Remove dead code
Revision history for this message
| Daniel van Vugt (vanvugt) wrote : | # |
The manual dispatch problem is actually pretty simple. I solved it back in 2014 but decided not to propose the solution when I realized I had solved it using entirely public APIs (so it did not need to live in libmirclient at all)...
https:/
Revision history for this message
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3938
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Bug 1646558, plus WTF:
04:30:01 15: [ FAILED ] 3 tests, listed below:
04:30:01 15: [ FAILED ] FocusSelection.
04:30:01 15: [ FAILED ] Process.
04:30:01 15: [ FAILED ] Process.
- 3940. By Daniel van Vugt
-
Try again
Revision history for this message
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
bug 1657639
Revision history for this message
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3939
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3940
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Bug 1616312
- 3941. By Daniel van Vugt
-
Merge latest trunk
Revision history for this message
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3941
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
| Andreas Pokorny (andreas-pokorny) wrote : | # |
I think we should incentivise clients to use the async version.. and make clear which calls might include round-trips to the server. So I have a weak preference of the current state - async being the shorter version and "_sync" kind of standing out.
I think it would be more helpful to hand out an fd to make the toolkits or clients gain control over the dispatch.
review:
Disapprove
Revision history for this message
| Cemil Azizoglu (cemil-azizoglu) wrote : | # |
This was discussed in the standup. I'll summarize the opinions against it to go with Alberto's favorable opinion above.
What you are proposing is to change not just what this MP changes but all the async/sync functions. This is a huge change (evidenced by the size of this branch just to change one of them). We do not have the time to do it in Mir 0.26 timeframe for sure - it's already late. Besides, toolkits have already written their code, and renaming to make their lives easier will make it harder for them because now they'd have to change their code to adapt to all the new names.
Another argument against this is that calling out 'sync' in the function name provides a visual clue for the user that this function may take longer than other functions that do not have 'sync' suffix (i.e. do not need to contact to server).
Yet another argument is that it's a lot of busy work for not enough gain (even if we didn't take the time crunch that we're in into account).
We can have a wider team discussion in an upcoming sprint to see if everyone can be convinced that this is a good idea.
review:
Disapprove
Revision history for this message
| Daniel van Vugt (vanvugt) wrote : | # |
That makes perfect, but partial sense.
The sole justification for looking at doing a 1.0 release soon was to get the API right. And this certainly comes under that heading. Although realistically I don't think we're going to get everything right in 1.0.
Your justification for rejecting this branch is actually a strong argument against the wide scale API breaks we've been pushing through at high speed recently. Indeed we've broken too much too quickly. If we acknowledge and accept that then I think this branch should be a part of it, and helps us to get the API closer to right.
Unmerged revisions
- 3941. By Daniel van Vugt
-
Merge latest trunk
- 3940. By Daniel van Vugt
-
Try again
- 3939. By Daniel van Vugt
-
Remove dead code
- 3938. By Daniel van Vugt
-
Merge latest trunk and fix lots of conflicts
- 3937. By Daniel van Vugt
-
Merge latest trunk
- 3936. By Daniel van Vugt
-
First attempt
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'benchmarks/frame-uniformity/touch_measuring_client.cpp' | |||
| 2 | --- benchmarks/frame-uniformity/touch_measuring_client.cpp 2017-01-18 02:29:37 +0000 | |||
| 3 | +++ benchmarks/frame-uniformity/touch_measuring_client.cpp 2017-01-19 08:14:45 +0000 | |||
| 4 | @@ -40,7 +40,7 @@ | |||
| 5 | 40 | mir_window_spec_set_name(spec, "frame-uniformity-test"); | 40 | mir_window_spec_set_name(spec, "frame-uniformity-test"); |
| 6 | 41 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); | 41 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); |
| 7 | 42 | 42 | ||
| 9 | 43 | auto window = mir_create_window_sync(spec); | 43 | auto window = mir_create_window(spec); |
| 10 | 44 | mir_window_spec_release(spec); | 44 | mir_window_spec_release(spec); |
| 11 | 45 | 45 | ||
| 12 | 46 | if (!mir_window_is_valid(window)) | 46 | if (!mir_window_is_valid(window)) |
| 13 | 47 | 47 | ||
| 14 | === modified file 'examples/basic.c' | |||
| 15 | --- examples/basic.c 2017-01-18 19:57:47 +0000 | |||
| 16 | +++ examples/basic.c 2017-01-19 08:14:45 +0000 | |||
| 17 | @@ -117,7 +117,7 @@ | |||
| 18 | 117 | 117 | ||
| 19 | 118 | ///\internal [surface_create_tag] | 118 | ///\internal [surface_create_tag] |
| 20 | 119 | // ...we create a surface using that format. | 119 | // ...we create a surface using that format. |
| 22 | 120 | mcd.window = mir_create_window_sync(spec); | 120 | mcd.window = mir_create_window(spec); |
| 23 | 121 | puts("Window created"); | 121 | puts("Window created"); |
| 24 | 122 | ///\internal [surface_create_tag] | 122 | ///\internal [surface_create_tag] |
| 25 | 123 | 123 | ||
| 26 | 124 | 124 | ||
| 27 | === modified file 'examples/client_helpers.cpp' | |||
| 28 | --- examples/client_helpers.cpp 2017-01-18 02:29:37 +0000 | |||
| 29 | +++ examples/client_helpers.cpp 2017-01-19 08:14:45 +0000 | |||
| 30 | @@ -155,7 +155,7 @@ | |||
| 31 | 155 | mir_window_spec_set_pixel_format(spec.get(), selected_format); | 155 | mir_window_spec_set_pixel_format(spec.get(), selected_format); |
| 32 | 156 | mir_window_spec_set_name(spec.get(), __PRETTY_FUNCTION__); | 156 | mir_window_spec_set_name(spec.get(), __PRETTY_FUNCTION__); |
| 33 | 157 | mir_window_spec_set_buffer_usage(spec.get(), hardware ? mir_buffer_usage_hardware : mir_buffer_usage_software); | 157 | mir_window_spec_set_buffer_usage(spec.get(), hardware ? mir_buffer_usage_hardware : mir_buffer_usage_software); |
| 35 | 158 | auto window = mir_create_window_sync(spec.get()); | 158 | auto window = mir_create_window(spec.get()); |
| 36 | 159 | return window; | 159 | return window; |
| 37 | 160 | } | 160 | } |
| 38 | 161 | 161 | ||
| 39 | 162 | 162 | ||
| 40 | === modified file 'examples/eglapp.c' | |||
| 41 | --- examples/eglapp.c 2017-01-18 02:29:37 +0000 | |||
| 42 | +++ examples/eglapp.c 2017-01-19 08:14:45 +0000 | |||
| 43 | @@ -487,7 +487,7 @@ | |||
| 44 | 487 | if (output_id != mir_display_output_id_invalid) | 487 | if (output_id != mir_display_output_id_invalid) |
| 45 | 488 | mir_window_spec_set_fullscreen_on_output(spec, output_id); | 488 | mir_window_spec_set_fullscreen_on_output(spec, output_id); |
| 46 | 489 | 489 | ||
| 48 | 490 | window = mir_create_window_sync(spec); | 490 | window = mir_create_window(spec); |
| 49 | 491 | mir_window_spec_release(spec); | 491 | mir_window_spec_release(spec); |
| 50 | 492 | 492 | ||
| 51 | 493 | CHECK(mir_window_is_valid(window), "Can't create a window"); | 493 | CHECK(mir_window_is_valid(window), "Can't create a window"); |
| 52 | 494 | 494 | ||
| 53 | === modified file 'examples/fingerpaint.c' | |||
| 54 | --- examples/fingerpaint.c 2017-01-18 13:59:18 +0000 | |||
| 55 | +++ examples/fingerpaint.c 2017-01-19 08:14:45 +0000 | |||
| 56 | @@ -456,7 +456,7 @@ | |||
| 57 | 456 | mir_window_spec_set_name(spec, "Mir Fingerpaint"); | 456 | mir_window_spec_set_name(spec, "Mir Fingerpaint"); |
| 58 | 457 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); | 457 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); |
| 59 | 458 | 458 | ||
| 61 | 459 | window = mir_create_window_sync(spec); | 459 | window = mir_create_window(spec); |
| 62 | 460 | mir_window_spec_release(spec); | 460 | mir_window_spec_release(spec); |
| 63 | 461 | 461 | ||
| 64 | 462 | if (window != NULL) | 462 | if (window != NULL) |
| 65 | 463 | 463 | ||
| 66 | === modified file 'examples/flicker.c' | |||
| 67 | --- examples/flicker.c 2017-01-18 02:29:37 +0000 | |||
| 68 | +++ examples/flicker.c 2017-01-19 08:14:45 +0000 | |||
| 69 | @@ -159,7 +159,7 @@ | |||
| 70 | 159 | mir_window_spec_set_name(spec, __FILE__); | 159 | mir_window_spec_set_name(spec, __FILE__); |
| 71 | 160 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); | 160 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); |
| 72 | 161 | 161 | ||
| 74 | 162 | window = mir_create_window_sync(spec); | 162 | window = mir_create_window(spec); |
| 75 | 163 | mir_window_spec_release(spec); | 163 | mir_window_spec_release(spec); |
| 76 | 164 | 164 | ||
| 77 | 165 | assert(window != NULL); | 165 | assert(window != NULL); |
| 78 | 166 | 166 | ||
| 79 | === modified file 'examples/multiwin.c' | |||
| 80 | --- examples/multiwin.c 2017-01-18 02:29:37 +0000 | |||
| 81 | +++ examples/multiwin.c 2017-01-19 08:14:45 +0000 | |||
| 82 | @@ -255,7 +255,7 @@ | |||
| 83 | 255 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); | 255 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); |
| 84 | 256 | mir_window_spec_set_name(spec, "red"); | 256 | mir_window_spec_set_name(spec, "red"); |
| 85 | 257 | 257 | ||
| 87 | 258 | win[0].window = mir_create_window_sync(spec); | 258 | win[0].window = mir_create_window(spec); |
| 88 | 259 | win[0].fill.r = 0xff; | 259 | win[0].fill.r = 0xff; |
| 89 | 260 | win[0].fill.g = 0x00; | 260 | win[0].fill.g = 0x00; |
| 90 | 261 | win[0].fill.b = 0x00; | 261 | win[0].fill.b = 0x00; |
| 91 | @@ -265,7 +265,7 @@ | |||
| 92 | 265 | mir_window_spec_set_name(spec, "green"); | 265 | mir_window_spec_set_name(spec, "green"); |
| 93 | 266 | mir_window_spec_set_width(spec, 300); | 266 | mir_window_spec_set_width(spec, 300); |
| 94 | 267 | mir_window_spec_set_height(spec, 150); | 267 | mir_window_spec_set_height(spec, 150); |
| 96 | 268 | win[1].window = mir_create_window_sync(spec); | 268 | win[1].window = mir_create_window(spec); |
| 97 | 269 | win[1].fill.r = 0x00; | 269 | win[1].fill.r = 0x00; |
| 98 | 270 | win[1].fill.g = 0xff; | 270 | win[1].fill.g = 0xff; |
| 99 | 271 | win[1].fill.b = 0x00; | 271 | win[1].fill.b = 0x00; |
| 100 | @@ -275,7 +275,7 @@ | |||
| 101 | 275 | mir_window_spec_set_name(spec, "blue"); | 275 | mir_window_spec_set_name(spec, "blue"); |
| 102 | 276 | mir_window_spec_set_width(spec, 150); | 276 | mir_window_spec_set_width(spec, 150); |
| 103 | 277 | mir_window_spec_set_height(spec, 300); | 277 | mir_window_spec_set_height(spec, 300); |
| 105 | 278 | win[2].window = mir_create_window_sync(spec); | 278 | win[2].window = mir_create_window(spec); |
| 106 | 279 | win[2].fill.r = 0x00; | 279 | win[2].fill.r = 0x00; |
| 107 | 280 | win[2].fill.g = 0x00; | 280 | win[2].fill.g = 0x00; |
| 108 | 281 | win[2].fill.b = 0xff; | 281 | win[2].fill.b = 0xff; |
| 109 | 282 | 282 | ||
| 110 | === modified file 'examples/progressbar.c' | |||
| 111 | --- examples/progressbar.c 2017-01-18 02:29:37 +0000 | |||
| 112 | +++ examples/progressbar.c 2017-01-19 08:14:45 +0000 | |||
| 113 | @@ -267,7 +267,7 @@ | |||
| 114 | 267 | 267 | ||
| 115 | 268 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); | 268 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); |
| 116 | 269 | 269 | ||
| 118 | 270 | window = mir_create_window_sync(spec); | 270 | window = mir_create_window(spec); |
| 119 | 271 | mir_window_spec_release(spec); | 271 | mir_window_spec_release(spec); |
| 120 | 272 | 272 | ||
| 121 | 273 | if (window != NULL) | 273 | if (window != NULL) |
| 122 | 274 | 274 | ||
| 123 | === modified file 'examples/release_at_exit.c' | |||
| 124 | --- examples/release_at_exit.c 2017-01-18 02:29:37 +0000 | |||
| 125 | +++ examples/release_at_exit.c 2017-01-19 08:14:45 +0000 | |||
| 126 | @@ -55,7 +55,7 @@ | |||
| 127 | 55 | MirWindowSpec *spec = mir_create_normal_window_spec(connection, 640, 480); | 55 | MirWindowSpec *spec = mir_create_normal_window_spec(connection, 640, 480); |
| 128 | 56 | mir_window_spec_set_pixel_format(spec, pixel_format); | 56 | mir_window_spec_set_pixel_format(spec, pixel_format); |
| 129 | 57 | 57 | ||
| 131 | 58 | window = mir_create_window_sync(spec); | 58 | window = mir_create_window(spec); |
| 132 | 59 | mir_window_spec_release(spec); | 59 | mir_window_spec_release(spec); |
| 133 | 60 | 60 | ||
| 134 | 61 | mir_window_release_sync(window); | 61 | mir_window_release_sync(window); |
| 135 | 62 | 62 | ||
| 136 | === modified file 'examples/tooltip.c' | |||
| 137 | --- examples/tooltip.c 2017-01-18 02:29:37 +0000 | |||
| 138 | +++ examples/tooltip.c 2017-01-19 08:14:45 +0000 | |||
| 139 | @@ -113,7 +113,7 @@ | |||
| 140 | 113 | mir_window_spec_set_min_height(spec, height); | 113 | mir_window_spec_set_min_height(spec, height); |
| 141 | 114 | mir_window_spec_set_max_height(spec, height); | 114 | mir_window_spec_set_max_height(spec, height); |
| 142 | 115 | 115 | ||
| 144 | 116 | MirWindow* tooltip = mir_create_window_sync(spec); | 116 | MirWindow* tooltip = mir_create_window(spec); |
| 145 | 117 | mir_window_spec_release(spec); | 117 | mir_window_spec_release(spec); |
| 146 | 118 | 118 | ||
| 147 | 119 | MirBufferStream* const bs = mir_window_get_buffer_stream(tooltip); | 119 | MirBufferStream* const bs = mir_window_get_buffer_stream(tooltip); |
| 148 | 120 | 120 | ||
| 149 | === modified file 'include/client/mir_toolkit/mir_screencast.h' | |||
| 150 | --- include/client/mir_toolkit/mir_screencast.h 2017-01-18 02:29:37 +0000 | |||
| 151 | +++ include/client/mir_toolkit/mir_screencast.h 2017-01-19 08:14:45 +0000 | |||
| 152 | @@ -35,7 +35,7 @@ | |||
| 153 | 35 | * | 35 | * |
| 154 | 36 | * \param [in] connection a valid mir connection | 36 | * \param [in] connection a valid mir connection |
| 155 | 37 | * \return A handle that can ultimately be passed to | 37 | * \return A handle that can ultimately be passed to |
| 157 | 38 | * mir_create_window() or mir_window_apply_spec() | 38 | * mir_create_window_async() or mir_window_apply_spec() |
| 158 | 39 | */ | 39 | */ |
| 159 | 40 | MirScreencastSpec* mir_create_screencast_spec(MirConnection* connection); | 40 | MirScreencastSpec* mir_create_screencast_spec(MirConnection* connection); |
| 160 | 41 | 41 | ||
| 161 | 42 | 42 | ||
| 162 | === modified file 'include/client/mir_toolkit/mir_surface.h' | |||
| 163 | --- include/client/mir_toolkit/mir_surface.h 2017-01-18 04:43:15 +0000 | |||
| 164 | +++ include/client/mir_toolkit/mir_surface.h 2017-01-19 08:14:45 +0000 | |||
| 165 | @@ -43,7 +43,7 @@ | |||
| 166 | 43 | * \param [in] width Requested width. The server is not guaranteed to return a window of this width. | 43 | * \param [in] width Requested width. The server is not guaranteed to return a window of this width. |
| 167 | 44 | * \param [in] height Requested height. The server is not guaranteed to return a window of this height. | 44 | * \param [in] height Requested height. The server is not guaranteed to return a window of this height. |
| 168 | 45 | * | 45 | * |
| 170 | 46 | * \return A handle that can be passed to mir_create_window() to complete construction. | 46 | * \return A handle that can be passed to mir_create_window_async() to complete construction. |
| 171 | 47 | */ | 47 | */ |
| 172 | 48 | MirWindowSpec* mir_create_normal_window_spec(MirConnection* connection, | 48 | MirWindowSpec* mir_create_normal_window_spec(MirConnection* connection, |
| 173 | 49 | int width, int height); | 49 | int width, int height); |
| 174 | @@ -69,7 +69,7 @@ | |||
| 175 | 69 | * location. | 69 | * location. |
| 176 | 70 | * \param [in] edge The preferred edge direction to attach to. Use | 70 | * \param [in] edge The preferred edge direction to attach to. Use |
| 177 | 71 | * mir_edge_attachment_any for no preference. | 71 | * mir_edge_attachment_any for no preference. |
| 179 | 72 | * \return A handle that can be passed to mir_create_window() | 72 | * \return A handle that can be passed to mir_create_window_async() |
| 180 | 73 | * to complete construction. | 73 | * to complete construction. |
| 181 | 74 | */ | 74 | */ |
| 182 | 75 | MirWindowSpec* | 75 | MirWindowSpec* |
| 183 | @@ -100,7 +100,7 @@ | |||
| 184 | 100 | * location. | 100 | * location. |
| 185 | 101 | * \param [in] edge The preferred edge direction to attach to. Use | 101 | * \param [in] edge The preferred edge direction to attach to. Use |
| 186 | 102 | * mir_edge_attachment_any for no preference. | 102 | * mir_edge_attachment_any for no preference. |
| 188 | 103 | * \return A handle that can be passed to mir_create_window() | 103 | * \return A handle that can be passed to mir_create_window_async() |
| 189 | 104 | * to complete construction. | 104 | * to complete construction. |
| 190 | 105 | */ | 105 | */ |
| 191 | 106 | MirWindowSpec* | 106 | MirWindowSpec* |
| 192 | @@ -163,7 +163,7 @@ | |||
| 193 | 163 | * \param [in] connection Connection the window will be created on | 163 | * \param [in] connection Connection the window will be created on |
| 194 | 164 | * \param [in] width Requested width. The server is not guaranteed to return a window of this width. | 164 | * \param [in] width Requested width. The server is not guaranteed to return a window of this width. |
| 195 | 165 | * \param [in] height Requested height. The server is not guaranteed to return a window of this height. | 165 | * \param [in] height Requested height. The server is not guaranteed to return a window of this height. |
| 197 | 166 | * \return A handle that can be passed to mir_create_window() to complete construction. | 166 | * \return A handle that can be passed to mir_create_window_async() to complete construction. |
| 198 | 167 | */ | 167 | */ |
| 199 | 168 | MirWindowSpec* | 168 | MirWindowSpec* |
| 200 | 169 | mir_create_input_method_window_spec(MirConnection* connection, | 169 | mir_create_input_method_window_spec(MirConnection* connection, |
| 201 | @@ -171,15 +171,15 @@ | |||
| 202 | 171 | 171 | ||
| 203 | 172 | /** | 172 | /** |
| 204 | 173 | * Create a window specification. | 173 | * Create a window specification. |
| 206 | 174 | * This can be used with mir_create_window() to create a window or with | 174 | * This can be used with mir_create_window_async() to create a window or with |
| 207 | 175 | * mir_window_apply_spec() to change an existing window. | 175 | * mir_window_apply_spec() to change an existing window. |
| 209 | 176 | * \remark For use with mir_create_window() at least the type, width, height, | 176 | * \remark For use with mir_create_window_async() at least the type, width, height, |
| 210 | 177 | * format and buffer_usage must be set. (And for types requiring a parent that | 177 | * format and buffer_usage must be set. (And for types requiring a parent that |
| 211 | 178 | * too must be set.) | 178 | * too must be set.) |
| 212 | 179 | * | 179 | * |
| 213 | 180 | * \param [in] connection a valid mir connection | 180 | * \param [in] connection a valid mir connection |
| 214 | 181 | * \return A handle that can ultimately be passed to | 181 | * \return A handle that can ultimately be passed to |
| 216 | 182 | * mir_create_window() or mir_window_apply_spec() | 182 | * mir_create_window_async() or mir_window_apply_spec() |
| 217 | 183 | */ | 183 | */ |
| 218 | 184 | MirWindowSpec* mir_create_window_spec(MirConnection* connection); | 184 | MirWindowSpec* mir_create_window_spec(MirConnection* connection); |
| 219 | 185 | 185 | ||
| 220 | @@ -193,7 +193,7 @@ | |||
| 221 | 193 | 193 | ||
| 222 | 194 | /** | 194 | /** |
| 223 | 195 | * Update a window specification with a window type. | 195 | * Update a window specification with a window type. |
| 225 | 196 | * This can be used with mir_create_window() to create a window or with | 196 | * This can be used with mir_create_window_async() to create a window or with |
| 226 | 197 | * mir_window_apply_spec() to change an existing window. | 197 | * mir_window_apply_spec() to change an existing window. |
| 227 | 198 | * \remark For use with mir_window_apply_spec() the shell need not support | 198 | * \remark For use with mir_window_apply_spec() the shell need not support |
| 228 | 199 | * arbitrary changes of type and some target types may require the setting of | 199 | * arbitrary changes of type and some target types may require the setting of |
| 229 | @@ -345,7 +345,7 @@ | |||
| 230 | 345 | * \param [in] spec Specification to mutate | 345 | * \param [in] spec Specification to mutate |
| 231 | 346 | * \param [in] output_id ID of output to place window on. From MirDisplayOutput.output_id | 346 | * \param [in] output_id ID of output to place window on. From MirDisplayOutput.output_id |
| 232 | 347 | * | 347 | * |
| 234 | 348 | * \note If this call returns %true then a valid window returned from mir_create_window() is | 348 | * \note If this call returns %true then a valid window returned from mir_create_window_async() is |
| 235 | 349 | * guaranteed to be fullscreen on the specified output. An invalid window is returned | 349 | * guaranteed to be fullscreen on the specified output. An invalid window is returned |
| 236 | 350 | * if the server unable to, or policy prevents it from, honouring this request. | 350 | * if the server unable to, or policy prevents it from, honouring this request. |
| 237 | 351 | */ | 351 | */ |
| 238 | @@ -357,7 +357,7 @@ | |||
| 239 | 357 | * \param [in] mode Requested preferred orientation | 357 | * \param [in] mode Requested preferred orientation |
| 240 | 358 | * | 358 | * |
| 241 | 359 | * \note If the server is unable to create a window with the preferred orientation at | 359 | * \note If the server is unable to create a window with the preferred orientation at |
| 243 | 360 | * the point mir_create_window() is called it will instead return an invalid window. | 360 | * the point mir_create_window_async() is called it will instead return an invalid window. |
| 244 | 361 | */ | 361 | */ |
| 245 | 362 | void mir_window_spec_set_preferred_orientation(MirWindowSpec* spec, MirOrientationMode mode); | 362 | void mir_window_spec_set_preferred_orientation(MirWindowSpec* spec, MirOrientationMode mode); |
| 246 | 363 | 363 | ||
| 247 | @@ -375,9 +375,9 @@ | |||
| 248 | 375 | * mir_edge_attachment_any for no preference. | 375 | * mir_edge_attachment_any for no preference. |
| 249 | 376 | * \return False if the operation is invalid for this window type. | 376 | * \return False if the operation is invalid for this window type. |
| 250 | 377 | * | 377 | * |
| 252 | 378 | * \note If the parent window becomes invalid before mir_create_window() is processed, | 378 | * \note If the parent window becomes invalid before mir_create_window_async() is processed, |
| 253 | 379 | * it will return an invalid window. If the parent window is valid at the time | 379 | * it will return an invalid window. If the parent window is valid at the time |
| 255 | 380 | * mir_create_window() is called but is later closed, this window will also receive | 380 | * mir_create_window_async() is called but is later closed, this window will also receive |
| 256 | 381 | * a close event. | 381 | * a close event. |
| 257 | 382 | */ | 382 | */ |
| 258 | 383 | bool mir_window_spec_attach_to_foreign_parent(MirWindowSpec* spec, | 383 | bool mir_window_spec_attach_to_foreign_parent(MirWindowSpec* spec, |
| 259 | @@ -391,7 +391,7 @@ | |||
| 260 | 391 | * \param [in] state Requested state | 391 | * \param [in] state Requested state |
| 261 | 392 | * | 392 | * |
| 262 | 393 | * \note If the server is unable to create a window with the requested state at | 393 | * \note If the server is unable to create a window with the requested state at |
| 264 | 394 | * the point mir_create_window() is called it will instead return an invalid window. | 394 | * the point mir_create_window_async() is called it will instead return an invalid window. |
| 265 | 395 | */ | 395 | */ |
| 266 | 396 | void mir_window_spec_set_state(MirWindowSpec* spec, MirWindowState state); | 396 | void mir_window_spec_set_state(MirWindowSpec* spec, MirWindowState state); |
| 267 | 397 | 397 | ||
| 268 | @@ -492,7 +492,7 @@ | |||
| 269 | 492 | * | 492 | * |
| 270 | 493 | * \note If this call returns %true then the server is guaranteed to honour this request. | 493 | * \note If this call returns %true then the server is guaranteed to honour this request. |
| 271 | 494 | * If the server is unable to create a window with this pixel format at | 494 | * If the server is unable to create a window with this pixel format at |
| 273 | 495 | * the point mir_create_window() is called it will instead return an invalid window. | 495 | * the point mir_create_window_async() is called it will instead return an invalid window. |
| 274 | 496 | */ | 496 | */ |
| 275 | 497 | void mir_window_spec_set_pixel_format(MirWindowSpec* spec, MirPixelFormat format); | 497 | void mir_window_spec_set_pixel_format(MirWindowSpec* spec, MirPixelFormat format); |
| 276 | 498 | 498 | ||
| 277 | @@ -505,7 +505,7 @@ | |||
| 278 | 505 | * | 505 | * |
| 279 | 506 | * \note If this call returns %true then the server is guaranteed to honour this request. | 506 | * \note If this call returns %true then the server is guaranteed to honour this request. |
| 280 | 507 | * If the server is unable to create a window with this buffer usage at | 507 | * If the server is unable to create a window with this buffer usage at |
| 282 | 508 | * the point mir_create_window() is called it will instead return an invalid window. | 508 | * the point mir_create_window_async() is called it will instead return an invalid window. |
| 283 | 509 | */ | 509 | */ |
| 284 | 510 | void mir_window_spec_set_buffer_usage(MirWindowSpec* spec, MirBufferUsage usage); | 510 | void mir_window_spec_set_buffer_usage(MirWindowSpec* spec, MirBufferUsage usage); |
| 285 | 511 | 511 | ||
| 286 | @@ -560,7 +560,7 @@ | |||
| 287 | 560 | * non-null MirWindow*, but the window may be invalid in | 560 | * non-null MirWindow*, but the window may be invalid in |
| 288 | 561 | * case of an error. | 561 | * case of an error. |
| 289 | 562 | */ | 562 | */ |
| 291 | 563 | void mir_create_window(MirWindowSpec* requested_specification, | 563 | void mir_create_window_async(MirWindowSpec* requested_specification, |
| 292 | 564 | MirWindowCallback callback, void* context); | 564 | MirWindowCallback callback, void* context); |
| 293 | 565 | 565 | ||
| 294 | 566 | /** | 566 | /** |
| 295 | @@ -569,7 +569,7 @@ | |||
| 296 | 569 | * \return The new window. This is guaranteed non-null, but may be invalid | 569 | * \return The new window. This is guaranteed non-null, but may be invalid |
| 297 | 570 | * in the case of error. | 570 | * in the case of error. |
| 298 | 571 | */ | 571 | */ |
| 300 | 572 | MirWindow* mir_create_window_sync(MirWindowSpec* requested_specification); | 572 | MirWindow* mir_create_window(MirWindowSpec* requested_specification); |
| 301 | 573 | 573 | ||
| 302 | 574 | /** | 574 | /** |
| 303 | 575 | * Release the supplied window and any associated buffer. | 575 | * Release the supplied window and any associated buffer. |
| 304 | @@ -937,11 +937,11 @@ | |||
| 305 | 937 | 937 | ||
| 306 | 938 | MirWaitHandle* mir_surface_create(MirSurfaceSpec* requested_specification, | 938 | MirWaitHandle* mir_surface_create(MirSurfaceSpec* requested_specification, |
| 307 | 939 | mir_surface_callback callback, void* context) | 939 | mir_surface_callback callback, void* context) |
| 308 | 940 | __attribute__((deprecated("use mir_create_window_async() instead"))); | ||
| 309 | 941 | |||
| 310 | 942 | MirSurface* mir_surface_create_sync(MirSurfaceSpec* requested_specification) | ||
| 311 | 940 | __attribute__((deprecated("use mir_create_window() instead"))); | 943 | __attribute__((deprecated("use mir_create_window() instead"))); |
| 312 | 941 | 944 | ||
| 313 | 942 | MirSurface* mir_surface_create_sync(MirSurfaceSpec* requested_specification) | ||
| 314 | 943 | __attribute__((deprecated("use mir_create_window_sync() instead"))); | ||
| 315 | 944 | |||
| 316 | 945 | MirWaitHandle *mir_surface_release( | 945 | MirWaitHandle *mir_surface_release( |
| 317 | 946 | MirSurface *surface, | 946 | MirSurface *surface, |
| 318 | 947 | mir_surface_callback callback, | 947 | mir_surface_callback callback, |
| 319 | 948 | 948 | ||
| 320 | === modified file 'playground/egldiamond_render_surface.c' | |||
| 321 | --- playground/egldiamond_render_surface.c 2017-01-18 02:29:37 +0000 | |||
| 322 | +++ playground/egldiamond_render_surface.c 2017-01-19 08:14:45 +0000 | |||
| 323 | @@ -237,7 +237,7 @@ | |||
| 324 | 237 | 237 | ||
| 325 | 238 | mir_window_spec_set_event_handler(spec, resize_callback, render_surface); | 238 | mir_window_spec_set_event_handler(spec, resize_callback, render_surface); |
| 326 | 239 | 239 | ||
| 328 | 240 | window = mir_create_window_sync(spec); | 240 | window = mir_create_window(spec); |
| 329 | 241 | mir_window_spec_release(spec); | 241 | mir_window_spec_release(spec); |
| 330 | 242 | 242 | ||
| 331 | 243 | CHECK(eglsurface != EGL_NO_SURFACE, "eglCreateWindowSurface failed"); | 243 | CHECK(eglsurface != EGL_NO_SURFACE, "eglCreateWindowSurface failed"); |
| 332 | 244 | 244 | ||
| 333 | === modified file 'playground/mir_demo_client_chain_jumping_buffers.c' | |||
| 334 | --- playground/mir_demo_client_chain_jumping_buffers.c 2017-01-18 02:29:37 +0000 | |||
| 335 | +++ playground/mir_demo_client_chain_jumping_buffers.c 2017-01-19 08:14:45 +0000 | |||
| 336 | @@ -211,7 +211,7 @@ | |||
| 337 | 211 | spec, render_surface[2], chain_width, chain_height, displacement_x, chain_height); | 211 | spec, render_surface[2], chain_width, chain_height, displacement_x, chain_height); |
| 338 | 212 | mir_surface_spec_add_render_surface( | 212 | mir_surface_spec_add_render_surface( |
| 339 | 213 | spec, render_surface[3], chain_width, chain_height, chain_width, chain_height); | 213 | spec, render_surface[3], chain_width, chain_height, chain_width, chain_height); |
| 341 | 214 | MirWindow* window = mir_create_window_sync(spec); | 214 | MirWindow* window = mir_create_window(spec); |
| 342 | 215 | mir_window_spec_release(spec); | 215 | mir_window_spec_release(spec); |
| 343 | 216 | 216 | ||
| 344 | 217 | MirBufferUsage usage = mir_buffer_usage_software; | 217 | MirBufferUsage usage = mir_buffer_usage_software; |
| 345 | 218 | 218 | ||
| 346 | === modified file 'playground/mir_demo_client_prerendered_frames.c' | |||
| 347 | --- playground/mir_demo_client_prerendered_frames.c 2017-01-18 02:29:37 +0000 | |||
| 348 | +++ playground/mir_demo_client_prerendered_frames.c 2017-01-19 08:14:45 +0000 | |||
| 349 | @@ -172,7 +172,7 @@ | |||
| 350 | 172 | mir_window_spec_set_pixel_format(spec, format); | 172 | mir_window_spec_set_pixel_format(spec, format); |
| 351 | 173 | mir_surface_spec_add_render_surface( | 173 | mir_surface_spec_add_render_surface( |
| 352 | 174 | spec, render_surface, width, height, displacement_x, displacement_y); | 174 | spec, render_surface, width, height, displacement_x, displacement_y); |
| 354 | 175 | MirWindow* window = mir_create_window_sync(spec); | 175 | MirWindow* window = mir_create_window(spec); |
| 355 | 176 | if (!mir_window_is_valid(window)) | 176 | if (!mir_window_is_valid(window)) |
| 356 | 177 | { | 177 | { |
| 357 | 178 | printf("could not create a window\n"); | 178 | printf("could not create a window\n"); |
| 358 | 179 | 179 | ||
| 359 | === modified file 'playground/render_surface.cpp' | |||
| 360 | --- playground/render_surface.cpp 2017-01-18 02:29:37 +0000 | |||
| 361 | +++ playground/render_surface.cpp 2017-01-19 08:14:45 +0000 | |||
| 362 | @@ -210,7 +210,7 @@ | |||
| 363 | 210 | pixel_format, | 210 | pixel_format, |
| 364 | 211 | mir_buffer_usage_software); | 211 | mir_buffer_usage_software); |
| 365 | 212 | 212 | ||
| 367 | 213 | auto window = mir_create_window_sync(spec); | 213 | auto window = mir_create_window(spec); |
| 368 | 214 | mir_window_spec_release(spec); | 214 | mir_window_spec_release(spec); |
| 369 | 215 | 215 | ||
| 370 | 216 | fill_stream_with(buffer_stream, 255, 0, 0, 128); | 216 | fill_stream_with(buffer_stream, 255, 0, 0, 128); |
| 371 | 217 | 217 | ||
| 372 | === modified file 'src/client/mir_surface_api.cpp' | |||
| 373 | --- src/client/mir_surface_api.cpp 2017-01-18 04:43:15 +0000 | |||
| 374 | +++ src/client/mir_surface_api.cpp 2017-01-19 08:14:45 +0000 | |||
| 375 | @@ -556,16 +556,16 @@ | |||
| 376 | 556 | } | 556 | } |
| 377 | 557 | } | 557 | } |
| 378 | 558 | 558 | ||
| 381 | 559 | void mir_create_window(MirWindowSpec* requested_specification, | 559 | void mir_create_window_async(MirWindowSpec* requested_specification, |
| 382 | 560 | MirWindowCallback callback, void* context) | 560 | MirWindowCallback callback, void* context) |
| 383 | 561 | { | 561 | { |
| 384 | 562 | window_create_helper(requested_specification, callback, context); | 562 | window_create_helper(requested_specification, callback, context); |
| 385 | 563 | } | 563 | } |
| 386 | 564 | 564 | ||
| 388 | 565 | MirWindow* mir_create_window_sync(MirWindowSpec* requested_specification) | 565 | MirWindow* mir_create_window(MirWindowSpec* requested_specification) |
| 389 | 566 | { | 566 | { |
| 390 | 567 | WindowSync ws; | 567 | WindowSync ws; |
| 392 | 568 | mir_create_window(requested_specification, | 568 | mir_create_window_async(requested_specification, |
| 393 | 569 | reinterpret_cast<MirWindowCallback>(set_result), | 569 | reinterpret_cast<MirWindowCallback>(set_result), |
| 394 | 570 | &ws); | 570 | &ws); |
| 395 | 571 | return ws.wait_for_result(); | 571 | return ws.wait_for_result(); |
| 396 | @@ -908,7 +908,7 @@ | |||
| 397 | 908 | 908 | ||
| 398 | 909 | MirSurface* mir_surface_create_sync(MirSurfaceSpec* requested_specification) | 909 | MirSurface* mir_surface_create_sync(MirSurfaceSpec* requested_specification) |
| 399 | 910 | { | 910 | { |
| 401 | 911 | return mir_create_window_sync(requested_specification); | 911 | return mir_create_window(requested_specification); |
| 402 | 912 | } | 912 | } |
| 403 | 913 | 913 | ||
| 404 | 914 | MirWaitHandle* mir_surface_create(MirSurfaceSpec* requested_specification, | 914 | MirWaitHandle* mir_surface_create(MirSurfaceSpec* requested_specification, |
| 405 | 915 | 915 | ||
| 406 | === modified file 'src/client/symbols.map' | |||
| 407 | --- src/client/symbols.map 2017-01-18 16:25:59 +0000 | |||
| 408 | +++ src/client/symbols.map 2017-01-19 08:14:45 +0000 | |||
| 409 | @@ -540,8 +540,8 @@ | |||
| 410 | 540 | mir_window_spec_set_buffer_usage; | 540 | mir_window_spec_set_buffer_usage; |
| 411 | 541 | mir_window_spec_set_streams; | 541 | mir_window_spec_set_streams; |
| 412 | 542 | mir_window_apply_spec; | 542 | mir_window_apply_spec; |
| 413 | 543 | mir_create_window_async; | ||
| 414 | 543 | mir_create_window; | 544 | mir_create_window; |
| 415 | 544 | mir_create_window_sync; | ||
| 416 | 545 | mir_window_release; | 545 | mir_window_release; |
| 417 | 546 | mir_window_release_sync; | 546 | mir_window_release_sync; |
| 418 | 547 | mir_window_is_valid; | 547 | mir_window_is_valid; |
| 419 | 548 | 548 | ||
| 420 | === modified file 'src/platforms/android/utils/test_android_hardware_sanity.cpp' | |||
| 421 | --- src/platforms/android/utils/test_android_hardware_sanity.cpp 2017-01-18 02:29:37 +0000 | |||
| 422 | +++ src/platforms/android/utils/test_android_hardware_sanity.cpp 2017-01-19 08:14:45 +0000 | |||
| 423 | @@ -119,7 +119,7 @@ | |||
| 424 | 119 | connection, test_width, test_height); | 119 | connection, test_width, test_height); |
| 425 | 120 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 120 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 426 | 121 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); | 121 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); |
| 428 | 122 | auto const window = mir_create_window_sync(spec); | 122 | auto const window = mir_create_window(spec); |
| 429 | 123 | mir_window_spec_release(spec); | 123 | mir_window_spec_release(spec); |
| 430 | 124 | 124 | ||
| 431 | 125 | EXPECT_THAT(window, IsValid()); | 125 | EXPECT_THAT(window, IsValid()); |
| 432 | @@ -175,7 +175,7 @@ | |||
| 433 | 175 | auto const spec = mir_create_normal_window_spec(connection, test_width, test_height); | 175 | auto const spec = mir_create_normal_window_spec(connection, test_width, test_height); |
| 434 | 176 | mir_window_spec_set_pixel_format(spec, select_format_for_visual_id(visual_id)); | 176 | mir_window_spec_set_pixel_format(spec, select_format_for_visual_id(visual_id)); |
| 435 | 177 | 177 | ||
| 437 | 178 | auto const mir_surface = mir_create_window_sync(spec); | 178 | auto const mir_surface = mir_create_window(spec); |
| 438 | 179 | mir_window_spec_release(spec); | 179 | mir_window_spec_release(spec); |
| 439 | 180 | 180 | ||
| 440 | 181 | EXPECT_THAT(mir_surface, IsValid()); | 181 | EXPECT_THAT(mir_surface, IsValid()); |
| 441 | 182 | 182 | ||
| 442 | === modified file 'src/server/graphics/nested/mir_client_host_connection.cpp' | |||
| 443 | --- src/server/graphics/nested/mir_client_host_connection.cpp 2017-01-18 19:57:47 +0000 | |||
| 444 | +++ src/server/graphics/nested/mir_client_host_connection.cpp 2017-01-19 08:14:45 +0000 | |||
| 445 | @@ -108,7 +108,7 @@ | |||
| 446 | 108 | MirWindowSpec* spec) | 108 | MirWindowSpec* spec) |
| 447 | 109 | : mir_connection(mir_connection), | 109 | : mir_connection(mir_connection), |
| 448 | 110 | mir_surface{ | 110 | mir_surface{ |
| 450 | 111 | mir_create_window_sync(spec)} | 111 | mir_create_window(spec)} |
| 451 | 112 | { | 112 | { |
| 452 | 113 | if (!mir_window_is_valid(mir_surface)) | 113 | if (!mir_window_is_valid(mir_surface)) |
| 453 | 114 | { | 114 | { |
| 454 | 115 | 115 | ||
| 455 | === modified file 'tests/acceptance-tests/test_buffer_stream_arrangement.cpp' | |||
| 456 | --- tests/acceptance-tests/test_buffer_stream_arrangement.cpp 2017-01-18 02:29:37 +0000 | |||
| 457 | +++ tests/acceptance-tests/test_buffer_stream_arrangement.cpp 2017-01-19 08:14:45 +0000 | |||
| 458 | @@ -209,7 +209,7 @@ | |||
| 459 | 209 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); | 209 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); |
| 460 | 210 | mir_window_spec_set_streams(spec, infos.data(), infos.size()); | 210 | mir_window_spec_set_streams(spec, infos.data(), infos.size()); |
| 461 | 211 | 211 | ||
| 463 | 212 | window = mir_create_window_sync(spec); | 212 | window = mir_create_window(spec); |
| 464 | 213 | mir_window_spec_release(spec); | 213 | mir_window_spec_release(spec); |
| 465 | 214 | EXPECT_TRUE(mir_window_is_valid(window)) << mir_window_get_error_message(window); | 214 | EXPECT_TRUE(mir_window_is_valid(window)) << mir_window_get_error_message(window); |
| 466 | 215 | } | 215 | } |
| 467 | @@ -263,7 +263,7 @@ | |||
| 468 | 263 | auto spec = mir_create_normal_window_spec(connection, 100, 100); | 263 | auto spec = mir_create_normal_window_spec(connection, 100, 100); |
| 469 | 264 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 264 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 470 | 265 | mir_window_spec_set_streams(spec, infos.data(), infos.size()); | 265 | mir_window_spec_set_streams(spec, infos.data(), infos.size()); |
| 472 | 266 | auto window = mir_create_window_sync(spec); | 266 | auto window = mir_create_window(spec); |
| 473 | 267 | mir_window_spec_release(spec); | 267 | mir_window_spec_release(spec); |
| 474 | 268 | EXPECT_TRUE(mir_window_is_valid(window)); | 268 | EXPECT_TRUE(mir_window_is_valid(window)); |
| 475 | 269 | EXPECT_THAT(mir_window_get_error_message(window), StrEq("")); | 269 | EXPECT_THAT(mir_window_get_error_message(window), StrEq("")); |
| 476 | 270 | 270 | ||
| 477 | === modified file 'tests/acceptance-tests/test_client_cookie.cpp' | |||
| 478 | --- tests/acceptance-tests/test_client_cookie.cpp 2017-01-18 02:29:37 +0000 | |||
| 479 | +++ tests/acceptance-tests/test_client_cookie.cpp 2017-01-19 08:14:45 +0000 | |||
| 480 | @@ -62,7 +62,7 @@ | |||
| 481 | 62 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 62 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 482 | 63 | mir_window_spec_set_fullscreen_on_output(spec, 1); | 63 | mir_window_spec_set_fullscreen_on_output(spec, 1); |
| 483 | 64 | mir_window_spec_set_event_handler(spec, &cookie_capturing_callback, this); | 64 | mir_window_spec_set_event_handler(spec, &cookie_capturing_callback, this); |
| 485 | 65 | window = mir_create_window_sync(spec); | 65 | window = mir_create_window(spec); |
| 486 | 66 | mir_window_spec_release(spec); | 66 | mir_window_spec_release(spec); |
| 487 | 67 | 67 | ||
| 488 | 68 | mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); | 68 | mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
| 489 | 69 | 69 | ||
| 490 | === modified file 'tests/acceptance-tests/test_client_cursor_api.cpp' | |||
| 491 | --- tests/acceptance-tests/test_client_cursor_api.cpp 2017-01-18 02:29:37 +0000 | |||
| 492 | +++ tests/acceptance-tests/test_client_cursor_api.cpp 2017-01-19 08:14:45 +0000 | |||
| 493 | @@ -137,7 +137,7 @@ | |||
| 494 | 137 | auto spec = mir_create_normal_window_spec(connection, 1, 1); | 137 | auto spec = mir_create_normal_window_spec(connection, 1, 1); |
| 495 | 138 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 138 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 496 | 139 | mir_window_spec_set_name(spec, client_name.c_str()); | 139 | mir_window_spec_set_name(spec, client_name.c_str()); |
| 498 | 140 | auto const window = mir_create_window_sync(spec); | 140 | auto const window = mir_create_window(spec); |
| 499 | 141 | mir_window_spec_release(spec); | 141 | mir_window_spec_release(spec); |
| 500 | 142 | 142 | ||
| 501 | 143 | mir_buffer_stream_swap_buffers_sync( | 143 | mir_buffer_stream_swap_buffers_sync( |
| 502 | 144 | 144 | ||
| 503 | === modified file 'tests/acceptance-tests/test_client_focus_notification.cpp' | |||
| 504 | --- tests/acceptance-tests/test_client_focus_notification.cpp 2017-01-18 02:29:37 +0000 | |||
| 505 | +++ tests/acceptance-tests/test_client_focus_notification.cpp 2017-01-19 08:14:45 +0000 | |||
| 506 | @@ -44,7 +44,7 @@ | |||
| 507 | 44 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 44 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 508 | 45 | mir_window_spec_set_event_handler(spec, FocusSurface::handle_event, this); | 45 | mir_window_spec_set_event_handler(spec, FocusSurface::handle_event, this); |
| 509 | 46 | 46 | ||
| 511 | 47 | window = mir_create_window_sync(spec); | 47 | window = mir_create_window(spec); |
| 512 | 48 | mir_window_spec_release(spec); | 48 | mir_window_spec_release(spec); |
| 513 | 49 | 49 | ||
| 514 | 50 | mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); | 50 | mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
| 515 | 51 | 51 | ||
| 516 | === modified file 'tests/acceptance-tests/test_client_input.cpp' | |||
| 517 | --- tests/acceptance-tests/test_client_input.cpp 2017-01-18 16:25:59 +0000 | |||
| 518 | +++ tests/acceptance-tests/test_client_input.cpp 2017-01-19 08:14:45 +0000 | |||
| 519 | @@ -97,7 +97,7 @@ | |||
| 520 | 97 | auto spec = mir_create_normal_window_spec(connection, surface_width, surface_height); | 97 | auto spec = mir_create_normal_window_spec(connection, surface_width, surface_height); |
| 521 | 98 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 98 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 522 | 99 | mir_window_spec_set_name(spec, name.c_str()); | 99 | mir_window_spec_set_name(spec, name.c_str()); |
| 524 | 100 | window = mir_create_window_sync(spec); | 100 | window = mir_create_window(spec); |
| 525 | 101 | mir_window_spec_release(spec); | 101 | mir_window_spec_release(spec); |
| 526 | 102 | if (!mir_window_is_valid(window)) | 102 | if (!mir_window_is_valid(window)) |
| 527 | 103 | BOOST_THROW_EXCEPTION(std::runtime_error{std::string{"Failed creating a window: "}+ | 103 | BOOST_THROW_EXCEPTION(std::runtime_error{std::string{"Failed creating a window: "}+ |
| 528 | 104 | 104 | ||
| 529 | === modified file 'tests/acceptance-tests/test_client_library.cpp' | |||
| 530 | --- tests/acceptance-tests/test_client_library.cpp 2017-01-18 19:57:47 +0000 | |||
| 531 | +++ tests/acceptance-tests/test_client_library.cpp 2017-01-19 08:14:45 +0000 | |||
| 532 | @@ -349,7 +349,7 @@ | |||
| 533 | 349 | auto spec = mir_create_normal_window_spec(connection, request_width, request_height); | 349 | auto spec = mir_create_normal_window_spec(connection, request_width, request_height); |
| 534 | 350 | mir_window_spec_set_pixel_format(spec, request_format); | 350 | mir_window_spec_set_pixel_format(spec, request_format); |
| 535 | 351 | mir_window_spec_set_buffer_usage(spec, request_buffer_usage); | 351 | mir_window_spec_set_buffer_usage(spec, request_buffer_usage); |
| 537 | 352 | window = mir_create_window_sync(spec); | 352 | window = mir_create_window(spec); |
| 538 | 353 | mir_window_spec_release(spec); | 353 | mir_window_spec_release(spec); |
| 539 | 354 | 354 | ||
| 540 | 355 | ASSERT_THAT(window, NotNull()); | 355 | ASSERT_THAT(window, NotNull()); |
| 541 | @@ -372,7 +372,7 @@ | |||
| 542 | 372 | connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__); | 372 | connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__); |
| 543 | 373 | auto const spec = mir_create_normal_window_spec(connection, 123, 456); | 373 | auto const spec = mir_create_normal_window_spec(connection, 123, 456); |
| 544 | 374 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 374 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 546 | 375 | window = mir_create_window_sync(spec); | 375 | window = mir_create_window(spec); |
| 547 | 376 | mir_window_spec_release(spec); | 376 | mir_window_spec_release(spec); |
| 548 | 377 | 377 | ||
| 549 | 378 | EXPECT_THAT(window, IsValid()); | 378 | EXPECT_THAT(window, IsValid()); |
| 550 | @@ -389,7 +389,7 @@ | |||
| 551 | 389 | mir_create_normal_window_spec(connection, 640, 480); | 389 | mir_create_normal_window_spec(connection, 640, 480); |
| 552 | 390 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 390 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 553 | 391 | 391 | ||
| 555 | 392 | window = mir_create_window_sync(spec); | 392 | window = mir_create_window(spec); |
| 556 | 393 | 393 | ||
| 557 | 394 | mir_window_spec_release(spec); | 394 | mir_window_spec_release(spec); |
| 558 | 395 | 395 | ||
| 559 | @@ -429,7 +429,7 @@ | |||
| 560 | 429 | auto const spec = mir_create_normal_window_spec(connection, width, height); | 429 | auto const spec = mir_create_normal_window_spec(connection, width, height); |
| 561 | 430 | mir_window_spec_set_pixel_format(spec, format); | 430 | mir_window_spec_set_pixel_format(spec, format); |
| 562 | 431 | mir_window_spec_set_pointer_confinement(spec, mir_pointer_confined_to_window); | 431 | mir_window_spec_set_pointer_confinement(spec, mir_pointer_confined_to_window); |
| 564 | 432 | window = mir_create_window_sync(spec); | 432 | window = mir_create_window(spec); |
| 565 | 433 | mir_window_spec_release(spec); | 433 | mir_window_spec_release(spec); |
| 566 | 434 | 434 | ||
| 567 | 435 | EXPECT_THAT(window, IsValid()); | 435 | EXPECT_THAT(window, IsValid()); |
| 568 | @@ -450,7 +450,7 @@ | |||
| 569 | 450 | 450 | ||
| 570 | 451 | int const min_width = 480; | 451 | int const min_width = 480; |
| 571 | 452 | mir_window_spec_set_min_width(spec, min_width); | 452 | mir_window_spec_set_min_width(spec, min_width); |
| 573 | 453 | window = mir_create_window_sync(spec); | 453 | window = mir_create_window(spec); |
| 574 | 454 | mir_window_spec_release(spec); | 454 | mir_window_spec_release(spec); |
| 575 | 455 | 455 | ||
| 576 | 456 | EXPECT_THAT(window, IsValid()); | 456 | EXPECT_THAT(window, IsValid()); |
| 577 | @@ -471,7 +471,7 @@ | |||
| 578 | 471 | 471 | ||
| 579 | 472 | int const min_height = 480; | 472 | int const min_height = 480; |
| 580 | 473 | mir_window_spec_set_min_height(spec, min_height); | 473 | mir_window_spec_set_min_height(spec, min_height); |
| 582 | 474 | window = mir_create_window_sync(spec); | 474 | window = mir_create_window(spec); |
| 583 | 475 | mir_window_spec_release(spec); | 475 | mir_window_spec_release(spec); |
| 584 | 476 | 476 | ||
| 585 | 477 | EXPECT_THAT(window, IsValid()); | 477 | EXPECT_THAT(window, IsValid()); |
| 586 | @@ -492,7 +492,7 @@ | |||
| 587 | 492 | 492 | ||
| 588 | 493 | int const max_width = 1024; | 493 | int const max_width = 1024; |
| 589 | 494 | mir_window_spec_set_max_width(spec, max_width); | 494 | mir_window_spec_set_max_width(spec, max_width); |
| 591 | 495 | window = mir_create_window_sync(spec); | 495 | window = mir_create_window(spec); |
| 592 | 496 | mir_window_spec_release(spec); | 496 | mir_window_spec_release(spec); |
| 593 | 497 | 497 | ||
| 594 | 498 | EXPECT_THAT(window, IsValid()); | 498 | EXPECT_THAT(window, IsValid()); |
| 595 | @@ -513,7 +513,7 @@ | |||
| 596 | 513 | 513 | ||
| 597 | 514 | int const max_height = 1024; | 514 | int const max_height = 1024; |
| 598 | 515 | mir_window_spec_set_max_height(spec, max_height); | 515 | mir_window_spec_set_max_height(spec, max_height); |
| 600 | 516 | window = mir_create_window_sync(spec); | 516 | window = mir_create_window(spec); |
| 601 | 517 | mir_window_spec_release(spec); | 517 | mir_window_spec_release(spec); |
| 602 | 518 | 518 | ||
| 603 | 519 | EXPECT_THAT(window, IsValid()); | 519 | EXPECT_THAT(window, IsValid()); |
| 604 | @@ -537,7 +537,7 @@ | |||
| 605 | 537 | 537 | ||
| 606 | 538 | mir_window_spec_set_min_width(spec, min_width); | 538 | mir_window_spec_set_min_width(spec, min_width); |
| 607 | 539 | mir_window_spec_set_min_height(spec, min_height); | 539 | mir_window_spec_set_min_height(spec, min_height); |
| 609 | 540 | window = mir_create_window_sync(spec); | 540 | window = mir_create_window(spec); |
| 610 | 541 | mir_window_spec_release(spec); | 541 | mir_window_spec_release(spec); |
| 611 | 542 | 542 | ||
| 612 | 543 | auto const buffer_stream = mir_window_get_buffer_stream(window); | 543 | auto const buffer_stream = mir_window_get_buffer_stream(window); |
| 613 | @@ -558,7 +558,7 @@ | |||
| 614 | 558 | auto const spec = mir_create_normal_window_spec(connection, 640, 480); | 558 | auto const spec = mir_create_normal_window_spec(connection, 640, 480); |
| 615 | 559 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 559 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 616 | 560 | 560 | ||
| 618 | 561 | window = mir_create_window_sync(spec); | 561 | window = mir_create_window(spec); |
| 619 | 562 | mir_window_spec_release(spec); | 562 | mir_window_spec_release(spec); |
| 620 | 563 | 563 | ||
| 621 | 564 | // Expect zero (not wired up to detect the physical display yet) | 564 | // Expect zero (not wired up to detect the physical display yet) |
| 622 | @@ -576,7 +576,7 @@ | |||
| 623 | 576 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 576 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 624 | 577 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); | 577 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); |
| 625 | 578 | 578 | ||
| 627 | 579 | window = mir_create_window_sync(spec); | 579 | window = mir_create_window(spec); |
| 628 | 580 | 580 | ||
| 629 | 581 | MirNativeBuffer *native; | 581 | MirNativeBuffer *native; |
| 630 | 582 | auto bs = mir_window_get_buffer_stream(window); | 582 | auto bs = mir_window_get_buffer_stream(window); |
| 631 | @@ -589,7 +589,7 @@ | |||
| 632 | 589 | mir_window_spec_set_width(spec, 100); | 589 | mir_window_spec_set_width(spec, 100); |
| 633 | 590 | mir_window_spec_set_height(spec, 100); | 590 | mir_window_spec_set_height(spec, 100); |
| 634 | 591 | 591 | ||
| 636 | 592 | window = mir_create_window_sync(spec); | 592 | window = mir_create_window(spec); |
| 637 | 593 | bs = mir_window_get_buffer_stream(window); | 593 | bs = mir_window_get_buffer_stream(window); |
| 638 | 594 | mir_buffer_stream_get_current_buffer(bs, &native); | 594 | mir_buffer_stream_get_current_buffer(bs, &native); |
| 639 | 595 | EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout); | 595 | EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout); |
| 640 | @@ -602,7 +602,7 @@ | |||
| 641 | 602 | mir_window_spec_set_height(spec, 600); | 602 | mir_window_spec_set_height(spec, 600); |
| 642 | 603 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); | 603 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); |
| 643 | 604 | 604 | ||
| 645 | 605 | window = mir_create_window_sync(spec); | 605 | window = mir_create_window(spec); |
| 646 | 606 | bs = mir_window_get_buffer_stream(window); | 606 | bs = mir_window_get_buffer_stream(window); |
| 647 | 607 | mir_buffer_stream_get_current_buffer(bs, &native); | 607 | mir_buffer_stream_get_current_buffer(bs, &native); |
| 648 | 608 | EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout); | 608 | EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout); |
| 649 | @@ -612,7 +612,7 @@ | |||
| 650 | 612 | 612 | ||
| 651 | 613 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); | 613 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); |
| 652 | 614 | 614 | ||
| 654 | 615 | window = mir_create_window_sync(spec); | 615 | window = mir_create_window(spec); |
| 655 | 616 | bs = mir_window_get_buffer_stream(window); | 616 | bs = mir_window_get_buffer_stream(window); |
| 656 | 617 | mir_buffer_stream_get_current_buffer(bs, &native); | 617 | mir_buffer_stream_get_current_buffer(bs, &native); |
| 657 | 618 | EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout); | 618 | EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout); |
| 658 | @@ -645,7 +645,7 @@ | |||
| 659 | 645 | mir_window_spec_set_width(spec, size.width); | 645 | mir_window_spec_set_width(spec, size.width); |
| 660 | 646 | mir_window_spec_set_height(spec, size.height); | 646 | mir_window_spec_set_height(spec, size.height); |
| 661 | 647 | 647 | ||
| 663 | 648 | window = mir_create_window_sync(spec); | 648 | window = mir_create_window(spec); |
| 664 | 649 | auto bs = mir_window_get_buffer_stream(window); | 649 | auto bs = mir_window_get_buffer_stream(window); |
| 665 | 650 | 650 | ||
| 666 | 651 | MirNativeBuffer *native = NULL; | 651 | MirNativeBuffer *native = NULL; |
| 667 | @@ -683,7 +683,7 @@ | |||
| 668 | 683 | { | 683 | { |
| 669 | 684 | old_surface_count = current_surface_count(); | 684 | old_surface_count = current_surface_count(); |
| 670 | 685 | 685 | ||
| 672 | 686 | mir_create_window(spec, create_surface_callback, this); | 686 | mir_create_window_async(spec, create_surface_callback, this); |
| 673 | 687 | wait_for_window_create(); | 687 | wait_for_window_create(); |
| 674 | 688 | 688 | ||
| 675 | 689 | ASSERT_THAT(current_surface_count(), Eq(old_surface_count + 1)); | 689 | ASSERT_THAT(current_surface_count(), Eq(old_surface_count + 1)); |
| 676 | @@ -867,7 +867,7 @@ | |||
| 677 | 867 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); | 867 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); |
| 678 | 868 | mir_window_spec_set_pixel_format(surface_spec, format); | 868 | mir_window_spec_set_pixel_format(surface_spec, format); |
| 679 | 869 | 869 | ||
| 681 | 870 | auto window = mir_create_window_sync(surface_spec); | 870 | auto window = mir_create_window(surface_spec); |
| 682 | 871 | mir_window_spec_release(surface_spec); | 871 | mir_window_spec_release(surface_spec); |
| 683 | 872 | 872 | ||
| 684 | 873 | EXPECT_THAT(window, IsValid()); | 873 | EXPECT_THAT(window, IsValid()); |
| 685 | @@ -893,7 +893,7 @@ | |||
| 686 | 893 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); | 893 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); |
| 687 | 894 | mir_window_spec_set_pixel_format(surface_spec, format); | 894 | mir_window_spec_set_pixel_format(surface_spec, format); |
| 688 | 895 | 895 | ||
| 690 | 896 | window = mir_create_window_sync(surface_spec); | 896 | window = mir_create_window(surface_spec); |
| 691 | 897 | mir_window_spec_release(surface_spec); | 897 | mir_window_spec_release(surface_spec); |
| 692 | 898 | 898 | ||
| 693 | 899 | EXPECT_THAT(window, IsValid()); | 899 | EXPECT_THAT(window, IsValid()); |
| 694 | @@ -932,7 +932,7 @@ | |||
| 695 | 932 | MirBufferUsage const buffer_usage{mir_buffer_usage_hardware}; | 932 | MirBufferUsage const buffer_usage{mir_buffer_usage_hardware}; |
| 696 | 933 | mir_window_spec_set_buffer_usage(surface_spec, buffer_usage); | 933 | mir_window_spec_set_buffer_usage(surface_spec, buffer_usage); |
| 697 | 934 | 934 | ||
| 699 | 935 | auto window = mir_create_window_sync(surface_spec); | 935 | auto window = mir_create_window(surface_spec); |
| 700 | 936 | mir_window_spec_release(surface_spec); | 936 | mir_window_spec_release(surface_spec); |
| 701 | 937 | 937 | ||
| 702 | 938 | EXPECT_THAT(window, IsValid()); | 938 | EXPECT_THAT(window, IsValid()); |
| 703 | @@ -959,7 +959,7 @@ | |||
| 704 | 959 | auto id = mir_output_get_id(output); | 959 | auto id = mir_output_get_id(output); |
| 705 | 960 | mir_window_spec_set_fullscreen_on_output(surface_spec, id); | 960 | mir_window_spec_set_fullscreen_on_output(surface_spec, id); |
| 706 | 961 | 961 | ||
| 708 | 962 | auto window = mir_create_window_sync(surface_spec); | 962 | auto window = mir_create_window(surface_spec); |
| 709 | 963 | mir_window_spec_release(surface_spec); | 963 | mir_window_spec_release(surface_spec); |
| 710 | 964 | 964 | ||
| 711 | 965 | EXPECT_THAT(window, IsValid()); | 965 | EXPECT_THAT(window, IsValid()); |
| 712 | @@ -1000,7 +1000,7 @@ | |||
| 713 | 1000 | MirBufferUsage const buffer_usage{mir_buffer_usage_hardware}; | 1000 | MirBufferUsage const buffer_usage{mir_buffer_usage_hardware}; |
| 714 | 1001 | mir_window_spec_set_buffer_usage(surface_spec, buffer_usage); | 1001 | mir_window_spec_set_buffer_usage(surface_spec, buffer_usage); |
| 715 | 1002 | 1002 | ||
| 717 | 1003 | auto window = mir_create_window_sync(surface_spec); | 1003 | auto window = mir_create_window(surface_spec); |
| 718 | 1004 | mir_window_spec_release(surface_spec); | 1004 | mir_window_spec_release(surface_spec); |
| 719 | 1005 | 1005 | ||
| 720 | 1006 | EXPECT_THAT(window, IsValid()); | 1006 | EXPECT_THAT(window, IsValid()); |
| 721 | @@ -1028,7 +1028,7 @@ | |||
| 722 | 1028 | MirBufferUsage const buffer_usage{mir_buffer_usage_software}; | 1028 | MirBufferUsage const buffer_usage{mir_buffer_usage_software}; |
| 723 | 1029 | mir_window_spec_set_buffer_usage(surface_spec, buffer_usage); | 1029 | mir_window_spec_set_buffer_usage(surface_spec, buffer_usage); |
| 724 | 1030 | 1030 | ||
| 726 | 1031 | auto window = mir_create_window_sync(surface_spec); | 1031 | auto window = mir_create_window(surface_spec); |
| 727 | 1032 | mir_window_spec_release(surface_spec); | 1032 | mir_window_spec_release(surface_spec); |
| 728 | 1033 | 1033 | ||
| 729 | 1034 | EXPECT_THAT(window, IsValid()); | 1034 | EXPECT_THAT(window, IsValid()); |
| 730 | @@ -1067,7 +1067,7 @@ | |||
| 731 | 1067 | 1067 | ||
| 732 | 1068 | auto surface_spec = mir_create_normal_window_spec(connection, 800, 600); | 1068 | auto surface_spec = mir_create_normal_window_spec(connection, 800, 600); |
| 733 | 1069 | mir_window_spec_set_pixel_format(surface_spec, mir_pixel_format_argb_8888); | 1069 | mir_window_spec_set_pixel_format(surface_spec, mir_pixel_format_argb_8888); |
| 735 | 1070 | auto window = mir_create_window_sync(surface_spec); | 1070 | auto window = mir_create_window(surface_spec); |
| 736 | 1071 | mir_window_spec_release(surface_spec); | 1071 | mir_window_spec_release(surface_spec); |
| 737 | 1072 | 1072 | ||
| 738 | 1073 | ASSERT_THAT(window, IsValid()); | 1073 | ASSERT_THAT(window, IsValid()); |
| 739 | @@ -1090,7 +1090,7 @@ | |||
| 740 | 1090 | 1090 | ||
| 741 | 1091 | auto surface_spec = mir_create_normal_window_spec(connection, 800, 600); | 1091 | auto surface_spec = mir_create_normal_window_spec(connection, 800, 600); |
| 742 | 1092 | mir_window_spec_set_pixel_format(surface_spec, mir_pixel_format_argb_8888); | 1092 | mir_window_spec_set_pixel_format(surface_spec, mir_pixel_format_argb_8888); |
| 744 | 1093 | auto window = mir_create_window_sync(surface_spec); | 1093 | auto window = mir_create_window(surface_spec); |
| 745 | 1094 | mir_window_spec_release(surface_spec); | 1094 | mir_window_spec_release(surface_spec); |
| 746 | 1095 | 1095 | ||
| 747 | 1096 | ASSERT_THAT(window, IsValid()); | 1096 | ASSERT_THAT(window, IsValid()); |
| 748 | @@ -1109,7 +1109,7 @@ | |||
| 749 | 1109 | 1109 | ||
| 750 | 1110 | auto surface_spec = mir_create_normal_window_spec(first_client, 800, 600); | 1110 | auto surface_spec = mir_create_normal_window_spec(first_client, 800, 600); |
| 751 | 1111 | mir_window_spec_set_pixel_format(surface_spec, mir_pixel_format_argb_8888); | 1111 | mir_window_spec_set_pixel_format(surface_spec, mir_pixel_format_argb_8888); |
| 753 | 1112 | auto main_surface = mir_create_window_sync(surface_spec); | 1112 | auto main_surface = mir_create_window(surface_spec); |
| 754 | 1113 | mir_window_spec_release(surface_spec); | 1113 | mir_window_spec_release(surface_spec); |
| 755 | 1114 | 1114 | ||
| 756 | 1115 | ASSERT_THAT(main_surface, IsValid()); | 1115 | ASSERT_THAT(main_surface, IsValid()); |
| 757 | @@ -1133,7 +1133,7 @@ | |||
| 758 | 1133 | im_parent_id, | 1133 | im_parent_id, |
| 759 | 1134 | &attachment_rect, | 1134 | &attachment_rect, |
| 760 | 1135 | mir_edge_attachment_any); | 1135 | mir_edge_attachment_any); |
| 762 | 1136 | auto im_surface = mir_create_window_sync(surface_spec); | 1136 | auto im_surface = mir_create_window(surface_spec); |
| 763 | 1137 | 1137 | ||
| 764 | 1138 | EXPECT_THAT(im_surface, IsValid()); | 1138 | EXPECT_THAT(im_surface, IsValid()); |
| 765 | 1139 | 1139 | ||
| 766 | 1140 | 1140 | ||
| 767 | === modified file 'tests/acceptance-tests/test_client_library_errors.cpp' | |||
| 768 | --- tests/acceptance-tests/test_client_library_errors.cpp 2017-01-18 02:29:37 +0000 | |||
| 769 | +++ tests/acceptance-tests/test_client_library_errors.cpp 2017-01-19 08:14:45 +0000 | |||
| 770 | @@ -92,7 +92,7 @@ | |||
| 771 | 92 | 92 | ||
| 772 | 93 | auto spec = mir_create_normal_window_spec(connection, 800, 600); | 93 | auto spec = mir_create_normal_window_spec(connection, 800, 600); |
| 773 | 94 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); | 94 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); |
| 775 | 95 | auto window = mir_create_window_sync(spec); | 95 | auto window = mir_create_window(spec); |
| 776 | 96 | mir_window_spec_release(spec); | 96 | mir_window_spec_release(spec); |
| 777 | 97 | 97 | ||
| 778 | 98 | ASSERT_NE(window, nullptr); | 98 | ASSERT_NE(window, nullptr); |
| 779 | @@ -139,7 +139,7 @@ | |||
| 780 | 139 | 139 | ||
| 781 | 140 | auto spec = mir_create_normal_window_spec(connection, 800, 600); | 140 | auto spec = mir_create_normal_window_spec(connection, 800, 600); |
| 782 | 141 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); | 141 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); |
| 784 | 142 | auto window = mir_create_window_sync(spec); | 142 | auto window = mir_create_window(spec); |
| 785 | 143 | mir_window_spec_release(spec); | 143 | mir_window_spec_release(spec); |
| 786 | 144 | 144 | ||
| 787 | 145 | mir_window_release_sync(window); | 145 | mir_window_release_sync(window); |
| 788 | @@ -168,7 +168,7 @@ | |||
| 789 | 168 | 168 | ||
| 790 | 169 | auto spec = mir_create_normal_window_spec(connection, 800, 600); | 169 | auto spec = mir_create_normal_window_spec(connection, 800, 600); |
| 791 | 170 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); | 170 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); |
| 793 | 171 | auto window = mir_create_window_sync(spec); | 171 | auto window = mir_create_window(spec); |
| 794 | 172 | mir_window_spec_release(spec); | 172 | mir_window_spec_release(spec); |
| 795 | 173 | 173 | ||
| 796 | 174 | ASSERT_NE(window, nullptr); | 174 | ASSERT_NE(window, nullptr); |
| 797 | @@ -195,7 +195,7 @@ | |||
| 798 | 195 | 195 | ||
| 799 | 196 | auto spec = mir_create_normal_window_spec(connection, 800, 600); | 196 | auto spec = mir_create_normal_window_spec(connection, 800, 600); |
| 800 | 197 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); | 197 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); |
| 802 | 198 | auto window = mir_create_window_sync(spec); | 198 | auto window = mir_create_window(spec); |
| 803 | 199 | mir_window_spec_release(spec); | 199 | mir_window_spec_release(spec); |
| 804 | 200 | 200 | ||
| 805 | 201 | ASSERT_NE(window, nullptr); | 201 | ASSERT_NE(window, nullptr); |
| 806 | @@ -227,7 +227,7 @@ | |||
| 807 | 227 | }; | 227 | }; |
| 808 | 228 | mir_window_spec_attach_to_foreign_parent(spec, invalid_id, &rect, mir_edge_attachment_any); | 228 | mir_window_spec_attach_to_foreign_parent(spec, invalid_id, &rect, mir_edge_attachment_any); |
| 809 | 229 | 229 | ||
| 811 | 230 | auto window = mir_create_window_sync(spec); | 230 | auto window = mir_create_window(spec); |
| 812 | 231 | EXPECT_THAT(window, Not(IsValid())); | 231 | EXPECT_THAT(window, Not(IsValid())); |
| 813 | 232 | EXPECT_THAT(mir_window_get_error_message(window), MatchesRegex(".*Lookup.*failed.*")); | 232 | EXPECT_THAT(mir_window_get_error_message(window), MatchesRegex(".*Lookup.*failed.*")); |
| 814 | 233 | 233 | ||
| 815 | 234 | 234 | ||
| 816 | === modified file 'tests/acceptance-tests/test_client_logging.cpp' | |||
| 817 | --- tests/acceptance-tests/test_client_logging.cpp 2017-01-18 02:29:37 +0000 | |||
| 818 | +++ tests/acceptance-tests/test_client_logging.cpp 2017-01-19 08:14:45 +0000 | |||
| 819 | @@ -62,7 +62,7 @@ | |||
| 820 | 62 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 62 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 821 | 63 | mir_window_spec_set_name(spec, "Rumpelstiltskin"); | 63 | mir_window_spec_set_name(spec, "Rumpelstiltskin"); |
| 822 | 64 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); | 64 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); |
| 824 | 65 | auto window = mir_create_window_sync(spec); | 65 | auto window = mir_create_window(spec); |
| 825 | 66 | ASSERT_THAT(window, NotNull()); | 66 | ASSERT_THAT(window, NotNull()); |
| 826 | 67 | mir_window_spec_release(spec); | 67 | mir_window_spec_release(spec); |
| 827 | 68 | 68 | ||
| 828 | 69 | 69 | ||
| 829 | === modified file 'tests/acceptance-tests/test_client_surface_events.cpp' | |||
| 830 | --- tests/acceptance-tests/test_client_surface_events.cpp 2017-01-18 02:29:37 +0000 | |||
| 831 | +++ tests/acceptance-tests/test_client_surface_events.cpp 2017-01-19 08:14:45 +0000 | |||
| 832 | @@ -531,7 +531,7 @@ | |||
| 833 | 531 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 531 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 834 | 532 | mir_window_spec_set_event_handler(spec, &raise_signal_on_close_event, &done); | 532 | mir_window_spec_set_event_handler(spec, &raise_signal_on_close_event, &done); |
| 835 | 533 | 533 | ||
| 837 | 534 | auto window = mir_create_window_sync(spec); | 534 | auto window = mir_create_window(spec); |
| 838 | 535 | 535 | ||
| 839 | 536 | mir_window_spec_release(spec); | 536 | mir_window_spec_release(spec); |
| 840 | 537 | 537 | ||
| 841 | @@ -622,7 +622,7 @@ | |||
| 842 | 622 | auto spec = mir_create_normal_window_spec(connection, 640, 480); | 622 | auto spec = mir_create_normal_window_spec(connection, 640, 480); |
| 843 | 623 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 623 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 844 | 624 | mir_window_spec_set_event_handler(spec, &surface_output_capturing_callback, &context); | 624 | mir_window_spec_set_event_handler(spec, &surface_output_capturing_callback, &context); |
| 846 | 625 | auto window = mir_create_window_sync(spec); | 625 | auto window = mir_create_window(spec); |
| 847 | 626 | mir_window_spec_release(spec); | 626 | mir_window_spec_release(spec); |
| 848 | 627 | 627 | ||
| 849 | 628 | ASSERT_TRUE(context.captured.wait_for(10s)); | 628 | ASSERT_TRUE(context.captured.wait_for(10s)); |
| 850 | 629 | 629 | ||
| 851 | === modified file 'tests/acceptance-tests/test_client_surface_visibility.cpp' | |||
| 852 | --- tests/acceptance-tests/test_client_surface_visibility.cpp 2017-01-18 02:29:37 +0000 | |||
| 853 | +++ tests/acceptance-tests/test_client_surface_visibility.cpp 2017-01-19 08:14:45 +0000 | |||
| 854 | @@ -113,7 +113,7 @@ | |||
| 855 | 113 | mir_window_spec_set_name(spec, name); | 113 | mir_window_spec_set_name(spec, name); |
| 856 | 114 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); | 114 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); |
| 857 | 115 | mir_window_spec_set_event_handler(spec, &event_callback, &mock_callback); | 115 | mir_window_spec_set_event_handler(spec, &event_callback, &mock_callback); |
| 859 | 116 | auto window = mir_create_window_sync(spec); | 116 | auto window = mir_create_window(spec); |
| 860 | 117 | mir_window_spec_release(spec); | 117 | mir_window_spec_release(spec); |
| 861 | 118 | return window; | 118 | return window; |
| 862 | 119 | } | 119 | } |
| 863 | 120 | 120 | ||
| 864 | === modified file 'tests/acceptance-tests/test_client_surfaces.cpp' | |||
| 865 | --- tests/acceptance-tests/test_client_surfaces.cpp 2017-01-18 02:29:37 +0000 | |||
| 866 | +++ tests/acceptance-tests/test_client_surfaces.cpp 2017-01-19 08:14:45 +0000 | |||
| 867 | @@ -68,12 +68,12 @@ | |||
| 868 | 68 | 68 | ||
| 869 | 69 | auto spec = mir_create_normal_window_spec(connection, width_1, height_1); | 69 | auto spec = mir_create_normal_window_spec(connection, width_1, height_1); |
| 870 | 70 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 70 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 872 | 71 | window[0] = mir_create_window_sync(spec); | 71 | window[0] = mir_create_window(spec); |
| 873 | 72 | 72 | ||
| 874 | 73 | mir_window_spec_set_width(spec, width_2); | 73 | mir_window_spec_set_width(spec, width_2); |
| 875 | 74 | mir_window_spec_set_height(spec, height_2); | 74 | mir_window_spec_set_height(spec, height_2); |
| 876 | 75 | 75 | ||
| 878 | 76 | window[1] = mir_create_window_sync(spec); | 76 | window[1] = mir_create_window(spec); |
| 879 | 77 | 77 | ||
| 880 | 78 | mir_window_spec_release(spec); | 78 | mir_window_spec_release(spec); |
| 881 | 79 | 79 | ||
| 882 | @@ -112,7 +112,7 @@ | |||
| 883 | 112 | { | 112 | { |
| 884 | 113 | auto spec = mir_create_normal_window_spec(connection, 1, 1); | 113 | auto spec = mir_create_normal_window_spec(connection, 1, 1); |
| 885 | 114 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 114 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 887 | 115 | window[i] = mir_create_window_sync(spec); | 115 | window[i] = mir_create_window(spec); |
| 888 | 116 | mir_window_spec_release(spec); | 116 | mir_window_spec_release(spec); |
| 889 | 117 | } | 117 | } |
| 890 | 118 | 118 | ||
| 891 | @@ -146,7 +146,7 @@ | |||
| 892 | 146 | MirOrientationMode mode{GetParam()}; | 146 | MirOrientationMode mode{GetParam()}; |
| 893 | 147 | mir_window_spec_set_preferred_orientation(spec, mode); | 147 | mir_window_spec_set_preferred_orientation(spec, mode); |
| 894 | 148 | 148 | ||
| 896 | 149 | auto window = mir_create_window_sync(spec); | 149 | auto window = mir_create_window(spec); |
| 897 | 150 | mir_window_spec_release(spec); | 150 | mir_window_spec_release(spec); |
| 898 | 151 | 151 | ||
| 899 | 152 | ASSERT_THAT(window, IsValid()); | 152 | ASSERT_THAT(window, IsValid()); |
| 900 | @@ -172,7 +172,7 @@ | |||
| 901 | 172 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 172 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 902 | 173 | ASSERT_THAT(spec, NotNull()); | 173 | ASSERT_THAT(spec, NotNull()); |
| 903 | 174 | 174 | ||
| 905 | 175 | auto menu = mir_create_window_sync(spec); | 175 | auto menu = mir_create_window(spec); |
| 906 | 176 | mir_window_spec_release(spec); | 176 | mir_window_spec_release(spec); |
| 907 | 177 | 177 | ||
| 908 | 178 | ASSERT_THAT(menu, IsValid()); | 178 | ASSERT_THAT(menu, IsValid()); |
| 909 | @@ -192,7 +192,7 @@ | |||
| 910 | 192 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 192 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 911 | 193 | ASSERT_THAT(spec, NotNull()); | 193 | ASSERT_THAT(spec, NotNull()); |
| 912 | 194 | 194 | ||
| 914 | 195 | auto tooltip = mir_create_window_sync(spec); | 195 | auto tooltip = mir_create_window(spec); |
| 915 | 196 | mir_window_spec_release(spec); | 196 | mir_window_spec_release(spec); |
| 916 | 197 | 197 | ||
| 917 | 198 | ASSERT_THAT(tooltip, IsValid()); | 198 | ASSERT_THAT(tooltip, IsValid()); |
| 918 | @@ -208,7 +208,7 @@ | |||
| 919 | 208 | ASSERT_THAT(spec, NotNull()); | 208 | ASSERT_THAT(spec, NotNull()); |
| 920 | 209 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 209 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 921 | 210 | 210 | ||
| 923 | 211 | auto dialog = mir_create_window_sync(spec); | 211 | auto dialog = mir_create_window(spec); |
| 924 | 212 | mir_window_spec_release(spec); | 212 | mir_window_spec_release(spec); |
| 925 | 213 | 213 | ||
| 926 | 214 | ASSERT_THAT(dialog, IsValid()); | 214 | ASSERT_THAT(dialog, IsValid()); |
| 927 | @@ -224,7 +224,7 @@ | |||
| 928 | 224 | ASSERT_THAT(spec, NotNull()); | 224 | ASSERT_THAT(spec, NotNull()); |
| 929 | 225 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 225 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 930 | 226 | 226 | ||
| 932 | 227 | auto dialog = mir_create_window_sync(spec); | 227 | auto dialog = mir_create_window(spec); |
| 933 | 228 | mir_window_spec_release(spec); | 228 | mir_window_spec_release(spec); |
| 934 | 229 | 229 | ||
| 935 | 230 | ASSERT_THAT(dialog, IsValid()); | 230 | ASSERT_THAT(dialog, IsValid()); |
| 936 | @@ -240,7 +240,7 @@ | |||
| 937 | 240 | ASSERT_THAT(spec, NotNull()); | 240 | ASSERT_THAT(spec, NotNull()); |
| 938 | 241 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 241 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 939 | 242 | 242 | ||
| 941 | 243 | auto im = mir_create_window_sync(spec); | 243 | auto im = mir_create_window(spec); |
| 942 | 244 | mir_window_spec_release(spec); | 244 | mir_window_spec_release(spec); |
| 943 | 245 | 245 | ||
| 944 | 246 | EXPECT_EQ(mir_window_get_type(im), mir_window_type_inputmethod); | 246 | EXPECT_EQ(mir_window_get_type(im), mir_window_type_inputmethod); |
| 945 | @@ -253,7 +253,7 @@ | |||
| 946 | 253 | auto spec = mir_create_normal_window_spec(connection, 123, 456); | 253 | auto spec = mir_create_normal_window_spec(connection, 123, 456); |
| 947 | 254 | ASSERT_THAT(spec, NotNull()); | 254 | ASSERT_THAT(spec, NotNull()); |
| 948 | 255 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 255 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 950 | 256 | auto window = mir_create_window_sync(spec); | 256 | auto window = mir_create_window(spec); |
| 951 | 257 | mir_window_spec_release(spec); | 257 | mir_window_spec_release(spec); |
| 952 | 258 | 258 | ||
| 953 | 259 | /* | 259 | /* |
| 954 | @@ -324,7 +324,7 @@ | |||
| 955 | 324 | 324 | ||
| 956 | 325 | mir_persistent_id_release(parent_id); | 325 | mir_persistent_id_release(parent_id); |
| 957 | 326 | 326 | ||
| 959 | 327 | auto im = mir_create_window_sync(spec); | 327 | auto im = mir_create_window(spec); |
| 960 | 328 | mir_window_spec_release(spec); | 328 | mir_window_spec_release(spec); |
| 961 | 329 | 329 | ||
| 962 | 330 | mir_window_release_sync(im); | 330 | mir_window_release_sync(im); |
| 963 | 331 | 331 | ||
| 964 | === modified file 'tests/acceptance-tests/test_confined_pointer.cpp' | |||
| 965 | --- tests/acceptance-tests/test_confined_pointer.cpp 2017-01-18 02:29:37 +0000 | |||
| 966 | +++ tests/acceptance-tests/test_confined_pointer.cpp 2017-01-19 08:14:45 +0000 | |||
| 967 | @@ -81,7 +81,7 @@ | |||
| 968 | 81 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 81 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 969 | 82 | mir_window_spec_set_pointer_confinement(spec, mir_pointer_confined_to_window); | 82 | mir_window_spec_set_pointer_confinement(spec, mir_pointer_confined_to_window); |
| 970 | 83 | mir_window_spec_set_name(spec, name.c_str()); | 83 | mir_window_spec_set_name(spec, name.c_str()); |
| 972 | 84 | window = mir_create_window_sync(spec); | 84 | window = mir_create_window(spec); |
| 973 | 85 | mir_window_spec_release(spec); | 85 | mir_window_spec_release(spec); |
| 974 | 86 | if (!mir_window_is_valid(window)) | 86 | if (!mir_window_is_valid(window)) |
| 975 | 87 | { | 87 | { |
| 976 | 88 | 88 | ||
| 977 | === modified file 'tests/acceptance-tests/test_custom_window_management.cpp' | |||
| 978 | --- tests/acceptance-tests/test_custom_window_management.cpp 2017-01-18 04:43:15 +0000 | |||
| 979 | +++ tests/acceptance-tests/test_custom_window_management.cpp 2017-01-19 08:14:45 +0000 | |||
| 980 | @@ -78,7 +78,7 @@ | |||
| 981 | 78 | { | 78 | { |
| 982 | 79 | auto spec = mir_create_normal_window_spec(connection, 800, 600); | 79 | auto spec = mir_create_normal_window_spec(connection, 800, 600); |
| 983 | 80 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_bgr_888); | 80 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_bgr_888); |
| 985 | 81 | auto window = mir_create_window_sync(spec); | 81 | auto window = mir_create_window(spec); |
| 986 | 82 | mir_window_spec_release(spec); | 82 | mir_window_spec_release(spec); |
| 987 | 83 | 83 | ||
| 988 | 84 | return window; | 84 | return window; |
| 989 | @@ -316,7 +316,7 @@ | |||
| 990 | 316 | 316 | ||
| 991 | 317 | EXPECT_CALL(window_manager, add_surface(_,_,_)).WillOnce(Invoke(check_add_surface)); | 317 | EXPECT_CALL(window_manager, add_surface(_,_,_)).WillOnce(Invoke(check_add_surface)); |
| 992 | 318 | 318 | ||
| 994 | 319 | auto window = mir_create_window_sync(surface_spec); | 319 | auto window = mir_create_window(surface_spec); |
| 995 | 320 | mir_window_spec_release(surface_spec); | 320 | mir_window_spec_release(surface_spec); |
| 996 | 321 | 321 | ||
| 997 | 322 | mir_window_release_sync(window); | 322 | mir_window_release_sync(window); |
| 998 | @@ -334,7 +334,7 @@ | |||
| 999 | 334 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); | 334 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); |
| 1000 | 335 | mir_window_spec_set_pixel_format(surface_spec, format); | 335 | mir_window_spec_set_pixel_format(surface_spec, format); |
| 1001 | 336 | 336 | ||
| 1003 | 337 | auto window = mir_create_window_sync(surface_spec); | 337 | auto window = mir_create_window(surface_spec); |
| 1004 | 338 | mir_window_spec_release(surface_spec); | 338 | mir_window_spec_release(surface_spec); |
| 1005 | 339 | 339 | ||
| 1006 | 340 | surface_spec = mir_create_window_spec(connection); | 340 | surface_spec = mir_create_window_spec(connection); |
| 1007 | @@ -380,7 +380,7 @@ | |||
| 1008 | 380 | auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__); | 380 | auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__); |
| 1009 | 381 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); | 381 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); |
| 1010 | 382 | mir_window_spec_set_pixel_format(surface_spec, format); | 382 | mir_window_spec_set_pixel_format(surface_spec, format); |
| 1012 | 383 | auto parent = mir_create_window_sync(surface_spec); | 383 | auto parent = mir_create_window(surface_spec); |
| 1013 | 384 | mir_window_spec_release(surface_spec); | 384 | mir_window_spec_release(surface_spec); |
| 1014 | 385 | 385 | ||
| 1015 | 386 | surface_spec = mir_create_tip_window_spec( | 386 | surface_spec = mir_create_tip_window_spec( |
| 1016 | @@ -433,7 +433,7 @@ | |||
| 1017 | 433 | 433 | ||
| 1018 | 434 | EXPECT_CALL(window_manager, add_surface(_,_,_)).WillOnce(Invoke(check_placement)); | 434 | EXPECT_CALL(window_manager, add_surface(_,_,_)).WillOnce(Invoke(check_placement)); |
| 1019 | 435 | 435 | ||
| 1021 | 436 | auto child = mir_create_window_sync(surface_spec); | 436 | auto child = mir_create_window(surface_spec); |
| 1022 | 437 | mir_window_spec_release(surface_spec); | 437 | mir_window_spec_release(surface_spec); |
| 1023 | 438 | 438 | ||
| 1024 | 439 | EXPECT_TRUE(received.wait_for(400ms)); | 439 | EXPECT_TRUE(received.wait_for(400ms)); |
| 1025 | @@ -460,13 +460,13 @@ | |||
| 1026 | 460 | auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__); | 460 | auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__); |
| 1027 | 461 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); | 461 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); |
| 1028 | 462 | mir_window_spec_set_pixel_format(surface_spec, format); | 462 | mir_window_spec_set_pixel_format(surface_spec, format); |
| 1030 | 463 | auto parent = mir_create_window_sync(surface_spec); | 463 | auto parent = mir_create_window(surface_spec); |
| 1031 | 464 | mir_window_spec_release(surface_spec); | 464 | mir_window_spec_release(surface_spec); |
| 1032 | 465 | 465 | ||
| 1033 | 466 | surface_spec = mir_create_menu_window_spec( | 466 | surface_spec = mir_create_menu_window_spec( |
| 1034 | 467 | connection, width, height, parent, &dummy_rect, mir_edge_attachment_any); | 467 | connection, width, height, parent, &dummy_rect, mir_edge_attachment_any); |
| 1035 | 468 | mir_window_spec_set_pixel_format(surface_spec, format); | 468 | mir_window_spec_set_pixel_format(surface_spec, format); |
| 1037 | 469 | auto child = mir_create_window_sync(surface_spec); | 469 | auto child = mir_create_window(surface_spec); |
| 1038 | 470 | mir_window_spec_release(surface_spec); | 470 | mir_window_spec_release(surface_spec); |
| 1039 | 471 | 471 | ||
| 1040 | 472 | surface_spec = mir_create_window_spec(connection); | 472 | surface_spec = mir_create_window_spec(connection); |
| 1041 | @@ -590,7 +590,7 @@ | |||
| 1042 | 590 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); | 590 | auto surface_spec = mir_create_normal_window_spec(connection, width, height); |
| 1043 | 591 | mir_window_spec_set_pixel_format(surface_spec, format); | 591 | mir_window_spec_set_pixel_format(surface_spec, format); |
| 1044 | 592 | mir_window_spec_set_event_handler(surface_spec, &window_placement_event_callback, &placement_check); | 592 | mir_window_spec_set_event_handler(surface_spec, &window_placement_event_callback, &placement_check); |
| 1046 | 593 | auto window = mir_create_window_sync(surface_spec); | 593 | auto window = mir_create_window(surface_spec); |
| 1047 | 594 | mir_window_spec_release(surface_spec); | 594 | mir_window_spec_release(surface_spec); |
| 1048 | 595 | 595 | ||
| 1049 | 596 | scene_surface->placed_relative(placement_); | 596 | scene_surface->placed_relative(placement_); |
| 1050 | 597 | 597 | ||
| 1051 | === modified file 'tests/acceptance-tests/test_display_configuration.cpp' | |||
| 1052 | --- tests/acceptance-tests/test_display_configuration.cpp 2017-01-18 13:59:18 +0000 | |||
| 1053 | +++ tests/acceptance-tests/test_display_configuration.cpp 2017-01-19 08:14:45 +0000 | |||
| 1054 | @@ -208,7 +208,7 @@ | |||
| 1055 | 208 | 208 | ||
| 1056 | 209 | auto const spec = mir_create_normal_window_spec(connection, 100, 100); | 209 | auto const spec = mir_create_normal_window_spec(connection, 100, 100); |
| 1057 | 210 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 210 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 1059 | 211 | window = mir_create_window_sync(spec); | 211 | window = mir_create_window(spec); |
| 1060 | 212 | mir_window_spec_release(spec); | 212 | mir_window_spec_release(spec); |
| 1061 | 213 | mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); | 213 | mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
| 1062 | 214 | } | 214 | } |
| 1063 | 215 | 215 | ||
| 1064 | === modified file 'tests/acceptance-tests/test_nested_mir.cpp' | |||
| 1065 | --- tests/acceptance-tests/test_nested_mir.cpp 2017-01-19 04:35:37 +0000 | |||
| 1066 | +++ tests/acceptance-tests/test_nested_mir.cpp 2017-01-19 08:14:45 +0000 | |||
| 1067 | @@ -813,7 +813,7 @@ | |||
| 1068 | 813 | }, | 813 | }, |
| 1069 | 814 | &surface_event_received); | 814 | &surface_event_received); |
| 1070 | 815 | 815 | ||
| 1072 | 816 | auto window = mir_create_window_sync(spec); | 816 | auto window = mir_create_window(spec); |
| 1073 | 817 | mir_window_spec_release(spec); | 817 | mir_window_spec_release(spec); |
| 1074 | 818 | 818 | ||
| 1075 | 819 | EXPECT_TRUE(surface_event_received.wait_for(30s)); | 819 | EXPECT_TRUE(surface_event_received.wait_for(30s)); |
| 1076 | 820 | 820 | ||
| 1077 | === modified file 'tests/acceptance-tests/test_new_display_configuration.cpp' | |||
| 1078 | --- tests/acceptance-tests/test_new_display_configuration.cpp 2017-01-18 02:29:37 +0000 | |||
| 1079 | +++ tests/acceptance-tests/test_new_display_configuration.cpp 2017-01-19 08:14:45 +0000 | |||
| 1080 | @@ -268,7 +268,7 @@ | |||
| 1081 | 268 | auto const spec = mir_create_normal_window_spec(connection, 100, 100); | 268 | auto const spec = mir_create_normal_window_spec(connection, 100, 100); |
| 1082 | 269 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 269 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 1083 | 270 | mir_window_spec_set_event_handler(spec, &handle_event, this); | 270 | mir_window_spec_set_event_handler(spec, &handle_event, this); |
| 1085 | 271 | window = mir_create_window_sync(spec); | 271 | window = mir_create_window(spec); |
| 1086 | 272 | mir_window_spec_release(spec); | 272 | mir_window_spec_release(spec); |
| 1087 | 273 | mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); | 273 | mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
| 1088 | 274 | 274 | ||
| 1089 | 275 | 275 | ||
| 1090 | === modified file 'tests/acceptance-tests/test_presentation_chain.cpp' | |||
| 1091 | --- tests/acceptance-tests/test_presentation_chain.cpp 2017-01-18 04:43:15 +0000 | |||
| 1092 | +++ tests/acceptance-tests/test_presentation_chain.cpp 2017-01-19 08:14:45 +0000 | |||
| 1093 | @@ -112,7 +112,7 @@ | |||
| 1094 | 112 | mir_window_spec_set_pixel_format(spec, pf); | 112 | mir_window_spec_set_pixel_format(spec, pf); |
| 1095 | 113 | mir_surface_spec_add_presentation_chain( | 113 | mir_surface_spec_add_presentation_chain( |
| 1096 | 114 | spec, size.width.as_int(), size.height.as_int(), 0, 0, chain); | 114 | spec, size.width.as_int(), size.height.as_int(), 0, 0, chain); |
| 1098 | 115 | auto window = mir_create_window_sync(spec); | 115 | auto window = mir_create_window(spec); |
| 1099 | 116 | mir_window_spec_release(spec); | 116 | mir_window_spec_release(spec); |
| 1100 | 117 | return window; | 117 | return window; |
| 1101 | 118 | } | 118 | } |
| 1102 | @@ -134,7 +134,7 @@ | |||
| 1103 | 134 | MirWindowSpec* spec = mir_create_normal_window_spec( | 134 | MirWindowSpec* spec = mir_create_normal_window_spec( |
| 1104 | 135 | connection, size.width.as_int(), size.height.as_int()); | 135 | connection, size.width.as_int(), size.height.as_int()); |
| 1105 | 136 | mir_window_spec_set_pixel_format(spec, pf); | 136 | mir_window_spec_set_pixel_format(spec, pf); |
| 1107 | 137 | auto window = mir_create_window_sync(spec); | 137 | auto window = mir_create_window(spec); |
| 1108 | 138 | mir_window_spec_release(spec); | 138 | mir_window_spec_release(spec); |
| 1109 | 139 | spec = mir_create_window_spec(connection); | 139 | spec = mir_create_window_spec(connection); |
| 1110 | 140 | mir_surface_spec_add_presentation_chain( | 140 | mir_surface_spec_add_presentation_chain( |
| 1111 | @@ -381,7 +381,7 @@ | |||
| 1112 | 381 | auto spec = mir_create_normal_window_spec( | 381 | auto spec = mir_create_normal_window_spec( |
| 1113 | 382 | connection, size.width.as_int(), size.height.as_int()); | 382 | connection, size.width.as_int(), size.height.as_int()); |
| 1114 | 383 | mir_window_spec_set_pixel_format(spec, pf); | 383 | mir_window_spec_set_pixel_format(spec, pf); |
| 1116 | 384 | auto window = mir_create_window_sync(spec); | 384 | auto window = mir_create_window(spec); |
| 1117 | 385 | mir_window_spec_release(spec); | 385 | mir_window_spec_release(spec); |
| 1118 | 386 | 386 | ||
| 1119 | 387 | spec = mir_create_window_spec(connection); | 387 | spec = mir_create_window_spec(connection); |
| 1120 | 388 | 388 | ||
| 1121 | === modified file 'tests/acceptance-tests/test_render_surface.cpp' | |||
| 1122 | --- tests/acceptance-tests/test_render_surface.cpp 2017-01-18 02:29:37 +0000 | |||
| 1123 | +++ tests/acceptance-tests/test_render_surface.cpp 2017-01-19 08:14:45 +0000 | |||
| 1124 | @@ -148,7 +148,7 @@ | |||
| 1125 | 148 | physical_size.width.as_int(), physical_size.height.as_int()); | 148 | physical_size.width.as_int(), physical_size.height.as_int()); |
| 1126 | 149 | mir_surface_spec_add_render_surface( | 149 | mir_surface_spec_add_render_surface( |
| 1127 | 150 | spec, rs, logical_size.width.as_int(), logical_size.height.as_int(), 0, 0); | 150 | spec, rs, logical_size.width.as_int(), logical_size.height.as_int(), 0, 0); |
| 1129 | 151 | auto window = mir_create_window_sync(spec); | 151 | auto window = mir_create_window(spec); |
| 1130 | 152 | mir_window_spec_release(spec); | 152 | mir_window_spec_release(spec); |
| 1131 | 153 | 153 | ||
| 1132 | 154 | EXPECT_THAT(window, IsValid()); | 154 | EXPECT_THAT(window, IsValid()); |
| 1133 | @@ -172,7 +172,7 @@ | |||
| 1134 | 172 | auto spec = mir_create_normal_window_spec(connection, width, height); | 172 | auto spec = mir_create_normal_window_spec(connection, width, height); |
| 1135 | 173 | mir_window_spec_set_pixel_format(spec, format); | 173 | mir_window_spec_set_pixel_format(spec, format); |
| 1136 | 174 | mir_surface_spec_add_render_surface(spec, rs, width, height, 0, 0); | 174 | mir_surface_spec_add_render_surface(spec, rs, width, height, 0, 0); |
| 1138 | 175 | auto window = mir_create_window_sync(spec); | 175 | auto window = mir_create_window(spec); |
| 1139 | 176 | mir_window_spec_release(spec); | 176 | mir_window_spec_release(spec); |
| 1140 | 177 | auto bs = mir_render_surface_get_buffer_stream(rs, | 177 | auto bs = mir_render_surface_get_buffer_stream(rs, |
| 1141 | 178 | 640, 480, | 178 | 640, 480, |
| 1142 | @@ -236,7 +236,7 @@ | |||
| 1143 | 236 | auto spec = mir_create_normal_window_spec(connection, width, height); | 236 | auto spec = mir_create_normal_window_spec(connection, width, height); |
| 1144 | 237 | mir_window_spec_set_pixel_format(spec, format); | 237 | mir_window_spec_set_pixel_format(spec, format); |
| 1145 | 238 | mir_surface_spec_add_render_surface(spec, rs, width, height, 0, 0); | 238 | mir_surface_spec_add_render_surface(spec, rs, width, height, 0, 0); |
| 1147 | 239 | auto window = mir_create_window_sync(spec); | 239 | auto window = mir_create_window(spec); |
| 1148 | 240 | mir_window_spec_release(spec); | 240 | mir_window_spec_release(spec); |
| 1149 | 241 | auto pc = mir_render_surface_get_presentation_chain(rs); | 241 | auto pc = mir_render_surface_get_presentation_chain(rs); |
| 1150 | 242 | 242 | ||
| 1151 | 243 | 243 | ||
| 1152 | === modified file 'tests/acceptance-tests/test_server_disconnect.cpp' | |||
| 1153 | --- tests/acceptance-tests/test_server_disconnect.cpp 2017-01-18 13:59:18 +0000 | |||
| 1154 | +++ tests/acceptance-tests/test_server_disconnect.cpp 2017-01-19 08:14:45 +0000 | |||
| 1155 | @@ -120,7 +120,7 @@ | |||
| 1156 | 120 | create_surface.exec([&] { | 120 | create_surface.exec([&] { |
| 1157 | 121 | auto spec = mir_create_normal_window_spec(connection, 800, 600); | 121 | auto spec = mir_create_normal_window_spec(connection, 800, 600); |
| 1158 | 122 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); | 122 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_xbgr_8888); |
| 1160 | 123 | window = mir_create_window_sync(spec); | 123 | window = mir_create_window(spec); |
| 1161 | 124 | mir_window_spec_release(spec); | 124 | mir_window_spec_release(spec); |
| 1162 | 125 | }); | 125 | }); |
| 1163 | 126 | 126 | ||
| 1164 | 127 | 127 | ||
| 1165 | === modified file 'tests/acceptance-tests/test_surface_morphing.cpp' | |||
| 1166 | --- tests/acceptance-tests/test_surface_morphing.cpp 2017-01-18 02:29:37 +0000 | |||
| 1167 | +++ tests/acceptance-tests/test_surface_morphing.cpp 2017-01-19 08:14:45 +0000 | |||
| 1168 | @@ -104,7 +104,7 @@ | |||
| 1169 | 104 | 104 | ||
| 1170 | 105 | specifier(spec); | 105 | specifier(spec); |
| 1171 | 106 | 106 | ||
| 1173 | 107 | auto const window = mir_create_window_sync(spec); | 107 | auto const window = mir_create_window(spec); |
| 1174 | 108 | mir_window_spec_release(spec); | 108 | mir_window_spec_release(spec); |
| 1175 | 109 | 109 | ||
| 1176 | 110 | return SurfaceHandle{window}; | 110 | return SurfaceHandle{window}; |
| 1177 | 111 | 111 | ||
| 1178 | === modified file 'tests/acceptance-tests/test_surface_placement.cpp' | |||
| 1179 | --- tests/acceptance-tests/test_surface_placement.cpp 2017-01-18 02:29:37 +0000 | |||
| 1180 | +++ tests/acceptance-tests/test_surface_placement.cpp 2017-01-19 08:14:45 +0000 | |||
| 1181 | @@ -90,7 +90,7 @@ | |||
| 1182 | 90 | 90 | ||
| 1183 | 91 | specifier(spec); | 91 | specifier(spec); |
| 1184 | 92 | 92 | ||
| 1186 | 93 | auto const window = mir_create_window_sync(spec); | 93 | auto const window = mir_create_window(spec); |
| 1187 | 94 | mir_window_spec_release(spec); | 94 | mir_window_spec_release(spec); |
| 1188 | 95 | 95 | ||
| 1189 | 96 | return window; | 96 | return window; |
| 1190 | @@ -103,7 +103,7 @@ | |||
| 1191 | 103 | 103 | ||
| 1192 | 104 | specifier(spec); | 104 | specifier(spec); |
| 1193 | 105 | 105 | ||
| 1195 | 106 | auto const window = mir_create_window_sync(spec); | 106 | auto const window = mir_create_window(spec); |
| 1196 | 107 | mir_window_spec_release(spec); | 107 | mir_window_spec_release(spec); |
| 1197 | 108 | 108 | ||
| 1198 | 109 | return window; | 109 | return window; |
| 1199 | 110 | 110 | ||
| 1200 | === modified file 'tests/acceptance-tests/test_system_compositor_window_manager.cpp' | |||
| 1201 | --- tests/acceptance-tests/test_system_compositor_window_manager.cpp 2017-01-18 02:29:37 +0000 | |||
| 1202 | +++ tests/acceptance-tests/test_system_compositor_window_manager.cpp 2017-01-19 08:14:45 +0000 | |||
| 1203 | @@ -78,7 +78,7 @@ | |||
| 1204 | 78 | 78 | ||
| 1205 | 79 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_bgr_888); | 79 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_bgr_888); |
| 1206 | 80 | mir_window_spec_set_fullscreen_on_output(spec, output_id); | 80 | mir_window_spec_set_fullscreen_on_output(spec, output_id); |
| 1208 | 81 | auto const window = mir_create_window_sync(spec); | 81 | auto const window = mir_create_window(spec); |
| 1209 | 82 | mir_window_spec_release(spec); | 82 | mir_window_spec_release(spec); |
| 1210 | 83 | 83 | ||
| 1211 | 84 | mir_window_set_event_handler(window, on_surface_event, this); | 84 | mir_window_set_event_handler(window, on_surface_event, this); |
| 1212 | 85 | 85 | ||
| 1213 | === modified file 'tests/integration-tests/client/test_mirsurface.cpp' | |||
| 1214 | --- tests/integration-tests/client/test_mirsurface.cpp 2017-01-18 02:29:37 +0000 | |||
| 1215 | +++ tests/integration-tests/client/test_mirsurface.cpp 2017-01-19 08:14:45 +0000 | |||
| 1216 | @@ -150,7 +150,7 @@ | |||
| 1217 | 150 | 150 | ||
| 1218 | 151 | std::unique_ptr<MirWindow, std::function<void(MirWindow*)>> create_surface(MirWindowSpec* spec) | 151 | std::unique_ptr<MirWindow, std::function<void(MirWindow*)>> create_surface(MirWindowSpec* spec) |
| 1219 | 152 | { | 152 | { |
| 1221 | 153 | return {mir_create_window_sync(spec), [](MirWindow *window){mir_window_release_sync(window);}}; | 153 | return {mir_create_window(spec), [](MirWindow *window){mir_window_release_sync(window);}}; |
| 1222 | 154 | } | 154 | } |
| 1223 | 155 | 155 | ||
| 1224 | 156 | MirWindowSpec spec{nullptr, 640, 480, mir_pixel_format_abgr_8888}; | 156 | MirWindowSpec spec{nullptr, 640, 480, mir_pixel_format_abgr_8888}; |
| 1225 | 157 | 157 | ||
| 1226 | === modified file 'tests/integration-tests/test_error_reporting.cpp' | |||
| 1227 | --- tests/integration-tests/test_error_reporting.cpp 2017-01-18 02:29:37 +0000 | |||
| 1228 | +++ tests/integration-tests/test_error_reporting.cpp 2017-01-19 08:14:45 +0000 | |||
| 1229 | @@ -132,7 +132,7 @@ | |||
| 1230 | 132 | auto const spec = mir_create_normal_window_spec(connection, 640, 480); | 132 | auto const spec = mir_create_normal_window_spec(connection, 640, 480); |
| 1231 | 133 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); | 133 | mir_window_spec_set_pixel_format(spec, mir_pixel_format_abgr_8888); |
| 1232 | 134 | 134 | ||
| 1234 | 135 | auto const window = mir_create_window_sync(spec); | 135 | auto const window = mir_create_window(spec); |
| 1235 | 136 | mir_window_spec_release(spec); | 136 | mir_window_spec_release(spec); |
| 1236 | 137 | 137 | ||
| 1237 | 138 | ASSERT_TRUE(window != NULL); | 138 | ASSERT_TRUE(window != NULL); |
| 1238 | 139 | 139 | ||
| 1239 | === modified file 'tests/integration-tests/test_surfaceloop.cpp' | |||
| 1240 | --- tests/integration-tests/test_surfaceloop.cpp 2017-01-18 02:29:37 +0000 | |||
| 1241 | +++ tests/integration-tests/test_surfaceloop.cpp 2017-01-19 08:14:45 +0000 | |||
| 1242 | @@ -165,7 +165,7 @@ | |||
| 1243 | 165 | TEST_F(SurfaceLoop, all_created_buffers_are_destroyed) | 165 | TEST_F(SurfaceLoop, all_created_buffers_are_destroyed) |
| 1244 | 166 | { | 166 | { |
| 1245 | 167 | for (int i = 0; i != max_surface_count; ++i) | 167 | for (int i = 0; i != max_surface_count; ++i) |
| 1247 | 168 | window[i] = mir_create_window_sync(surface_spec); | 168 | window[i] = mir_create_window(surface_spec); |
| 1248 | 169 | 169 | ||
| 1249 | 170 | for (int i = 0; i != max_surface_count; ++i) | 170 | for (int i = 0; i != max_surface_count; ++i) |
| 1250 | 171 | mir_window_release_sync(window[i]); | 171 | mir_window_release_sync(window[i]); |
| 1251 | @@ -174,5 +174,5 @@ | |||
| 1252 | 174 | TEST_F(SurfaceLoop, all_created_buffers_are_destroyed_if_client_disconnects_without_releasing_surfaces) | 174 | TEST_F(SurfaceLoop, all_created_buffers_are_destroyed_if_client_disconnects_without_releasing_surfaces) |
| 1253 | 175 | { | 175 | { |
| 1254 | 176 | for (int i = 0; i != max_surface_count; ++i) | 176 | for (int i = 0; i != max_surface_count; ++i) |
| 1256 | 177 | window[i] = mir_create_window_sync(surface_spec); | 177 | window[i] = mir_create_window(surface_spec); |
| 1257 | 178 | } | 178 | } |
| 1258 | 179 | 179 | ||
| 1259 | === modified file 'tests/mir_test_framework/any_surface.cpp' | |||
| 1260 | --- tests/mir_test_framework/any_surface.cpp 2017-01-18 02:29:37 +0000 | |||
| 1261 | +++ tests/mir_test_framework/any_surface.cpp 2017-01-19 08:14:45 +0000 | |||
| 1262 | @@ -42,7 +42,7 @@ | |||
| 1263 | 42 | 42 | ||
| 1264 | 43 | auto spec = mir_create_normal_window_spec(connection, size.width.as_int(), size.height.as_int()); | 43 | auto spec = mir_create_normal_window_spec(connection, size.width.as_int(), size.height.as_int()); |
| 1265 | 44 | mir_window_spec_set_pixel_format(spec, f); | 44 | mir_window_spec_set_pixel_format(spec, f); |
| 1267 | 45 | auto window = mir_create_window_sync(spec); | 45 | auto window = mir_create_window(spec); |
| 1268 | 46 | mir_window_spec_release(spec); | 46 | mir_window_spec_release(spec); |
| 1269 | 47 | 47 | ||
| 1270 | 48 | if (!mir_window_is_valid(window)) | 48 | if (!mir_window_is_valid(window)) |
| 1271 | 49 | 49 | ||
| 1272 | === modified file 'tests/mir_test_framework/connected_client_with_a_surface.cpp' | |||
| 1273 | --- tests/mir_test_framework/connected_client_with_a_surface.cpp 2017-01-18 02:29:37 +0000 | |||
| 1274 | +++ tests/mir_test_framework/connected_client_with_a_surface.cpp 2017-01-19 08:14:45 +0000 | |||
| 1275 | @@ -31,7 +31,7 @@ | |||
| 1276 | 31 | mir_window_spec_set_name(spec, "ConnectedClientWithASurfaceFixtureSurface"); | 31 | mir_window_spec_set_name(spec, "ConnectedClientWithASurfaceFixtureSurface"); |
| 1277 | 32 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); | 32 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_hardware); |
| 1278 | 33 | 33 | ||
| 1280 | 34 | window = mir_create_window_sync(spec); | 34 | window = mir_create_window(spec); |
| 1281 | 35 | mir_window_spec_release(spec); | 35 | mir_window_spec_release(spec); |
| 1282 | 36 | ASSERT_TRUE(mir_window_is_valid(window)); | 36 | ASSERT_TRUE(mir_window_is_valid(window)); |
| 1283 | 37 | } | 37 | } |
| 1284 | 38 | 38 | ||
| 1285 | === modified file 'tests/mir_test_framework/visible_surface.cpp' | |||
| 1286 | --- tests/mir_test_framework/visible_surface.cpp 2017-01-18 02:29:37 +0000 | |||
| 1287 | +++ tests/mir_test_framework/visible_surface.cpp 2017-01-19 08:14:45 +0000 | |||
| 1288 | @@ -23,7 +23,7 @@ | |||
| 1289 | 23 | visible{false} | 23 | visible{false} |
| 1290 | 24 | { | 24 | { |
| 1291 | 25 | mir_window_spec_set_event_handler(spec, VisibleSurface::event_callback, this); | 25 | mir_window_spec_set_event_handler(spec, VisibleSurface::event_callback, this); |
| 1293 | 26 | window = mir_create_window_sync(spec); | 26 | window = mir_create_window(spec); |
| 1294 | 27 | // Swap buffers to ensure window is visible for event based tests | 27 | // Swap buffers to ensure window is visible for event based tests |
| 1295 | 28 | if (mir_window_is_valid(window)) | 28 | if (mir_window_is_valid(window)) |
| 1296 | 29 | { | 29 | { |
| 1297 | 30 | 30 | ||
| 1298 | === modified file 'tests/performance-tests/test_client_startup.cpp' | |||
| 1299 | --- tests/performance-tests/test_client_startup.cpp 2017-01-18 02:29:37 +0000 | |||
| 1300 | +++ tests/performance-tests/test_client_startup.cpp 2017-01-19 08:14:45 +0000 | |||
| 1301 | @@ -71,7 +71,7 @@ | |||
| 1302 | 71 | 71 | ||
| 1303 | 72 | auto spec = mir_create_normal_window_spec(connection, 720, 1280); | 72 | auto spec = mir_create_normal_window_spec(connection, 720, 1280); |
| 1304 | 73 | mir_window_spec_set_pixel_format(spec, format); | 73 | mir_window_spec_set_pixel_format(spec, format); |
| 1306 | 74 | auto window = mir_create_window_sync(spec); | 74 | auto window = mir_create_window(spec); |
| 1307 | 75 | 75 | ||
| 1308 | 76 | mir_window_spec_release(spec); | 76 | mir_window_spec_release(spec); |
| 1309 | 77 | 77 | ||
| 1310 | 78 | 78 | ||
| 1311 | === modified file 'tests/privileged-tests/test_input_events.cpp' | |||
| 1312 | --- tests/privileged-tests/test_input_events.cpp 2017-01-18 02:29:37 +0000 | |||
| 1313 | +++ tests/privileged-tests/test_input_events.cpp 2017-01-19 08:14:45 +0000 | |||
| 1314 | @@ -209,7 +209,7 @@ | |||
| 1315 | 209 | mir_connection_get_available_surface_formats(connection, &pixel_format, 1, &valid_formats); | 209 | mir_connection_get_available_surface_formats(connection, &pixel_format, 1, &valid_formats); |
| 1316 | 210 | auto spec = mir_create_normal_window_spec(connection, 640, 480); | 210 | auto spec = mir_create_normal_window_spec(connection, 640, 480); |
| 1317 | 211 | mir_window_spec_set_pixel_format(spec, pixel_format); | 211 | mir_window_spec_set_pixel_format(spec, pixel_format); |
| 1319 | 212 | auto const window = mir_create_window_sync(spec); | 212 | auto const window = mir_create_window(spec); |
| 1320 | 213 | mir_window_spec_release(spec); | 213 | mir_window_spec_release(spec); |
| 1321 | 214 | if (!mir_window_is_valid(window)) | 214 | if (!mir_window_is_valid(window)) |
| 1322 | 215 | throw std::runtime_error("Failed to create MirWindow"); | 215 | throw std::runtime_error("Failed to create MirWindow"); |
| 1323 | 216 | 216 | ||
| 1324 | === modified file 'tests/test-clients/impolite-shutdown/scroll.cpp' | |||
| 1325 | --- tests/test-clients/impolite-shutdown/scroll.cpp 2017-01-18 02:29:37 +0000 | |||
| 1326 | +++ tests/test-clients/impolite-shutdown/scroll.cpp 2017-01-19 08:14:45 +0000 | |||
| 1327 | @@ -82,7 +82,7 @@ | |||
| 1328 | 82 | mir_window_spec_set_name(spec.get(), __PRETTY_FUNCTION__); | 82 | mir_window_spec_set_name(spec.get(), __PRETTY_FUNCTION__); |
| 1329 | 83 | mir_window_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware); | 83 | mir_window_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware); |
| 1330 | 84 | 84 | ||
| 1332 | 85 | MirWindow *window = mir_create_window_sync(spec.get()); | 85 | MirWindow *window = mir_create_window(spec.get()); |
| 1333 | 86 | spec.reset(); | 86 | spec.reset(); |
| 1334 | 87 | 87 | ||
| 1335 | 88 | assert(window != NULL); | 88 | assert(window != NULL); |
| 1336 | 89 | 89 | ||
| 1337 | === modified file 'tests/test-clients/mir-stress/src/client.cpp' | |||
| 1338 | --- tests/test-clients/mir-stress/src/client.cpp 2017-01-18 13:59:18 +0000 | |||
| 1339 | +++ tests/test-clients/mir-stress/src/client.cpp 2017-01-19 08:14:45 +0000 | |||
| 1340 | @@ -78,7 +78,7 @@ | |||
| 1341 | 78 | mir_window_spec_set_name(spec, __PRETTY_FUNCTION__); | 78 | mir_window_spec_set_name(spec, __PRETTY_FUNCTION__); |
| 1342 | 79 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); | 79 | mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software); |
| 1343 | 80 | 80 | ||
| 1345 | 81 | surface_ = mir_create_window_sync(spec); | 81 | surface_ = mir_create_window(spec); |
| 1346 | 82 | mir_window_spec_release(spec); | 82 | mir_window_spec_release(spec); |
| 1347 | 83 | 83 | ||
| 1348 | 84 | return true; | 84 | return true; |
PASSED: Continuous integration, rev:3936
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/