AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence the _COMPIZ_TOOLKIT_ACTION warning.

Browse Source 
It is still unclear how to act on those
messages. We are already doing this for
other Compiz messages -_COMPIZ_DECOR_*.

Change-Id: I45f76b5f56ee1b07eb4c7398cc85b5d7bed86c4c
Task-number: QTBUG-46954
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
Gatis Paeglis 2015-09-21 15:38:41 +02:00 committed by Gatis Paeglis
parent 78b2719b04
commit 24d0f9ef5a
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -1835,7 +1835,8 @@ static const char * xcb_atomnames = {
"_XSETTINGS_SETTINGS\0" "_XSETTINGS_SETTINGS\0"
"_COMPIZ_DECOR_PENDING\0" "_COMPIZ_DECOR_PENDING\0"
"_COMPIZ_DECOR_REQUEST\0" "_COMPIZ_DECOR_REQUEST\0"
"_COMPIZ_DECOR_DELETE_PIXMAP\0" // \0\0 terminates loop. "_COMPIZ_DECOR_DELETE_PIXMAP\0"
"_COMPIZ_TOOLKIT_ACTION\0" // \0\0 terminates loop.
}; };
QXcbAtom::Atom QXcbConnection::qatom(xcb_atom_t xatom) const QXcbAtom::Atom QXcbConnection::qatom(xcb_atom_t xatom) const

1
src/plugins/platforms/xcb/qxcbconnection.h
View File

@ -286,6 +286,7 @@ namespace QXcbAtom {
_COMPIZ_DECOR_PENDING, _COMPIZ_DECOR_PENDING,
_COMPIZ_DECOR_REQUEST, _COMPIZ_DECOR_REQUEST,
_COMPIZ_DECOR_DELETE_PIXMAP, _COMPIZ_DECOR_DELETE_PIXMAP,
_COMPIZ_TOOLKIT_ACTION,
NPredefinedAtoms, NPredefinedAtoms,

3
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -1971,7 +1971,8 @@ void QXcbWindow::handleClientMessageEvent(const xcb_client_message_event_t *even
// and other messages. // and other messages.
} else if (event->type == atom(QXcbAtom::_COMPIZ_DECOR_PENDING) } else if (event->type == atom(QXcbAtom::_COMPIZ_DECOR_PENDING)
|| event->type == atom(QXcbAtom::_COMPIZ_DECOR_REQUEST) || event->type == atom(QXcbAtom::_COMPIZ_DECOR_REQUEST)
|| event->type == atom(QXcbAtom::_COMPIZ_DECOR_DELETE_PIXMAP)) { || event->type == atom(QXcbAtom::_COMPIZ_DECOR_DELETE_PIXMAP)
|| event->type == atom(QXcbAtom::_COMPIZ_TOOLKIT_ACTION)) {
//silence the _COMPIZ messages for now //silence the _COMPIZ messages for now
} else { } else {
qWarning() << "QXcbWindow: Unhandled client message:" << connection()->atomName(event->type); qWarning() << "QXcbWindow: Unhandled client message:" << connection()->atomName(event->type);