vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libinput] Make signals queueable 

* Declare and register enums as metatypes
* quint32 instead of uint32_t
icc-effect-5.14.5
Martin Gräßlin 2015-09-02 10:10:49 +02:00
parent c50da5bdee
commit ea77d32259
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
input.cpp
View File

@ -283,6 +283,9 @@ InputRedirection::InputRedirection(QObject *parent)
, m_pointerWindow()
, m_shortcuts(new GlobalShortcutsManager(this))
{
qRegisterMetaType<KWin::InputRedirection::KeyboardKeyState>();
qRegisterMetaType<KWin::InputRedirection::PointerButtonState>();
qRegisterMetaType<KWin::InputRedirection::PointerAxis>();
#if HAVE_INPUT
if (Application::usesLibinput()) {
if (VirtualTerminal::self()) {

4
input.h
View File

@ -314,4 +314,8 @@ Qt::KeyboardModifiers Xkb::modifiers() const
} // namespace KWin
Q_DECLARE_METATYPE(KWin::InputRedirection::KeyboardKeyState)
Q_DECLARE_METATYPE(KWin::InputRedirection::PointerButtonState)
Q_DECLARE_METATYPE(KWin::InputRedirection::PointerAxis)
#endif // KWIN_INPUT_H

10
libinput/connection.h
View File

@ -63,11 +63,11 @@ public:
void deactivate();
Q_SIGNALS:
void keyChanged(uint32_t key, InputRedirection::KeyboardKeyState, uint32_t time);
void pointerButtonChanged(uint32_t button, InputRedirection::PointerButtonState state, uint32_t time);
void pointerMotionAbsolute(QPointF orig, QPointF screen, uint32_t time);
void pointerMotion(QPointF delta, uint32_t time);
void pointerAxisChanged(InputRedirection::PointerAxis axis, qreal delta, uint32_t time);
void keyChanged(quint32 key, KWin::InputRedirection::KeyboardKeyState, quint32 time);
void pointerButtonChanged(quint32 button, KWin::InputRedirection::PointerButtonState state, quint32 time);
void pointerMotionAbsolute(QPointF orig, QPointF screen, quint32 time);
void pointerMotion(QPointF delta, quint32 time);
void pointerAxisChanged(KWin::InputRedirection::PointerAxis axis, qreal delta, quint32 time);
void touchFrame();
void touchCanceled();
void touchDown(qint32 id, const QPointF &absolutePos, quint32 time);