Restore safe reinterpret_casts in XWindowsScreen
This commit is contained in:
parent
055370412c
commit
50807bfcb6
|
@ -1169,7 +1169,7 @@ XWindowsScreen::getKeyState() const
|
||||||
Bool
|
Bool
|
||||||
XWindowsScreen::findKeyEvent(Display*, XEvent* xevent, XPointer arg)
|
XWindowsScreen::findKeyEvent(Display*, XEvent* xevent, XPointer arg)
|
||||||
{
|
{
|
||||||
KeyEventFilter* filter = static_cast<KeyEventFilter*>(arg);
|
KeyEventFilter* filter = reinterpret_cast<KeyEventFilter*>(arg);
|
||||||
return (xevent->type == filter->m_event &&
|
return (xevent->type == filter->m_event &&
|
||||||
xevent->xkey.window == filter->m_window &&
|
xevent->xkey.window == filter->m_window &&
|
||||||
xevent->xkey.time == filter->m_time &&
|
xevent->xkey.time == filter->m_time &&
|
||||||
|
@ -1408,7 +1408,7 @@ XWindowsScreen::handleSystemEvent(const Event& event, void*)
|
||||||
default:
|
default:
|
||||||
#if HAVE_XKB_EXTENSION
|
#if HAVE_XKB_EXTENSION
|
||||||
if (m_xkb && xevent->type == m_xkbEventBase) {
|
if (m_xkb && xevent->type == m_xkbEventBase) {
|
||||||
XkbEvent* xkbEvent = static_cast<XkbEvent*>(xevent);
|
XkbEvent* xkbEvent = reinterpret_cast<XkbEvent*>(xevent);
|
||||||
switch (xkbEvent->any.xkb_type) {
|
switch (xkbEvent->any.xkb_type) {
|
||||||
case XkbMapNotify:
|
case XkbMapNotify:
|
||||||
refreshKeyboard(xevent);
|
refreshKeyboard(xevent);
|
||||||
|
|
Loading…
Reference in New Issue