whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xcb: Move QXcbConnection::xi2*() methods() to qxcbconnection_xi2.cpp 

Change-Id: I7af7bd7590b95f6092fcca718931b1f1462c0ae5
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
bb10
Alexander Volkov 2017-02-21 17:49:31 +03:00
parent 8012f38379
commit d4ae7d39c8
2 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2230,52 +2230,6 @@ bool QXcbConnection::xi2MouseEvents() const
}
#endif
#if defined(XCB_USE_XINPUT2)
static int xi2ValuatorOffset(const unsigned char *maskPtr, int maskLen, int number)
{
int offset = 0;
for (int i = 0; i < maskLen; i++) {
if (number < 8) {
if ((maskPtr[i] & (1 << number)) == 0)
return -1;
}
for (int j = 0; j < 8; j++) {
if (j == number)
return offset;
if (maskPtr[i] & (1 << j))
offset++;
}
number -= 8;
}
return -1;
}
bool QXcbConnection::xi2GetValuatorValueIfSet(const void *event, int valuatorNum, double *value)
{
const xXIDeviceEvent *xideviceevent = static_cast<const xXIDeviceEvent *>(event);
const unsigned char *buttonsMaskAddr = (const unsigned char*)&xideviceevent[1];
const unsigned char *valuatorsMaskAddr = buttonsMaskAddr + xideviceevent->buttons_len * 4;
FP3232 *valuatorsValuesAddr = (FP3232*)(valuatorsMaskAddr + xideviceevent->valuators_len * 4);
int valuatorOffset = xi2ValuatorOffset(valuatorsMaskAddr, xideviceevent->valuators_len, valuatorNum);
if (valuatorOffset < 0)
return false;
*value = valuatorsValuesAddr[valuatorOffset].integral;
*value += ((double)valuatorsValuesAddr[valuatorOffset].frac / (1 << 16) / (1 << 16));
return true;
}
void QXcbConnection::xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *event)
{
// xcb event structs contain stuff that wasn't on the wire, the full_sequence field
// adds an extra 4 bytes and generic events cookie data is on the wire right after the standard 32 bytes.
// Move this data back to have the same layout in memory as it was on the wire
// and allow casting, overwriting the full_sequence field.
memmove((char*) event + 32, (char*) event + 36, event->length * 4);
}
#endif // defined(XCB_USE_XINPUT2)
QXcbSystemTrayTracker *QXcbConnection::systemTrayTracker() const
{
if (!m_systemTrayTracker) {

44
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
View File

@ -1008,6 +1008,50 @@ void QXcbConnection::xi2HandleScrollEvent(void *event, ScrollingDevice &scrollin
#endif // XCB_USE_XINPUT21
}
static int xi2ValuatorOffset(const unsigned char *maskPtr, int maskLen, int number)
{
int offset = 0;
for (int i = 0; i < maskLen; i++) {
if (number < 8) {
if ((maskPtr[i] & (1 << number)) == 0)
return -1;
}
for (int j = 0; j < 8; j++) {
if (j == number)
return offset;
if (maskPtr[i] & (1 << j))
offset++;
}
number -= 8;
}
return -1;
}
bool QXcbConnection::xi2GetValuatorValueIfSet(const void *event, int valuatorNum, double *value)
{
const xXIDeviceEvent *xideviceevent = static_cast<const xXIDeviceEvent *>(event);
const unsigned char *buttonsMaskAddr = (const unsigned char*)&xideviceevent[1];
const unsigned char *valuatorsMaskAddr = buttonsMaskAddr + xideviceevent->buttons_len * 4;
FP3232 *valuatorsValuesAddr = (FP3232*)(valuatorsMaskAddr + xideviceevent->valuators_len * 4);
int valuatorOffset = xi2ValuatorOffset(valuatorsMaskAddr, xideviceevent->valuators_len, valuatorNum);
if (valuatorOffset < 0)
return false;
*value = valuatorsValuesAddr[valuatorOffset].integral;
*value += ((double)valuatorsValuesAddr[valuatorOffset].frac / (1 << 16) / (1 << 16));
return true;
}
void QXcbConnection::xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *event)
{
// xcb event structs contain stuff that wasn't on the wire, the full_sequence field
// adds an extra 4 bytes and generic events cookie data is on the wire right after the standard 32 bytes.
// Move this data back to have the same layout in memory as it was on the wire
// and allow casting, overwriting the full_sequence field.
memmove((char*) event + 32, (char*) event + 36, event->length * 4);
}
Qt::MouseButton QXcbConnection::xiToQtMouseButton(uint32_t b)
{
switch (b) {