1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset the wl_keyboard/wl_pointer resource pointers if destroyed

Browse Source 
Change-Id: I8693f845817d2dd4b0e0b54352c374f6a0e643d3
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
This commit is contained in:
Giulio Camuffo 2014-08-13 13:20:44 +03:00
parent 208fec2757
commit 68e5d64a83
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/wayland/mockinput.cpp
View File

@ -164,6 +164,13 @@ void Keyboard::sendKey(uint32_t key, uint32_t state)
} }
} }
void Keyboard::keyboard_destroy_resource(wl_keyboard::Resource *resource)
{
if (m_focusResource == resource)
m_focusResource = 0;
}
Pointer::Pointer(Compositor *compositor) Pointer::Pointer(Compositor *compositor)
: wl_pointer() : wl_pointer()
, m_compositor(compositor) , m_compositor(compositor)
@ -210,4 +217,10 @@ void Pointer::sendButton(uint32_t button, uint32_t state)
} }
} }
void Pointer::pointer_destroy_resource(wl_pointer::Resource *resource)
{
if (m_focusResource == resource)
m_focusResource = 0;
}
} }

6
tests/auto/wayland/mockinput.h
View File

@ -88,6 +88,9 @@ public:
void sendKey(uint32_t key, uint32_t state); void sendKey(uint32_t key, uint32_t state);
protected:
void keyboard_destroy_resource(wl_keyboard::Resource *resource) Q_DECL_OVERRIDE;
private: private:
Compositor *m_compositor; Compositor *m_compositor;
@ -107,6 +110,9 @@ public:
void sendMotion(const QPoint &pos); void sendMotion(const QPoint &pos);
void sendButton(uint32_t button, uint32_t state); void sendButton(uint32_t button, uint32_t state);
protected:
void pointer_destroy_resource(wl_pointer::Resource *resource) Q_DECL_OVERRIDE;
private: private:
Compositor *m_compositor; Compositor *m_compositor;