← Back to branch summary

~bregma/mir/docs-use-sphinx

« back to all changes in this revision

Viewing changes to src/server/input/default_device.h

  • Committer: Stephen M. Webb
  • Date: 2017-01-05 14:21:43 UTC
  • mfrom: (3665.1.241 development-branch)
  • Revision ID: stephen.webb@canonical.com-20170105142143-xbmxkuvxb6gejs0n
synch with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/input/default_device.h
25
25
#include "mir/input/input_device_info.h"
26
26
#include "mir/input/pointer_settings.h"
27
27
#include "mir/input/touchpad_settings.h"
28
 
#include "mir/input/keyboard_configuration.h"
 
28
#include "mir/input/mir_keyboard_configuration.h"
29
29
#include "mir/optional_value.h"
30
30
 
31
31
#include <memory>
52
52
    std::string name() const override;
53
53
    std::string unique_id() const override;
54
54
 
55
 
    optional_value<PointerConfiguration> pointer_configuration() const override;
56
 
    void apply_pointer_configuration(PointerConfiguration const&) override;
57
 
    optional_value<TouchpadConfiguration> touchpad_configuration() const override;
58
 
    void apply_touchpad_configuration(TouchpadConfiguration const&) override;
59
 
    optional_value<KeyboardConfiguration> keyboard_configuration() const override;
60
 
    void apply_keyboard_configuration(KeyboardConfiguration const&) override;
 
55
    optional_value<MirPointerConfiguration> pointer_configuration() const override;
 
56
    void apply_pointer_configuration(MirPointerConfiguration const&) override;
 
57
    optional_value<MirTouchpadConfiguration> touchpad_configuration() const override;
 
58
    void apply_touchpad_configuration(MirTouchpadConfiguration const&) override;
 
59
    optional_value<MirKeyboardConfiguration> keyboard_configuration() const override;
 
60
    void apply_keyboard_configuration(MirKeyboardConfiguration const&) override;
61
61
private:
62
62
    MirInputDeviceId const device_id;
63
63
    InputDevice& device;
64
64
    InputDeviceInfo const info;
65
65
    optional_value<PointerSettings> pointer;
66
66
    optional_value<TouchpadSettings> touchpad;
67
 
    optional_value<KeyboardConfiguration> keyboard;
 
67
    optional_value<MirKeyboardConfiguration> keyboard;
68
68
    std::shared_ptr<dispatch::ActionQueue> const actions;
69
69
    std::shared_ptr<KeyMapper> const key_mapper;
70
70
};