← Back to branch summary

~brandontschaefer/mir/lp.1233089-fix-v-h-scroll

« back to all changes in this revision

Viewing changes to src/server/display_server.cpp

  • Committer: Tarmac
  • Author(s): Kevin DuBois, Alan Griffiths, Alexandros Frantzis, Robert Ancell, Daniel d'Andrada
  • Date: 2013-09-26 04:50:57 UTC
  • mfrom: (1081.3.8 development-branch)
  • Revision ID: tarmac-20130926045057-w43xdxtxz8lhy8fg
frontend, config: Mechanism for connecting via a socket pair.
graphics: android: stop nex4 from tearing
gbm: Blank unused connected outputs.
compositor: tidy up configuration logic for initializing bypass flag.
tests: Add tests for Android's InputReader & friends
Bump libmirserver soname and Mir project version.

Approved by kevin gunn, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/display_server.cpp
25
25
#include "mir/display_changer.h"
26
26
 
27
27
#include "mir/compositor/compositor.h"
28
 
#include "mir/frontend/communicator.h"
 
28
#include "mir/frontend/connector.h"
29
29
#include "mir/graphics/display.h"
30
30
#include "mir/input/input_manager.h"
31
31
 
72
72
          display{config.the_display()},
73
73
          input_configuration{config.the_input_configuration()},
74
74
          compositor{config.the_compositor()},
75
 
          communicator{config.the_communicator()},
 
75
          connector{config.the_connector()},
76
76
          input_manager{config.the_input_manager()},
77
77
          main_loop{config.the_main_loop()},
78
78
          pause_resume_listener{config.the_pause_resume_listener()},
103
103
                [this] { compositor->start(); }};
104
104
 
105
105
            TryButRevertIfUnwinding comm{
106
 
                [this] { communicator->stop(); },
107
 
                [this] { communicator->start(); }};
 
106
                [this] { connector->stop(); },
 
107
                [this] { connector->start(); }};
108
108
 
109
109
            display->pause();
110
110
 
129
129
                [this] { display->pause(); }};
130
130
 
131
131
            TryButRevertIfUnwinding comm{
132
 
                [this] { communicator->start(); },
133
 
                [this] { communicator->stop(); }};
 
132
                [this] { connector->start(); },
 
133
                [this] { connector->stop(); }};
134
134
 
135
135
            if (configure_display_on_resume)
136
136
            {
176
176
    std::shared_ptr<mg::Display> const display;
177
177
    std::shared_ptr<input::InputConfiguration> const input_configuration;
178
178
    std::shared_ptr<mc::Compositor> const compositor;
179
 
    std::shared_ptr<mf::Communicator> const communicator;
 
179
    std::shared_ptr<mf::Connector> const connector;
180
180
    std::shared_ptr<mi::InputManager> const input_manager;
181
181
    std::shared_ptr<mir::MainLoop> const main_loop;
182
182
    std::shared_ptr<mir::PauseResumeListener> const pause_resume_listener;
201
201
 
202
202
void mir::DisplayServer::run()
203
203
{
204
 
    p->communicator->start();
 
204
    p->connector->start();
205
205
    p->compositor->start();
206
206
    p->input_manager->start();
207
207
 
209
209
 
210
210
    p->input_manager->stop();
211
211
    p->compositor->stop();
212
 
    p->communicator->stop();
 
212
    p->connector->stop();
213
213
}
214
214
 
215
215
void mir::DisplayServer::stop()