yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.12'

Browse source
This commit is contained in:
Martin Flöser 2018-02-03 16:04:05 +01:00
commit dca8023207
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libinput/events.cpp
View file

@ -67,7 +67,7 @@ Event *Event::create(libinput_event *event)
Event::Event(libinput_event *event, libinput_event_type type)
: m_event(event)
, m_type(type)
, m_device(Device::getDevice(libinput_event_get_device(m_event)))
, m_device(nullptr)
{
}
@ -76,6 +76,14 @@ Event::~Event()
libinput_event_destroy(m_event);
}
Device *Event::device() const
{
if (!m_device) {
m_device = Device::getDevice(libinput_event_get_device(m_event));
}
return m_device;
}
libinput_device *Event::nativeDevice() const
{
if (m_device) {

6
libinput/events.h
View file

@ -37,9 +37,7 @@ public:
virtual ~Event();
libinput_event_type type() const;
Device *device() const {
return m_device;
}
Device *device() const;
libinput_device *nativeDevice() const;
operator libinput_event*() {
@ -57,7 +55,7 @@ protected:
private:
libinput_event *m_event;
libinput_event_type m_type;
Device *m_device;
mutable Device *m_device;
};
class KeyEvent : public Event