← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

« back to all changes in this revision

Viewing changes to examples/demo-shell/demo_shell.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2013-08-07 06:10:58 UTC
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: package-import@ubuntu.com-20130807061058-96qv8oz6o40xvvne
Tags: upstream-0.0.8+13.10.20130807.1
Import upstream version 0.0.8+13.10.20130807.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/demo-shell/demo_shell.cpp
30
30
#include "mir/shell/session_container.h"
31
31
#include "mir/shell/organising_surface_factory.h"
32
32
#include "mir/graphics/display.h"
 
33
#include "mir/input/composite_event_filter.h"
33
34
 
34
35
#include <iostream>
35
36
 
47
48
struct DemoServerConfiguration : mir::examples::ServerConfiguration
48
49
{
49
50
    DemoServerConfiguration(int argc, char const* argv[],
50
 
                            std::initializer_list<std::shared_ptr<mi::EventFilter> const> const& filter_list)
 
51
                            std::initializer_list<std::shared_ptr<mi::EventFilter>> const& filter_list)
51
52
      : ServerConfiguration(argc, argv),
52
53
        filter_list(filter_list)
53
54
    {
70
71
            });
71
72
    }
72
73
 
73
 
    std::initializer_list<std::shared_ptr<mi::EventFilter> const> the_event_filters() override
 
74
    std::shared_ptr<mi::CompositeEventFilter> the_composite_event_filter() override
74
75
    {
75
 
        return filter_list;
 
76
        auto composite_filter = ServerConfiguration::the_composite_event_filter();
 
77
        for (auto const& filter : filter_list)
 
78
            composite_filter->append(filter);
 
79
 
 
80
        return composite_filter;
76
81
    }
77
82
 
78
 
    std::initializer_list<std::shared_ptr<mi::EventFilter> const> const filter_list;
 
83
    std::vector<std::shared_ptr<mi::EventFilter>> const filter_list;
79
84
};
80
85
 
81
86
}