summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.cpp31
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.h31
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_maemo.cpp294
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp21
-rw-r--r--src/plugins/platforms/xcb/xcb.pro7
5 files changed, 384 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index af5822f7f7..bdf308adb3 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -88,6 +88,9 @@ QT_BEGIN_NAMESPACE
QXcbConnection::QXcbConnection(const char *displayName)
: m_displayName(displayName ? QByteArray(displayName) : qgetenv("DISPLAY"))
+#ifdef XCB_USE_XINPUT2_MAEMO
+ , m_xinputData(0)
+#endif
#ifdef XCB_USE_DRI2
, m_dri2_major(0)
, m_dri2_minor(0)
@@ -155,6 +158,9 @@ QXcbConnection::QXcbConnection(const char *displayName)
initializeXFixes();
initializeXRender();
+#ifdef XCB_USE_XINPUT2_MAEMO
+ initializeXInput2();
+#endif
m_wmSupport = new QXcbWMSupport(this);
m_keyboard = new QXcbKeyboard(this);
@@ -173,6 +179,10 @@ QXcbConnection::~QXcbConnection()
qDeleteAll(m_screens);
+#ifdef XCB_USE_XINPUT2_MAEMO
+ finalizeXInput2();
+#endif
+
#ifdef XCB_POLL_FOR_QUEUED_EVENT
sendConnectionEvent(QXcbAtom::_QT_CLOSE_CONNECTION);
m_reader->wait();
@@ -530,6 +540,11 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event)
case XCB_PROPERTY_NOTIFY:
HANDLE_PLATFORM_WINDOW_EVENT(xcb_property_notify_event_t, window, handlePropertyNotifyEvent);
break;
+#ifdef XCB_USE_XINPUT2_MAEMO
+ case GenericEvent:
+ handleGenericEvent((xcb_ge_event_t*)event);
+ break;
+#endif
default:
handled = false;
break;
@@ -862,6 +877,22 @@ static const char * xcb_atomnames = {
// Tablet
"STYLUS\0"
"ERASER\0"
+
+ // XInput2
+ "Button Left\0"
+ "Button Middle\0"
+ "Button Right\0"
+ "Button Wheel Up\0"
+ "Button Wheel Down\0"
+ "Button Horiz Wheel Left\0"
+ "Button Horiz Wheel Right\0"
+ "Abs MT Position X\0"
+ "Abs MT Position Y\0"
+ "Abs MT Touch Major\0"
+ "Abs MT Touch Minor\0"
+ "Abs MT Pressure\0"
+ "Abs MT Tracking ID\0"
+ "Max Contacts\0"
};
xcb_atom_t QXcbConnection::atom(QXcbAtom::Atom atom)
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index 769b2e79f8..5887e57968 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -51,6 +51,10 @@
#include <QThread>
#include <QVector>
+#ifdef XCB_USE_XINPUT2_MAEMO
+struct XInput2Data;
+#endif
+
#define Q_XCB_DEBUG
QT_BEGIN_NAMESPACE
@@ -222,6 +226,22 @@ namespace QXcbAtom {
XTabletStylus,
XTabletEraser,
+ // XInput2
+ ButtonLeft,
+ ButtonMiddle,
+ ButtonRight,
+ ButtonWheelUp,
+ ButtonWheelDown,
+ ButtonHorizWheelLeft,
+ ButtonHorizWheelRight,
+ AbsMTPositionX,
+ AbsMTPositionY,
+ AbsMTTouchMajor,
+ AbsMTTouchMinor,
+ AbsMTPressure,
+ AbsMTTrackingID,
+ MaxContacts,
+
NPredefinedAtoms,
_QT_SETTINGS_TIMESTAMP = NPredefinedAtoms,
@@ -301,6 +321,9 @@ public:
#if defined(XCB_USE_EGL) || defined(XCB_USE_DRI2)
void *egl_display() const { return m_egl_display; }
#endif
+#ifdef XCB_USE_XINPUT2_MAEMO
+ bool isUsingXInput2();
+#endif
void sync();
void flush() { xcb_flush(m_connection); }
@@ -335,6 +358,11 @@ private:
#ifdef XCB_USE_DRI2
void initializeDri2();
#endif
+#ifdef XCB_USE_XINPUT2_MAEMO
+ void initializeXInput2();
+ void finalizeXInput2();
+ void handleGenericEvent(xcb_ge_event_t *event);
+#endif
void handleClientMessageEvent(const xcb_client_message_event_t *event);
xcb_connection_t *m_connection;
@@ -360,6 +388,9 @@ private:
void *m_xlib_display;
#endif
QXcbEventReader *m_reader;
+#ifdef XCB_USE_XINPUT2_MAEMO
+ XInput2Data *m_xinputData;
+#endif
#ifdef XCB_USE_DRI2
uint32_t m_dri2_major;
uint32_t m_dri2_minor;
diff --git a/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp b/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp
new file mode 100644
index 0000000000..d0529202b9
--- /dev/null
+++ b/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp
@@ -0,0 +1,294 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qxcbconnection.h"
+
+#ifdef XCB_USE_XINPUT2_MAEMO
+
+#include "qxcbwindow.h"
+#include <QtGui/QWindowSystemInterface>
+#include <X11/extensions/XInput2.h>
+#include <X11/extensions/XI2proto.h>
+#include <X11/Xatom.h>
+
+// Define it here to work around XLib defining Bool and stuff.
+// We can't declare those variables in the header without facing include order headaches.
+struct XInput2Data {
+ XInput2Data()
+ : use_xinput(false)
+ , xinput_opcode(0)
+ , xinput_eventbase(0)
+ , xinput_errorbase(0)
+ , xideviceinfo(0)
+ , xibuttonclassinfo(0)
+ , xiMaxContacts(0)
+ {
+ }
+ // true if Qt is compiled w/ XInput2 or Tablet support and we have a tablet.
+ bool use_xinput;
+ int xinput_opcode;
+ int xinput_eventbase;
+ int xinput_errorbase;
+ // device info for the master pointer Qt is using
+ XIDeviceInfo *xideviceinfo;
+ XIButtonClassInfo *xibuttonclassinfo;
+ int xiMaxContacts;
+ QList<QWindowSystemInterface::TouchPoint> allTouchPoints;
+};
+
+bool QXcbConnection::isUsingXInput2()
+{
+ return m_xinputData && m_xinputData->use_xinput && m_xinputData->xiMaxContacts != 0;
+}
+
+void QXcbConnection::initializeXInput2()
+{
+ Q_ASSERT(!m_xinputData);
+ m_xinputData = new XInput2Data;
+ m_xinputData->use_xinput = XQueryExtension((Display *)m_xlib_display, "XInputExtension", &m_xinputData->xinput_opcode,
+ &m_xinputData->xinput_eventbase, &m_xinputData->xinput_errorbase);
+ if (m_xinputData->use_xinput) {
+ // we want XInput2
+ int ximajor = 2, ximinor = 0;
+ if (XIQueryVersion((Display *)m_xlib_display, &ximajor, &ximinor) == BadRequest) {
+ // XInput2 not available
+ m_xinputData->use_xinput = false;
+ } else {
+ // find the first master pointer and use this throughout Qt
+ // when making XI2 calls that need a device id (rationale is that
+ // for the time being, most setups will only have one master
+ // pointer (despite having multiple slaves)
+ int deviceCount = 0;
+ XIDeviceInfo *devices = XIQueryDevice((Display *)m_xlib_display, XIAllMasterDevices, &deviceCount);
+ if (devices) {
+ for (int i = 0; i < deviceCount; ++i) {
+ if (devices[i].use == XIMasterPointer) {
+ int unused = 0;
+ m_xinputData->xideviceinfo = XIQueryDevice((Display *)m_xlib_display, devices[i].deviceid, &unused);
+ break;
+ }
+ }
+ XIFreeDeviceInfo(devices);
+ }
+ if (!m_xinputData->xideviceinfo)
+ qFatal("Qt: Internal error, no XI2 master pointer found.");
+
+ // find the button info
+ m_xinputData->xibuttonclassinfo = 0;
+ for (int i = 0; i < m_xinputData->xideviceinfo->num_classes; ++i) {
+ if (m_xinputData->xideviceinfo->classes[i]->type == XIButtonClass) {
+ m_xinputData->xibuttonclassinfo = (XIButtonClassInfo *) m_xinputData->xideviceinfo->classes[i];
+ break;
+ }
+ }
+
+ // find the "Max Contacts" property on the device
+ Atom typeReturn;
+ int formatReturn;
+ ulong countReturn, bytesReturn;
+ uchar *data = 0;
+ if (XIGetProperty((Display *)m_xlib_display,
+ m_xinputData->xibuttonclassinfo->sourceid,
+ atom(QXcbAtom::MaxContacts),
+ 0, 1,
+ False,
+ XA_INTEGER,
+ &typeReturn,
+ &formatReturn,
+ &countReturn,
+ &bytesReturn,
+ &data) == Success
+ && data != 0
+ && typeReturn == XA_INTEGER
+ && formatReturn == 8
+ && countReturn == 1) {
+ // touch driver reported the max number of touch-points
+ m_xinputData->xiMaxContacts = data[0];
+ } else {
+ m_xinputData->xiMaxContacts = 0;
+ }
+ if (data)
+ XFree(data);
+ XFlush((Display *)m_xlib_display);
+ }
+ }
+}
+
+void QXcbConnection::finalizeXInput2()
+{
+ if (m_xinputData && m_xinputData->xideviceinfo) {
+ XIFreeDeviceInfo(m_xinputData->xideviceinfo);
+ }
+ delete m_xinputData;
+}
+
+// Borrowed from libXi.
+static int count_bits(unsigned char* ptr, int len)
+{
+ int bits = 0;
+ int i;
+ unsigned char x;
+
+ for (i = 0; i < len; i++)
+ {
+ x = ptr[i];
+ while (x > 0)
+ {
+ bits += (x & 0x1);
+ x >>= 1;
+ }
+ }
+ return bits;
+}
+
+static bool getValuatorValueIfSet(xXIDeviceEvent *xideviceevent, int valuatorNum, double *value)
+{
+ unsigned char *buttonsMaskAddr = (unsigned char*)&xideviceevent[1];
+ unsigned char *valuatorsMaskAddr = buttonsMaskAddr + xideviceevent->buttons_len * 4;
+ FP3232 *valuatorsValuesAddr = (FP3232*)(valuatorsMaskAddr + xideviceevent->valuators_len * 4);
+ int numValuatorValues = count_bits(valuatorsMaskAddr, xideviceevent->valuators_len * 4);
+ // This relies on all bit being set until a certain number i.e. it doesn't support only bit 0 and 5 being set in the mask.
+ // Just like the original code, works for now.
+ if (valuatorNum >= numValuatorValues)
+ return false;
+ *value = valuatorsValuesAddr[valuatorNum].integral;
+ *value += ((double)valuatorsValuesAddr[valuatorNum].frac / (1 << 16) / (1 << 16));
+ return true;
+}
+
+void QXcbConnection::handleGenericEvent(xcb_ge_event_t *event)
+{
+ // xGenericEvent has "extension" on the second byte, xcb_ge_event_t has "pad0".
+ if (m_xinputData->use_xinput && event->pad0 == m_xinputData->xinput_opcode) {
+ // 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, overwritting the full_sequence field.
+ memmove((char*)event + 32, (char*)event + 36, event->length * 4);
+ xXIGenericDeviceEvent* xievent = (xXIGenericDeviceEvent*)event;
+
+ // On Harmattan XInput2 is hacked to give touch points updates into standard mouse button press/motion events.
+ if (m_xinputData->xiMaxContacts != 0
+ && (xievent->evtype == XI_ButtonPress
+ || xievent->evtype == XI_ButtonRelease
+ || xievent->evtype == XI_Motion)) {
+ xXIDeviceEvent *xideviceevent = (xXIDeviceEvent *)xievent;
+ QList<QWindowSystemInterface::TouchPoint> touchPoints = m_xinputData->allTouchPoints;
+ if (touchPoints.count() != m_xinputData->xiMaxContacts) {
+ // initial event, allocate space for all (potential) touch points
+ touchPoints.reserve(m_xinputData->xiMaxContacts);
+ for (int i = 0; i < m_xinputData->xiMaxContacts; ++i) {
+ QWindowSystemInterface::TouchPoint tp;
+ tp.id = i;
+ tp.isPrimary = (i == 0);
+ tp.state = Qt::TouchPointReleased;
+ touchPoints << tp;
+ }
+ }
+ qreal x, y, nx, ny, w = 0.0, h = 0.0, p = -1.0;
+ int id;
+ uint active = 0;
+ for (int i = 0; i < m_xinputData->xideviceinfo->num_classes; ++i) {
+ XIAnyClassInfo *classinfo = m_xinputData->xideviceinfo->classes[i];
+ if (classinfo->type == XIValuatorClass) {
+ XIValuatorClassInfo *valuatorclassinfo = reinterpret_cast<XIValuatorClassInfo *>(classinfo);
+ int n = valuatorclassinfo->number;
+ double value;
+ if (!getValuatorValueIfSet(xideviceevent, n, &value))
+ continue;
+
+ if (valuatorclassinfo->label == atom(QXcbAtom::AbsMTPositionX)) {
+ x = value;
+ nx = (x - valuatorclassinfo->min) / (valuatorclassinfo->max - valuatorclassinfo->min);
+ } else if (valuatorclassinfo->label == atom(QXcbAtom::AbsMTPositionY)) {
+ y = value;
+ ny = (y - valuatorclassinfo->min) / (valuatorclassinfo->max - valuatorclassinfo->min);
+ } else if (valuatorclassinfo->label == atom(QXcbAtom::AbsMTTouchMajor)) {
+ w = value;
+ } else if (valuatorclassinfo->label == atom(QXcbAtom::AbsMTTouchMinor)) {
+ h = value;
+ } else if (valuatorclassinfo->label == atom(QXcbAtom::AbsMTPressure)) {
+ p = (value - valuatorclassinfo->min) / (valuatorclassinfo->max - valuatorclassinfo->min);
+ } else if (valuatorclassinfo->label == atom(QXcbAtom::AbsMTTrackingID)) {
+ id = value;
+ active |= 1 << id;
+ QWindowSystemInterface::TouchPoint &touchPoint = touchPoints[id];
+
+ Qt::TouchPointState newstate;
+ if (touchPoint.state == Qt::TouchPointReleased) {
+ newstate = Qt::TouchPointPressed;
+ } else {
+ if (touchPoint.area.center() != QPoint(x, y))
+ newstate = Qt::TouchPointMoved;
+ else
+ newstate = Qt::TouchPointStationary;
+ }
+
+ touchPoint.state = newstate;
+ touchPoint.area = QRectF(x - w/2, y - h/2, w, h);
+ touchPoint.normalPosition = QPointF(nx, ny);
+ touchPoint.pressure = p;
+ }
+ }
+ }
+
+ // mark previously-active-but-now-inactive touch points as released
+ for (int i = 0; i < touchPoints.count(); ++i)
+ if (!(active & (1 << i)) && touchPoints.at(i).state != Qt::TouchPointReleased)
+ touchPoints[i].state = Qt::TouchPointReleased;
+
+ if (xideviceevent->evtype == XI_ButtonRelease) {
+ // final event, forget touch state
+ m_xinputData->allTouchPoints.clear();
+ } else {
+ // save current state so that we have something to reuse later
+ m_xinputData->allTouchPoints = touchPoints;
+ }
+
+ if (QXcbWindow *platformWindow = platformWindowFromId(xideviceevent->event))
+ QWindowSystemInterface::handleTouchEvent(platformWindow->window(), xideviceevent->time, (QEvent::Type)0 /*None*/, QTouchEvent::TouchScreen, m_xinputData->allTouchPoints);
+ }
+ }
+}
+
+#endif // XCB_USE_XINPUT2_MAEMO
+
+
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 8c2b2d53fd..3b379c3caa 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -93,6 +93,10 @@
#include <X11/Xutil.h>
#endif
+#ifdef XCB_USE_XINPUT2_MAEMO
+#include <X11/extensions/XInput2.h>
+#endif
+
#if defined(XCB_USE_GLX)
#include "qglxintegration.h"
#include <QtPlatformSupport/private/qglxconvenience_p.h>
@@ -322,6 +326,23 @@ void QXcbWindow::create()
atom(QXcbAtom::WM_CLIENT_LEADER), XCB_ATOM_WINDOW, 32,
1, &leader));
+#ifdef XCB_USE_XINPUT2_MAEMO
+ if (connection()->isUsingXInput2()) {
+ XIEventMask xieventmask;
+ uchar bitmask[2] = { 0, 0 };
+
+ xieventmask.deviceid = XIAllMasterDevices;
+ xieventmask.mask = bitmask;
+ xieventmask.mask_len = sizeof(bitmask);
+
+ XISetMask(bitmask, XI_ButtonPress);
+ XISetMask(bitmask, XI_ButtonRelease);
+ XISetMask(bitmask, XI_Motion);
+
+ XISelectEvents(DISPLAY_FROM_XCB(this), m_window, &xieventmask, 1);
+ }
+#endif
+
setWindowFlags(window()->windowFlags());
setWindowTitle(window()->windowTitle());
setWindowState(window()->windowState());
diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro
index 13fe5b900c..2498581eb7 100644
--- a/src/plugins/platforms/xcb/xcb.pro
+++ b/src/plugins/platforms/xcb/xcb.pro
@@ -45,6 +45,13 @@ contains(QT_CONFIG, xcb-poll-for-queued-event) {
contains(QT_CONFIG, xcb-xlib) {
DEFINES += XCB_USE_XLIB
LIBS += -lX11 -lX11-xcb
+
+ linux-g++-maemo:contains(QT_CONFIG, xinput2) {
+ # XInput2 support for Harmattan.
+ DEFINES += XCB_USE_XINPUT2_MAEMO
+ SOURCES += qxcbconnection_maemo.cpp
+ LIBS += -lXi
+ }
}
# to support custom cursors with depth > 1
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 00:57:33 +0000