← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/server/graphics/default_configuration.cpp

  • Committer: Package Import Robot
  • Author(s): CI Train Bot
  • Date: 2015-05-12 13:12:55 UTC
  • mto: This revision was merged to the branch mainline in revision 96.
  • Revision ID: package-import@ubuntu.com-20150512131255-y7z12i8n4pbvo70x
Tags: upstream-0.13.0+15.10.20150512
Import upstream version 0.13.0+15.10.20150512

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/graphics/default_configuration.cpp
22
22
 
23
23
#include "default_display_configuration_policy.h"
24
24
#include "nested/mir_client_host_connection.h"
25
 
#include "nested/nested_display.h"
 
25
#include "nested/cursor.h"
 
26
#include "nested/display.h"
26
27
#include "offscreen/display.h"
27
28
#include "software_cursor.h"
28
29
 
145
146
            }
146
147
            else if (the_options()->is_set(options::host_socket_opt))
147
148
            {
148
 
                return std::make_shared<mgn::NestedDisplay>(
 
149
                return std::make_shared<mgn::Display>(
149
150
                    the_graphics_platform(),
150
151
                    the_host_connection(),
151
152
                    the_input_dispatcher(),
152
153
                    the_display_report(),
153
154
                    the_display_configuration_policy(),
154
 
                    the_gl_config());
 
155
                    the_gl_config(),
 
156
                    the_cursor_listener());
155
157
            }
156
158
            {
157
159
                return the_graphics_platform()->create_display(
168
170
    return cursor(
169
171
        [this]() -> std::shared_ptr<mg::Cursor>
170
172
        {
 
173
            if (the_options()->is_set(options::host_socket_opt))
 
174
                return std::make_shared<mgn::Cursor>(the_host_connection(), the_default_cursor_image());
 
175
            
171
176
            // We try to create a hardware cursor, if this fails we use a software cursor
172
177
            auto hardware_cursor = the_display()->create_hardware_cursor(the_default_cursor_image());
173
178
            if (hardware_cursor)