← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to src/server/graphics/nested/display.cpp

  • Committer: Package Import Robot
  • Author(s): Alexandros Frantzis
  • Date: 2015-10-08 16:12:19 UTC
  • mto: This revision was merged to the branch mainline in revision 109.
  • Revision ID: package-import@ubuntu.com-20151008161219-emk4a1ys51yy0wjb
Tags: upstream-0.17.0+15.10.20151008.2
Import upstream version 0.17.0+15.10.20151008.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/graphics/nested/display.cpp
273
273
 
274
274
void mgn::Display::pause()
275
275
{
276
 
    // TODO Do we "own" the cursor or does the host mir?
277
 
    // If we "own" the cursor then we need to hide it
 
276
    // No need to do anything
278
277
}
279
278
 
280
279
void mgn::Display::resume()
281
280
{
282
 
    // TODO Do we "own" the cursor or does the host mir?
283
 
    // TODO If we "own" the cursor then we need to restore it
 
281
    // No need to do anything
284
282
}
285
283
 
286
 
auto mgn::Display::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /* initial image */)->std::shared_ptr<Cursor>
 
284
auto mgn::Display::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /*initial_image*/) -> std::shared_ptr<mg::Cursor>
287
285
{
288
 
    // TODO Do we "own" the cursor or does the host mir?
289
 
    return std::shared_ptr<Cursor>();
 
286
    BOOST_THROW_EXCEPTION(std::logic_error("Initialization loop: we already need the Cursor when creating the Display"));
 
287
    // So we can't do this: return std::make_shared<Cursor>(connection, initial_image);
290
288
}
291
289
 
292
290
std::unique_ptr<mg::GLContext> mgn::Display::create_gl_context()