← Back to branch summary

~cemil-azizoglu/mir/improve-raii-take2

« back to all changes in this revision

Viewing changes to src/server/scene/basic_surface.cpp

  • Committer: Cemil Azizoglu
  • Date: 2015-02-26 23:37:35 UTC
  • mfrom: (2323.1.24 development-branch)
  • Revision ID: cemil.azizoglu@canonical.com-20150226233735-zm2j3eunf26b2hgb
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/scene/basic_surface.cpp
25
25
#include "mir/shell/input_targeter.h"
26
26
#include "mir/input/input_sender.h"
27
27
#include "mir/graphics/buffer.h"
 
28
#include "mir/geometry/displacement.h"
28
29
 
29
30
#include "mir/scene/scene_report.h"
30
31
 
106
107
        { observer->client_surface_close_requested(); });
107
108
}
108
109
 
 
110
void ms::SurfaceObservers::keymap_changed(xkb_rule_names const& rules)
 
111
{
 
112
    for_each([&rules](std::shared_ptr<SurfaceObserver> const& observer)
 
113
        { observer->keymap_changed(rules); });
 
114
}
 
115
 
109
116
 
110
117
ms::BasicSurface::BasicSurface(
111
118
    std::string const& name,
323
330
        return true;
324
331
 
325
332
    // TODO: Perhaps creates some issues with transformation.
326
 
    auto local_point = geom::Point{geom::X{point.x.as_uint32_t()-surface_rect.top_left.x.as_uint32_t()},
327
 
                                   geom::Y{point.y.as_uint32_t()-surface_rect.top_left.y.as_uint32_t()}};
 
333
    auto local_point = geom::Point{0, 0} + (point-surface_rect.top_left);
328
334
 
329
335
    for (auto const& rectangle : custom_input_rectangles)
330
336
    {
742
748
{
743
749
    input_sender->send_event(event, server_input_channel);
744
750
}
 
751
 
 
752
void ms::BasicSurface::set_keymap(xkb_rule_names const& rules)
 
753
{
 
754
    observers.keymap_changed(rules);
 
755
}