← Back to branch summary

~alan-griffiths/mir/mirplatform-install-headers

« back to all changes in this revision

Viewing changes to src/server/default_server_configuration.cpp

  • Committer: Tarmac
  • Author(s): Alexandros Frantzis
  • Date: 2013-08-06 11:58:35 UTC
  • mfrom: (929.1.1 composite-event-filter)
  • Revision ID: tarmac-20130806115835-o08s5szbz20m7taq
server: Make EventFilter customization easier.

Approved by Alan Griffiths, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/default_server_configuration.cpp
60
60
#include "mir/input/null_input_configuration.h"
61
61
#include "mir/input/null_input_report.h"
62
62
#include "mir/input/display_input_region.h"
 
63
#include "mir/input/event_filter_chain.h"
63
64
#include "input/android/default_android_input_configuration.h"
64
65
#include "input/android/android_input_manager.h"
65
66
#include "input/android/android_input_targeter.h"
478
479
    return the_session_manager();
479
480
}
480
481
 
481
 
std::initializer_list<std::shared_ptr<mi::EventFilter> const>
482
 
mir::DefaultServerConfiguration::the_event_filters()
 
482
std::shared_ptr<mi::CompositeEventFilter>
 
483
mir::DefaultServerConfiguration::the_composite_event_filter()
483
484
{
484
 
    return empty_filter_list;
 
485
    return std::make_shared<mi::EventFilterChain>(empty_filter_list);
485
486
}
486
487
 
487
488
std::shared_ptr<mi::InputReport>
542
543
        if (the_options()->get("enable-input", enable_input_default))
543
544
        {
544
545
            input_configuration = std::make_shared<mia::DefaultInputConfiguration>(
545
 
                the_event_filters(),
 
546
                the_composite_event_filter(),
546
547
                the_input_region(),
547
548
                the_cursor_listener(),
548
549
                the_input_report());