← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to include/server/mir/shell/shell_wrapper.h

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/server/mir/shell/shell_wrapper.h
30
30
public:
31
31
    explicit ShellWrapper(std::shared_ptr<Shell> const& wrapped);
32
32
 
33
 
    void focus_next() override;
34
 
 
35
 
    std::weak_ptr<scene::Session> focussed_application() const override;
36
 
 
37
 
    void set_focus_to(std::shared_ptr<scene::Session> const& focus) override;
 
33
    void focus_next_session() override;
 
34
 
 
35
    std::shared_ptr<scene::Session> focused_session() const override;
 
36
 
 
37
    void set_focus_to(
 
38
        std::shared_ptr<scene::Session> const& focus_session,
 
39
        std::shared_ptr<scene::Surface> const& focus_surface) override;
 
40
 
 
41
    std::shared_ptr<scene::Surface> focused_surface() const override;
 
42
 
 
43
    auto surface_at(geometry::Point cursor) const -> std::shared_ptr<scene::Surface> override;
 
44
 
 
45
    void raise(SurfaceSet const& surfaces) override;
38
46
 
39
47
    std::shared_ptr<scene::Session> open_session(
40
48
        pid_t client_pid,
43
51
 
44
52
    void close_session(std::shared_ptr<scene::Session> const& session) override;
45
53
 
46
 
    void handle_surface_created(std::shared_ptr<scene::Session> const& session) override;
47
 
 
48
54
    std::shared_ptr<scene::PromptSession> start_prompt_session_for(
49
55
        std::shared_ptr<scene::Session> const& session,
50
56
        scene::PromptSessionCreationParameters const& params) override;
57
63
 
58
64
    frontend::SurfaceId create_surface(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params) override;
59
65
 
 
66
    void modify_surface(std::shared_ptr<scene::Session> const& session, std::shared_ptr<scene::Surface> const& surface, SurfaceSpecification const& modifications) override;
 
67
 
60
68
    void destroy_surface(std::shared_ptr<scene::Session> const& session, frontend::SurfaceId surface) override;
61
69
 
62
70
    int set_surface_attribute(
69
77
        std::shared_ptr<scene::Surface> const& surface,
70
78
        MirSurfaceAttrib attrib) override;
71
79
 
 
80
    void add_display(geometry::Rectangle const& area) override;
 
81
    void remove_display(geometry::Rectangle const& area) override;
 
82
 
 
83
    bool handle(MirEvent const& event) override;
 
84
 
72
85
protected:
73
86
    std::shared_ptr<Shell> const wrapped;
74
87
};