Merge lp:~alan-griffiths/miral/1.3 into lp:miral/release
- 1.3
- Merge into release
Status: | Merged |
---|---|
Approved by: | Alan Griffiths |
Approved revision: | no longer in the source branch. |
Merged at revision: | 359 |
Proposed branch: | lp:~alan-griffiths/miral/1.3 |
Merge into: | lp:miral/release |
Diff against target: |
453 lines (+124/-28) 17 files modified
CMakeLists.txt (+1/-1) debian/changelog (+19/-0) include/miral/set_window_management_policy.h (+3/-3) miral-kiosk/kiosk_main.cpp (+1/-1) miral-shell/decoration_provider.cpp (+12/-1) miral-shell/miral-app.sh (+2/-4) miral-shell/miral-desktop.sh (+1/-1) miral-shell/miral-run.sh (+1/-1) miral-shell/miral-xrun.sh (+21/-1) miral-shell/titlebar_window_manager.cpp (+4/-0) miral/CMakeLists.txt (+1/-1) miral/basic_window_manager.cpp (+10/-0) miral/basic_window_manager.h (+9/-1) miral/set_window_management_policy.cpp (+5/-5) test/test_server.cpp (+1/-1) test/test_window_manager_tools.h (+7/-0) test/workspaces.cpp (+26/-7) |
To merge this branch: | bzr merge lp:~alan-griffiths/miral/1.3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | Approve | ||
Review via email: mp+320973@code.launchpad.net |
Commit message
1.3.1 release
Description of the change
Alan Griffiths (alan-griffiths) : | # |
- 359. By CI Train Bot Account
-
* New upstream release 1.3.2 (https:/
/launchpad. net/miral/ +milestone/ 1.3.2)
- ABI summary:
. miral ABI unchanged at 2
- Enhancements:
. [miral-shell] Add a keyboard shortcut for forcing fullscreen
- Bugs fixed:
. [miral-examples] With latest zesty's libstdc++-6-dev miral-shell will
crash when trying to draw its background text. (LP: #1677550)
. [miral-examples] Update miral-xrun to match GDK changes (LP: #1675115)
. [miral-examples] change the server and client launch scripts to avoid
using the default Mir socket (LP: #1675794)
. [libmiral] Fix FTBFS against Mir < 0.26 (Xenial, Yakkety)
. [libmiral] correct spelling of miral/set_window_ management_ policy. h
. Update to fix FTBFS against lp:mir (and clang)
Preview Diff
1 | === modified file 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2017-03-15 17:44:36 +0000 |
3 | +++ CMakeLists.txt 2017-03-30 14:15:54 +0000 |
4 | @@ -42,7 +42,7 @@ |
5 | |
6 | set(MIRAL_VERSION_MAJOR 1) |
7 | set(MIRAL_VERSION_MINOR 3) |
8 | -set(MIRAL_VERSION_PATCH 1) |
9 | +set(MIRAL_VERSION_PATCH 2) |
10 | |
11 | set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH}) |
12 | |
13 | |
14 | === modified file 'debian/changelog' |
15 | --- debian/changelog 2017-03-16 18:17:41 +0000 |
16 | +++ debian/changelog 2017-03-30 14:15:54 +0000 |
17 | @@ -1,3 +1,22 @@ |
18 | +miral (1.3.2) UNRELEASED; urgency=medium |
19 | + |
20 | + * New upstream release 1.3.2 (https://launchpad.net/miral/+milestone/1.3.2) |
21 | + - ABI summary: |
22 | + . miral ABI unchanged at 2 |
23 | + - Enhancements: |
24 | + . [miral-shell] Add a keyboard shortcut for forcing fullscreen |
25 | + - Bugs fixed: |
26 | + . [miral-examples] With latest zesty's libstdc++-6-dev miral-shell will |
27 | + crash when trying to draw its background text. (LP: #1677550) |
28 | + . [miral-examples] Update miral-xrun to match GDK changes (LP: #1675115) |
29 | + . [miral-examples] change the server and client launch scripts to avoid |
30 | + using the default Mir socket (LP: #1675794) |
31 | + . [libmiral] Fix FTBFS against Mir < 0.26 (Xenial, Yakkety) |
32 | + . [libmiral] correct spelling of miral/set_window_management_policy.h |
33 | + . Update to fix FTBFS against lp:mir (and clang) |
34 | + |
35 | + -- Alan Griffiths <alan.griffiths@canonical.com> Mon, 24 Mar 2017 10:00:20 +0000 |
36 | + |
37 | miral (1.3.1+17.04.20170316.1-0ubuntu1) zesty; urgency=medium |
38 | |
39 | * New upstream release 1.3.1 (https://launchpad.net/miral/+milestone/1.3.1) |
40 | |
41 | === renamed file 'include/miral/set_window_managment_policy.h' => 'include/miral/set_window_management_policy.h' |
42 | --- include/miral/set_window_managment_policy.h 2017-03-06 10:50:19 +0000 |
43 | +++ include/miral/set_window_management_policy.h 2017-03-30 14:15:54 +0000 |
44 | @@ -16,8 +16,8 @@ |
45 | * Authored by: Alan Griffiths <alan@octopull.co.uk> |
46 | */ |
47 | |
48 | -#ifndef MIRAL_SET_WINDOW_MANAGER_H |
49 | -#define MIRAL_SET_WINDOW_MANAGER_H |
50 | +#ifndef MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H |
51 | +#define MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H |
52 | |
53 | #include <memory> |
54 | |
55 | @@ -51,4 +51,4 @@ |
56 | } |
57 | } |
58 | |
59 | -#endif //MIRAL_SET_WINDOW_MANAGER_H |
60 | +#endif //MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H |
61 | |
62 | === modified file 'miral-kiosk/kiosk_main.cpp' |
63 | --- miral-kiosk/kiosk_main.cpp 2017-03-06 10:50:19 +0000 |
64 | +++ miral-kiosk/kiosk_main.cpp 2017-03-30 14:15:54 +0000 |
65 | @@ -22,7 +22,7 @@ |
66 | #include <miral/application_authorizer.h> |
67 | #include <miral/command_line_option.h> |
68 | #include <miral/keymap.h> |
69 | -#include <miral/set_window_managment_policy.h> |
70 | +#include <miral/set_window_management_policy.h> |
71 | #include <miral/internal_client.h> |
72 | |
73 | #include <unistd.h> |
74 | |
75 | === modified file 'miral-shell/decoration_provider.cpp' |
76 | --- miral-shell/decoration_provider.cpp 2017-03-15 12:36:17 +0000 |
77 | +++ miral-shell/decoration_provider.cpp 2017-03-30 14:15:54 +0000 |
78 | @@ -42,6 +42,12 @@ |
79 | |
80 | void null_window_callback(MirWindow*, void*) {} |
81 | |
82 | +struct preferred_codecvt : std::codecvt_byname<wchar_t, char, std::mbstate_t> |
83 | +{ |
84 | + preferred_codecvt() : std::codecvt_byname<wchar_t, char, std::mbstate_t>("") {} |
85 | + ~preferred_codecvt() = default; |
86 | +}; |
87 | + |
88 | struct Printer |
89 | { |
90 | Printer(); |
91 | @@ -53,7 +59,7 @@ |
92 | void printhelp(MirGraphicsRegion const& region); |
93 | |
94 | private: |
95 | - std::wstring_convert<std::codecvt_utf16<wchar_t>> converter; |
96 | + std::wstring_convert<preferred_codecvt> converter; |
97 | |
98 | bool working = false; |
99 | FT_Library lib; |
100 | @@ -112,6 +118,7 @@ |
101 | } |
102 | |
103 | void Printer::print(MirGraphicsRegion const& region, std::string const& title_, int const intensity) |
104 | +try |
105 | { |
106 | if (!working) |
107 | return; |
108 | @@ -151,6 +158,10 @@ |
109 | base_y += glyph->advance.y >> 6; |
110 | } |
111 | } |
112 | +catch (...) |
113 | +{ |
114 | + std::cerr << "WARNING: failed render title: \"" << title_ << "\"\n"; |
115 | +} |
116 | |
117 | void Printer::printhelp(MirGraphicsRegion const& region) |
118 | { |
119 | |
120 | === modified file 'miral-shell/miral-app.sh' |
121 | --- miral-shell/miral-app.sh 2017-02-01 11:11:20 +0000 |
122 | +++ miral-shell/miral-app.sh 2017-03-30 14:15:54 +0000 |
123 | @@ -11,13 +11,11 @@ |
124 | then |
125 | echo "Error: Host endpoint '${MIR_SOCKET}' does not exists"; exit 1 |
126 | fi |
127 | - i=0; while [ -e "${XDG_RUNTIME_DIR}/mir_socket${i}" ]; do let i+=1 ;done |
128 | - socket=${XDG_RUNTIME_DIR}/mir_socket${i} |
129 | hostsocket='--host-socket ${MIR_SOCKET}' |
130 | -else |
131 | - socket=${XDG_RUNTIME_DIR}/mir_socket |
132 | fi |
133 | |
134 | +socket=${XDG_RUNTIME_DIR}/miral_socket |
135 | + |
136 | while [ $# -gt 0 ] |
137 | do |
138 | if [ "$1" == "--help" -o "$1" == "-h" ] |
139 | |
140 | === modified file 'miral-shell/miral-desktop.sh' |
141 | --- miral-shell/miral-desktop.sh 2017-02-01 11:11:20 +0000 |
142 | +++ miral-shell/miral-desktop.sh 2017-03-30 14:15:54 +0000 |
143 | @@ -1,6 +1,6 @@ |
144 | #! /bin/bash |
145 | |
146 | -socket=${XDG_RUNTIME_DIR}/mir_socket |
147 | +socket=${XDG_RUNTIME_DIR}/miral_socket |
148 | miral_server=miral-shell |
149 | launcher='gnome-terminal --app-id com.canonical.miral.Terminal' |
150 | bindir=$(dirname $0) |
151 | |
152 | === modified file 'miral-shell/miral-run.sh' |
153 | --- miral-shell/miral-run.sh 2016-10-06 15:36:15 +0000 |
154 | +++ miral-shell/miral-run.sh 2017-03-30 14:15:54 +0000 |
155 | @@ -3,4 +3,4 @@ |
156 | then extras='--app-id com.canonical.miral.Terminal' |
157 | fi |
158 | unset QT_QPA_PLATFORMTHEME |
159 | -GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}& |
160 | +MIR_SOCKET=${XDG_RUNTIME_DIR}/miral_socket GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}& |
161 | |
162 | === modified file 'miral-shell/miral-xrun.sh' |
163 | --- miral-shell/miral-xrun.sh 2016-10-06 15:36:15 +0000 |
164 | +++ miral-shell/miral-xrun.sh 2017-03-30 14:15:54 +0000 |
165 | @@ -9,6 +9,26 @@ |
166 | unset GDK_BACKEND |
167 | unset QT_QPA_PLATFORM |
168 | unset SDL_VIDEODRIVER |
169 | -Xmir -rootless :${port} & pid=$! |
170 | + |
171 | +while [ $# -gt 0 ] |
172 | +do |
173 | + if [ "$1" == "--help" -o "$1" == "-h" ] |
174 | + then |
175 | + echo "$(basename $0) - Handy launch script for providing an Xmir X11 server" |
176 | + echo "Usage: $(basename $0) [options] command" |
177 | + echo "Options are:" |
178 | + echo " -force set toolkit environment variables to force X11 use" |
179 | + exit 0 |
180 | + elif [ "$1" == "-force" ]; |
181 | + then |
182 | + export GDK_BACKEND=x11 |
183 | + export QT_QPA_PLATFORM=xcb |
184 | + export SDL_VIDEODRIVER=x11 |
185 | + else break |
186 | + fi |
187 | + shift |
188 | +done |
189 | + |
190 | +MIR_SOCKET=${XDG_RUNTIME_DIR}/miral_socket Xmir -rootless :${port} & pid=$! |
191 | DISPLAY=:${port} "$@" |
192 | kill ${pid} |
193 | |
194 | === modified file 'miral-shell/titlebar_window_manager.cpp' |
195 | --- miral-shell/titlebar_window_manager.cpp 2017-03-02 17:40:20 +0000 |
196 | +++ miral-shell/titlebar_window_manager.cpp 2017-03-30 14:15:54 +0000 |
197 | @@ -413,6 +413,10 @@ |
198 | toggle(mir_window_state_horizmaximized); |
199 | return true; |
200 | |
201 | + case mir_input_event_modifier_meta: |
202 | + toggle(mir_window_state_fullscreen); |
203 | + return true; |
204 | + |
205 | default: |
206 | break; |
207 | } |
208 | |
209 | === modified file 'miral/CMakeLists.txt' |
210 | --- miral/CMakeLists.txt 2017-03-07 16:35:29 +0000 |
211 | +++ miral/CMakeLists.txt 2017-03-30 14:15:54 +0000 |
212 | @@ -49,7 +49,7 @@ |
213 | internal_client.cpp ${CMAKE_SOURCE_DIR}/include/miral/internal_client.h |
214 | set_command_line_handler.cpp ${CMAKE_SOURCE_DIR}/include/miral/set_command_line_handler.h |
215 | set_terminator.cpp ${CMAKE_SOURCE_DIR}/include/miral/set_terminator.h |
216 | - set_window_managment_policy.cpp ${CMAKE_SOURCE_DIR}/include/miral/set_window_managment_policy.h |
217 | + set_window_management_policy.cpp ${CMAKE_SOURCE_DIR}/include/miral/set_window_management_policy.h |
218 | workspace_policy.cpp ${CMAKE_SOURCE_DIR}/include/miral/workspace_policy.h |
219 | window_management_policy.cpp ${CMAKE_SOURCE_DIR}/include/miral/window_management_policy.h |
220 | window_manager_tools.cpp ${CMAKE_SOURCE_DIR}/include/miral/window_manager_tools.h |
221 | |
222 | === modified file 'miral/basic_window_manager.cpp' |
223 | --- miral/basic_window_manager.cpp 2017-03-16 17:00:18 +0000 |
224 | +++ miral/basic_window_manager.cpp 2017-03-30 14:15:54 +0000 |
225 | @@ -359,6 +359,16 @@ |
226 | policy->handle_raise_window(info_for(surface)); |
227 | } |
228 | |
229 | +#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0) |
230 | +void miral::BasicWindowManager::handle_request_drag_and_drop( |
231 | + std::shared_ptr<mir::scene::Session> const& /*session*/, |
232 | + std::shared_ptr<mir::scene::Surface> const& /*surface*/, |
233 | + uint64_t /*timestamp*/) |
234 | +{ |
235 | + // TODO |
236 | +} |
237 | +#endif |
238 | + |
239 | int miral::BasicWindowManager::set_surface_attribute( |
240 | std::shared_ptr<scene::Session> const& /*application*/, |
241 | std::shared_ptr<scene::Surface> const& surface, |
242 | |
243 | === modified file 'miral/basic_window_manager.h' |
244 | --- miral/basic_window_manager.h 2017-03-02 14:29:04 +0000 |
245 | +++ miral/basic_window_manager.h 2017-03-30 14:15:54 +0000 |
246 | @@ -30,6 +30,7 @@ |
247 | #include <mir/geometry/rectangles.h> |
248 | #include <mir/shell/abstract_shell.h> |
249 | #include <mir/shell/window_manager.h> |
250 | +#include <mir/version.h> |
251 | |
252 | #include <boost/bimap.hpp> |
253 | #include <boost/bimap/multiset_of.hpp> |
254 | @@ -95,6 +96,13 @@ |
255 | std::shared_ptr<mir::scene::Surface> const& surface, |
256 | uint64_t timestamp) override; |
257 | |
258 | +#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0) |
259 | + void handle_request_drag_and_drop( |
260 | + std::shared_ptr<mir::scene::Session> const& session, |
261 | + std::shared_ptr<mir::scene::Surface> const& surface, |
262 | + uint64_t timestamp) override; |
263 | +#endif |
264 | + |
265 | int set_surface_attribute( |
266 | std::shared_ptr<mir::scene::Session> const& /*application*/, |
267 | std::shared_ptr<mir::scene::Surface> const& surface, |
268 | @@ -109,7 +117,7 @@ |
269 | |
270 | void move_workspace_content_to_workspace( |
271 | std::shared_ptr<Workspace> const& to_workspace, |
272 | - std::shared_ptr<Workspace> const& from_workspace); |
273 | + std::shared_ptr<Workspace> const& from_workspace) override; |
274 | |
275 | void for_each_workspace_containing( |
276 | Window const& window, |
277 | |
278 | === renamed file 'miral/set_window_managment_policy.cpp' => 'miral/set_window_management_policy.cpp' |
279 | --- miral/set_window_managment_policy.cpp 2017-03-06 10:48:02 +0000 |
280 | +++ miral/set_window_management_policy.cpp 2017-03-30 14:15:54 +0000 |
281 | @@ -16,7 +16,7 @@ |
282 | * Authored by: Alan Griffiths <alan@octopull.co.uk> |
283 | */ |
284 | |
285 | -#include "miral/set_window_managment_policy.h" |
286 | +#include "miral/set_window_management_policy.h" |
287 | #include "basic_window_manager.h" |
288 | #include "window_management_trace.h" |
289 | #include "both_versions.h" |
290 | @@ -32,19 +32,19 @@ |
291 | char const* const trace_option = "window-management-trace"; |
292 | } |
293 | |
294 | -MIRAL_BOTH_VERSIONS( |
295 | +MIRAL_FAKE_OLD_SYMBOL( |
296 | _ZN5miral24SetWindowManagmentPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE, |
297 | _ZN5miral25SetWindowManagementPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE) |
298 | |
299 | -MIRAL_BOTH_VERSIONS( |
300 | +MIRAL_FAKE_OLD_SYMBOL( |
301 | _ZNK5miral24SetWindowManagmentPolicyclERN3mir6ServerE, |
302 | _ZNK5miral25SetWindowManagementPolicyclERN3mir6ServerE) |
303 | |
304 | -MIRAL_BOTH_VERSIONS( |
305 | +MIRAL_FAKE_OLD_SYMBOL( |
306 | _ZN5miral24SetWindowManagmentPolicyD1Ev, |
307 | _ZN5miral25SetWindowManagementPolicyD1Ev) |
308 | |
309 | -MIRAL_BOTH_VERSIONS( |
310 | +MIRAL_FAKE_OLD_SYMBOL( |
311 | _ZN5miral24SetWindowManagmentPolicyD2Ev, |
312 | _ZN5miral25SetWindowManagementPolicyD2Ev) |
313 | |
314 | |
315 | === modified file 'test/test_server.cpp' |
316 | --- test/test_server.cpp 2017-02-14 17:11:07 +0000 |
317 | +++ test/test_server.cpp 2017-03-30 14:15:54 +0000 |
318 | @@ -19,7 +19,7 @@ |
319 | #include "test_server.h" |
320 | #include "../miral/basic_window_manager.h" |
321 | |
322 | -#include <miral/set_window_managment_policy.h> |
323 | +#include <miral/set_window_management_policy.h> |
324 | |
325 | #include <mir_test_framework/executable_path.h> |
326 | #include <mir_test_framework/stub_server_platform_factory.h> |
327 | |
328 | === modified file 'test/test_window_manager_tools.h' |
329 | --- test/test_window_manager_tools.h 2017-02-02 11:31:52 +0000 |
330 | +++ test/test_window_manager_tools.h 2017-03-30 14:15:54 +0000 |
331 | @@ -27,6 +27,7 @@ |
332 | #include <mir/shell/display_layout.h> |
333 | #include <mir/shell/focus_controller.h> |
334 | #include <mir/shell/persistent_surface_store.h> |
335 | +#include <mir/version.h> |
336 | |
337 | #include <mir/test/doubles/stub_session.h> |
338 | #include <mir/test/doubles/stub_surface.h> |
339 | @@ -53,6 +54,12 @@ |
340 | |
341 | virtual auto surface_at(mir::geometry::Point /*cursor*/) const -> std::shared_ptr<mir::scene::Surface> override |
342 | { return {}; } |
343 | + |
344 | +#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0) |
345 | + void set_drag_and_drop_handle(std::vector<uint8_t> const& /*handle*/) override {} |
346 | + |
347 | + void clear_drag_and_drop_handle() override {} |
348 | +#endif |
349 | }; |
350 | |
351 | struct StubDisplayLayout : mir::shell::DisplayLayout |
352 | |
353 | === modified file 'test/workspaces.cpp' |
354 | --- test/workspaces.cpp 2017-03-03 12:31:47 +0000 |
355 | +++ test/workspaces.cpp 2017-03-30 14:15:54 +0000 |
356 | @@ -49,7 +49,8 @@ |
357 | WorkspacesWindowManagerPolicy(WindowManagerTools const& tools, Workspaces& test_fixture); |
358 | ~WorkspacesWindowManagerPolicy(); |
359 | |
360 | - void advise_new_window(miral::WindowInfo const& window_info) override; |
361 | + void advise_new_window(miral::WindowInfo const& window_info); |
362 | + void handle_window_ready(miral::WindowInfo& window_info); |
363 | |
364 | MOCK_METHOD2(advise_adding_to_workspace, |
365 | void(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window> const&)); |
366 | @@ -59,6 +60,8 @@ |
367 | |
368 | MOCK_METHOD1(advise_focus_gained, void(miral::WindowInfo const&)); |
369 | |
370 | + MOCK_METHOD1(advise_window_ready, void(miral::WindowInfo const&)); |
371 | + |
372 | Workspaces& test_fixture; |
373 | }; |
374 | |
375 | @@ -72,9 +75,19 @@ |
376 | .create_window(); |
377 | |
378 | client_windows[name] = window; |
379 | + init_window(window); |
380 | + |
381 | + return window; |
382 | + } |
383 | + |
384 | + void init_window(Window const& window) |
385 | + { |
386 | + mir::test::Signal window_ready; |
387 | + EXPECT_CALL(policy(), advise_window_ready(_)).WillOnce(InvokeWithoutArgs([&]{ window_ready.raise(); })); |
388 | + |
389 | mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
390 | |
391 | - return window; |
392 | + EXPECT_TRUE(window_ready.wait_for(1s)); |
393 | } |
394 | |
395 | auto create_tip(std::string const& name, Window const& parent) -> Window |
396 | @@ -87,7 +100,7 @@ |
397 | .create_window(); |
398 | |
399 | client_windows[name] = window; |
400 | - mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
401 | + init_window(window); |
402 | |
403 | return window; |
404 | } |
405 | @@ -100,7 +113,7 @@ |
406 | .create_window(); |
407 | |
408 | client_windows[name] = window; |
409 | - mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
410 | + init_window(window); |
411 | |
412 | return window; |
413 | } |
414 | @@ -221,6 +234,12 @@ |
415 | std::lock_guard<decltype(test_fixture.mutex)> lock{test_fixture.mutex}; |
416 | test_fixture.server_windows[window_info.name()] = window_info.window(); |
417 | } |
418 | + |
419 | +void WorkspacesWindowManagerPolicy::handle_window_ready(miral::WindowInfo& window_info) |
420 | +{ |
421 | + miral::CanonicalWindowManagerPolicy::handle_window_ready(window_info); |
422 | + advise_window_ready(window_info); |
423 | +} |
424 | } |
425 | |
426 | TEST_F(Workspaces, before_a_tree_is_added_to_workspace_it_is_empty) |
427 | @@ -452,7 +471,7 @@ |
428 | .set_name(a_window.c_str()) |
429 | .create_window(); |
430 | |
431 | - mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
432 | + init_window(window); |
433 | |
434 | invoke_tools([&, this](WindowManagerTools& tools) |
435 | { |
436 | @@ -513,7 +532,7 @@ |
437 | .set_name(a_window.c_str()) |
438 | .create_window(); |
439 | |
440 | - mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
441 | + init_window(window); |
442 | |
443 | invoke_tools([&, this](WindowManagerTools& tools) |
444 | { |
445 | @@ -576,7 +595,7 @@ |
446 | .set_name(a_window.c_str()) |
447 | .create_window(); |
448 | |
449 | - mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window)); |
450 | + init_window(window); |
451 | |
452 | invoke_tools([&, this](WindowManagerTools& tools) |
453 | { |
Seen this twice in bileto:
[ RUN ] Workspaces. with_two_ applications_ when_a_ window_ in_a_workspace_ hides_focus_ remains_ in_workspace >/miral- 1.3.2+16. 04.20170330/ test/workspaces .cpp:534: Failure window( ) window( ): a window window( dialog) : dialog
[2017-03-30 07:31:06.592649] mirserver: Starting
[2017-03-30 07:31:06.592873] mirserver: Selected driver: mir:stub-graphics (version 0.26.2)
[2017-03-30 07:31:06.593742] mirserver: Using software cursor
[2017-03-30 07:31:06.624258] mirserver: Selected input driver: mir:stub-input (version: 0.26.2)
[2017-03-30 07:31:06.634376] mirserver: Mir version 0.26.2
[2017-03-30 07:31:06.638238] mirserver: Initial display configuration:
[2017-03-30 07:31:06.651197] mirserver: Output 1: VGA connected, used
[2017-03-30 07:31:06.651288] mirserver: Physical size 0.0" 0x0mm
[2017-03-30 07:31:06.651306] mirserver: Power is on
[2017-03-30 07:31:06.651328] mirserver: Current mode 1600x1600 60.00Hz
[2017-03-30 07:31:06.651346] mirserver: Preferred mode 1600x1600 60.00Hz
[2017-03-30 07:31:06.651362] mirserver: Orientation normal
[2017-03-30 07:31:06.651379] mirserver: Logical size 1600x1600
[2017-03-30 07:31:06.651394] mirserver: Logical position +0+0
/<<BUILDDIR>
Value of: tools.active_
Expected: is equal to 1
Actual: 1 (of type miral::Window)
tools.active_
server_
GMOCK WARNING: focus_gained( @0x7f80003200 8-byte object <80-4A 00-80 7F-00 00-00>)
Uninteresting mock function call - returning directly.
Function call: advise_
Stack trace:
GMOCK WARNING: removing_ from_workspace( @0x7f8000ac30 16-byte object <50-6A 9F-0D 00-00 00-00 40-6A 9F-0D 00-00 00-00>, @0x7f977fd800 { 1 })
Uninteresting mock function call - returning directly.
Function call: advise_
Stack trace:
GMOCK WARNING: focus_gained( @0x7f80007940 8-byte object <50-8A 00-80 7F-00 00-00>) with_two_ applications_ when_a_ window_ in_a_workspace_ hides_focus_ remains_ in_workspace (344 ms)
Uninteresting mock function call - returning directly.
Function call: advise_
Stack trace:
[2017-03-30 07:31:06.925379] mirserver: Stopping
[ FAILED ] Workspaces.