1
=== modified file 'src/platforms/evdev/platform.cpp'
2
--- src/platforms/evdev/platform.cpp	2015-09-18 08:31:26 +0000
3
+++ src/platforms/evdev/platform.cpp	2015-11-03 15:24:07 +0000
4
@@ -112,17 +112,17 @@
5
112
                return;
112
                return;
6
113
            if (event == mu::Monitor::ADDED)
113
            if (event == mu::Monitor::ADDED)
7
114
            {
114
            {
9
115
                log_info("udev:device added %s", dev.devnode());
115
                log_debug("udev:device added %s", dev.devnode());
10
116
                device_added(dev);
116
                device_added(dev);
11
117
            }
117
            }
12
118
            if (event == mu::Monitor::REMOVED)
118
            if (event == mu::Monitor::REMOVED)
13
119
            {
119
            {
15
120
                log_info("udev:device removed %s", dev.devnode());
120
                log_debug("udev:device removed %s", dev.devnode());
16
121
                device_removed(dev);
121
                device_removed(dev);
17
122
            }
122
            }
18
123
            if (event == mu::Monitor::CHANGED)
123
            if (event == mu::Monitor::CHANGED)
19
124
            {
124
            {
21
125
                log_info("udev:device changed %s", dev.devnode());
125
                log_debug("udev:device changed %s", dev.devnode());
22
126
                device_changed(dev);
126
                device_changed(dev);
23
127
            }
127
            }
24
128
        });
128
        });
25
@@ -138,7 +138,7 @@
26
138
    {
138
    {
27
139
        if (device.devnode() != nullptr)
139
        if (device.devnode() != nullptr)
28
140
        {
140
        {
30
141
            log_info("udev:device added %s", device.devnode());
141
            log_debug("udev:device added %s", device.devnode());
31
142
            device_added(device);
142
            device_added(device);
32
143
        }
143
        }
33
144
    }
144
    }
34
@@ -156,7 +156,7 @@
35
156
    if (!device_ptr)
156
    if (!device_ptr)
36
157
    {
157
    {
37
158
        report->failed_to_open_input_device(dev.devnode(), "evdev-input");
158
        report->failed_to_open_input_device(dev.devnode(), "evdev-input");
39
159
        log_info("libinput refused to open device %s", dev.devnode());
159
        log_debug("libinput refused to open device %s", dev.devnode());
40
160
        return;
160
        return;
41
161
    }
161
    }
42
162
162
43
@@ -177,7 +177,7 @@
44
177
        report->opened_input_device(dev.devnode(), "evdev-input");
177
        report->opened_input_device(dev.devnode(), "evdev-input");
45
178
    } catch(...)
178
    } catch(...)
46
179
    {
179
    {
48
180
        mir::log_error("Failure opening device %s", dev.devnode());
180
        log_error("Failure opening device %s", dev.devnode());
49
181
        report->failed_to_open_input_device(dev.devnode(), "evdev-input");
181
        report->failed_to_open_input_device(dev.devnode(), "evdev-input");
50
182
    }
182
    }
51
183
}
183
}
52
184
184
53
=== modified file 'src/server/input/default_input_device_hub.cpp'
54
--- src/server/input/default_input_device_hub.cpp	2015-10-19 10:00:22 +0000
55
+++ src/server/input/default_input_device_hub.cpp	2015-11-03 15:24:07 +0000
56
@@ -35,12 +35,42 @@
57
35
#include "boost/throw_exception.hpp"
35
#include "boost/throw_exception.hpp"
58
36
36
59
37
#include <algorithm>
37
#include <algorithm>
60
38
#include <sstream>
61
38
#include <atomic>
39
#include <atomic>
62
39
40
63
40
namespace mi = mir::input;
41
namespace mi = mir::input;
64
41
namespace geom = mir::geometry;
42
namespace geom = mir::geometry;
65
42
namespace mev = mir::events;
43
namespace mev = mir::events;
66
43
44
67
45
namespace
68
46
{
69
47
std::string to_string(mi::DeviceCapabilities caps)
70
48
{
71
49
    std::stringstream out;
72
50
    if (contains(caps, mi::DeviceCapability::touchpad))
73
51
        out << " touchpad";
74
52
    else if (contains(caps, mi::DeviceCapability::pointer))
75
53
        out << " mouse";
76
54
77
55
    if (contains(caps, mi::DeviceCapability::multitouch) ||
78
56
        contains(caps, mi::DeviceCapability::touchscreen))
79
57
        out << " touchscreen";
80
58
81
59
    if (contains(caps, mi::DeviceCapability::joystick))
82
60
        out << " joystick";
83
61
    else if (contains(caps, mi::DeviceCapability::gamepad))
84
62
        out << " gamepad";
85
63
86
64
    if (contains(caps, mi::DeviceCapability::alpha_numeric))
87
65
        out << " keyboard";
88
66
    else if (contains(caps, mi::DeviceCapability::keyboard))
89
67
        out << " keypad";
90
68
91
69
    return out.str();
92
70
}
93
71
94
72
}
95
73
96
44
mi::DefaultInputDeviceHub::DefaultInputDeviceHub(
74
mi::DefaultInputDeviceHub::DefaultInputDeviceHub(
97
45
    std::shared_ptr<mi::InputDispatcher> const& input_dispatcher,
75
    std::shared_ptr<mi::InputDispatcher> const& input_dispatcher,
98
46
    std::shared_ptr<dispatch::MultiplexingDispatchable> const& input_multiplexer,
76
    std::shared_ptr<dispatch::MultiplexingDispatchable> const& input_multiplexer,
99
@@ -233,6 +263,7 @@
100
233
{
263
{
101
234
    handles.push_back(handle);
264
    handles.push_back(handle);
102
235
265
103
266
    log_info("Input device %d:%s added as%s", handle->id(), handle->name().c_str(), to_string(handle->capabilities()).c_str());
104
236
    for (auto const& observer : observers)
267
    for (auto const& observer : observers)
105
237
    {
268
    {
106
238
        observer->device_added(handles.back());
269
        observer->device_added(handles.back());
107
@@ -248,6 +279,8 @@
108
248
279
109
249
    if (handle_it == end(handles))
280
    if (handle_it == end(handles))
110
250
        return;
281
        return;
111
282
112
283
    log_info("Input device %d:%s removed", (*handle_it)->id(), (*handle_it)->name().c_str());
113
251
    for (auto const& observer : observers)
284
    for (auto const& observer : observers)
114
252
    {
285
    {
115
253
        observer->device_removed(*handle_it);
286
        observer->device_removed(*handle_it);
Status:	Work in progress
Proposed branch:	lp:~andreas-pokorny/mir/better-input-device-related-logs
Merge into:	lp:mir
Diff against target:	115 lines (+39/-6) 2 files modified src/platforms/evdev/platform.cpp (+6/-6) src/server/input/default_input_device_hub.cpp (+33/-0)
To merge this branch:	bzr merge lp:~andreas-pokorny/mir/better-input-device-related-logs
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-11-30
Cemil Azizoglu (community)			Approve on 2015-11-19
Alexandros Frantzis (community)			Needs Fixing on 2015-11-12
Alan Griffiths			Abstain on 2015-11-12
Kevin DuBois (community)		2015-11-03	Approve on 2015-11-04
Review via email: mp+276549@code.launchpad.net