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

xcb: Add more debug info for XCB_INPUT event

Browse Source 
Change-Id: I99bba80659a103aa79426ae94cd04db2c5d851d6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 6a91ad7b5b429a9e277a4eedd7161b052b3acf68)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Liang Qi 2021-04-15 12:17:32 +02:00 committed by Qt Cherry-pick Bot
parent 3795e4dda5
commit 775a6329c8
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,6 +221,12 @@ void QXcbConnection::printXcbEvent(const QLoggingCategory &log, const char *mess
} }
#define CASE_PRINT_AND_RETURN(name) case name : PRINT_AND_RETURN(#name); #define CASE_PRINT_AND_RETURN(name) case name : PRINT_AND_RETURN(#name);
#define XI_PRINT_AND_RETURN(name) { \
qCDebug(log, "%s | XInput Event(%s) | sequence: %d", message, name, sequence); \
return; \
}
#define XI_CASE_PRINT_AND_RETURN(name) case name : XI_PRINT_AND_RETURN(#name);
switch (response_type) { switch (response_type) {
CASE_PRINT_AND_RETURN( XCB_KEY_PRESS ); CASE_PRINT_AND_RETURN( XCB_KEY_PRESS );
CASE_PRINT_AND_RETURN( XCB_KEY_RELEASE ); CASE_PRINT_AND_RETURN( XCB_KEY_RELEASE );
@ -255,7 +261,44 @@ void QXcbConnection::printXcbEvent(const QLoggingCategory &log, const char *mess
CASE_PRINT_AND_RETURN( XCB_COLORMAP_NOTIFY ); CASE_PRINT_AND_RETURN( XCB_COLORMAP_NOTIFY );
CASE_PRINT_AND_RETURN( XCB_CLIENT_MESSAGE ); CASE_PRINT_AND_RETURN( XCB_CLIENT_MESSAGE );
CASE_PRINT_AND_RETURN( XCB_MAPPING_NOTIFY ); CASE_PRINT_AND_RETURN( XCB_MAPPING_NOTIFY );
CASE_PRINT_AND_RETURN( XCB_GE_GENERIC ); case XCB_GE_GENERIC: {
if (hasXInput2() && isXIEvent(event)) {
auto *xiDeviceEvent = reinterpret_cast<const xcb_input_button_press_event_t*>(event); // qt_xcb_input_device_event_t
switch (xiDeviceEvent->event_type) {
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_KEY_PRESS );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_KEY_RELEASE );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_BUTTON_PRESS );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_BUTTON_RELEASE );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_MOTION );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_ENTER );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_LEAVE );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_FOCUS_IN );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_FOCUS_OUT );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_HIERARCHY );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_PROPERTY );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_RAW_KEY_PRESS );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_RAW_KEY_RELEASE );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_RAW_BUTTON_PRESS );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_RAW_BUTTON_RELEASE );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_RAW_MOTION );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_TOUCH_BEGIN );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_TOUCH_UPDATE );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_TOUCH_END );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_TOUCH_OWNERSHIP );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_RAW_TOUCH_BEGIN );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_RAW_TOUCH_UPDATE );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_RAW_TOUCH_END );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_BARRIER_HIT );
XI_CASE_PRINT_AND_RETURN( XCB_INPUT_BARRIER_LEAVE );
default:
qCDebug(log, "%s | XInput Event(other type) | sequence: %d", message, sequence);
return;
}
} else {
qCDebug(log, "%s | %s(%d) | sequence: %d", message, "XCB_GE_GENERIC", response_type, sequence);
return;
}
}
} }
// XFixes // XFixes
if (isXFixesType(response_type, XCB_XFIXES_SELECTION_NOTIFY)) if (isXFixesType(response_type, XCB_XFIXES_SELECTION_NOTIFY))