← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to include/server/mir/scene/surface.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/scene/surface.h
66
66
    virtual void show() = 0;
67
67
    virtual bool visible() const = 0;
68
68
    virtual void move_to(geometry::Point const& top_left) = 0;
69
 
    virtual void take_input_focus(std::shared_ptr<shell::InputTargeter> const& targeter) = 0;
70
69
 
71
70
    /**
72
71
     * Sets the input region for this surface.
90
89
    virtual void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& image) override = 0;
91
90
    virtual std::shared_ptr<graphics::CursorImage> cursor_image() const override = 0;
92
91
 
93
 
    virtual void add_observer(std::shared_ptr<SurfaceObserver> const& observer) = 0;
94
 
    virtual void remove_observer(std::weak_ptr<SurfaceObserver> const& observer) = 0;
 
92
    virtual void add_observer(std::shared_ptr<SurfaceObserver> const& observer) override = 0;
 
93
    virtual void remove_observer(std::weak_ptr<SurfaceObserver> const& observer) override = 0;
95
94
 
96
95
    // TODO input_channel() relates to adding and removing the surface
97
96
    // TODO from the scene and is probably not cleanest interface for this.
104
103
    // TODO a legacy of old interactions and needs removing
105
104
    virtual int configure(MirSurfaceAttrib attrib, int value) = 0;
106
105
    // TODO a legacy of old interactions and needs removing
107
 
    virtual int query(MirSurfaceAttrib attrib) = 0;
 
106
    virtual int query(MirSurfaceAttrib attrib) const = 0;
 
107
 
 
108
    virtual void set_keymap(xkb_rule_names const& rules) = 0;
 
109
    virtual void rename(std::string const& title) = 0;
108
110
};
109
111
}
110
112
}