* [PATCH 0/4] New patchset
@ 2014-09-02 19:07 Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 1/4] arago.conf: Disable TSLIB in Qt 5 Franklin S. Cooper Jr
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-09-02 19:07 UTC (permalink / raw
To: meta-arago; +Cc: Franklin S. Cooper Jr
From: "Franklin S. Cooper Jr" <fcooper@ti.com>
Please completely ignore the previous patchset and focus only on this patchset.
Franklin S. Cooper Jr (4):
arago.conf: Disable TSLIB in Qt 5
qtwayland: Add Touch issue fix
packagegroup-arago-*: Conditionally include tslib
qtbase: Remove references of TSLIB
meta-arago-distro/conf/distro/arago.conf | 2 +-
.../packagegroups/packagegroup-arago-console.bb | 4 +-
meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh | 7 --
.../recipes-qt/qt5/qtbase_5.2.1.bbappend | 2 +-
.../packagegroup-arago-standalone-sdk-target.bb | 4 +-
.../qt5/qtwayland/0001-Fix-touch-with-Weston.patch | 74 ++++++++++++++++++++
.../recipes-qt/qt5/qtwayland_git.bbappend | 7 +-
7 files changed, 86 insertions(+), 14 deletions(-)
create mode 100644 meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Fix-touch-with-Weston.patch
--
1.7.9.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] arago.conf: Disable TSLIB in Qt 5
2014-09-02 19:07 [PATCH 0/4] New patchset Franklin S. Cooper Jr
@ 2014-09-02 19:07 ` Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 2/4] qtwayland: Add Touch issue fix Franklin S. Cooper Jr
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-09-02 19:07 UTC (permalink / raw
To: meta-arago; +Cc: Franklin S. Cooper Jr
From: "Franklin S. Cooper Jr" <fcooper@ti.com>
* When using Qt 5 w/Wayland Weston should be providing the touch input.
* Disable tslib.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
meta-arago-distro/conf/distro/arago.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 17f3c3d..d57dafa 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -31,7 +31,7 @@ PACKAGECONFIG_pn-weston = "fbdev launch"
# Configure Qt5 flags (GLES is still required for qtdeclarative and qtwebkit)
PACKAGECONFIG_GL_pn-qtbase = "gles2 linuxfb"
-PACKAGECONFIG_DISTRO_pn-qtbase = "icu examples tslib"
+PACKAGECONFIG_DISTRO_pn-qtbase = "icu examples"
# ARM9 is not supported by the Linaro toolchain so default back to the Arago
# toolchain for ARM9 based SOCs.
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] qtwayland: Add Touch issue fix
2014-09-02 19:07 [PATCH 0/4] New patchset Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 1/4] arago.conf: Disable TSLIB in Qt 5 Franklin S. Cooper Jr
@ 2014-09-02 19:07 ` Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 3/4] packagegroup-arago-*: Conditionally include tslib Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 4/4] qtbase: Remove references of TSLIB Franklin S. Cooper Jr
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-09-02 19:07 UTC (permalink / raw
To: meta-arago; +Cc: Franklin S. Cooper Jr
From: "Franklin S. Cooper Jr" <fcooper@ti.com>
* Currently Qt 5 when using Wayland only properly recognizes one touchup,
touchmove and touch down event.
* Any further touch events are not properly recognized.
* Apparently this is a bug in how Weston handles touch events.
* Use a patch provided by Digia to work around this issue.
* More testing is required to verify that this is a valid fix.
Qt Bug Report link:
https://bugreports.qt-project.org/browse/QTBUG-36602
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
.../qt5/qtwayland/0001-Fix-touch-with-Weston.patch | 74 ++++++++++++++++++++
.../recipes-qt/qt5/qtwayland_git.bbappend | 7 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Fix-touch-with-Weston.patch
diff --git a/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Fix-touch-with-Weston.patch b/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Fix-touch-with-Weston.patch
new file mode 100644
index 0000000..df564bb
--- /dev/null
+++ b/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Fix-touch-with-Weston.patch
@@ -0,0 +1,74 @@
+From 797fd02ed6bb26f30899e117d6ab8119b7a24f95 Mon Sep 17 00:00:00 2001
+From: Laszlo Agocs <laszlo.agocs@digia.com>
+Date: Fri, 29 Aug 2014 20:43:20 +0200
+Subject: [PATCH] Fix touch with Weston
+
+Work around the missing touch_frame after the last touch_up.
+
+Task-number: QTBUG-36602
+Change-Id: Iccb03bdc8b430c7cefc097c3c84e50be676c7fe7
+---
+ src/client/qwaylandinputdevice.cpp | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
+index 6c13201..a520c79 100644
+--- a/src/client/qwaylandinputdevice.cpp
++++ b/src/client/qwaylandinputdevice.cpp
+@@ -220,6 +220,8 @@ public:
+ void touch_frame() Q_DECL_OVERRIDE;
+ void touch_cancel() Q_DECL_OVERRIDE;
+
++ bool allTouchPointsReleased();
++
+ QWaylandInputDevice *mParent;
+ QWaylandWindow *mFocus;
+ QList<QWindowSystemInterface::TouchPoint> mTouchPoints;
+@@ -863,6 +865,13 @@ void QWaylandInputDevice::Touch::touch_up(uint32_t serial, uint32_t time, int32_
+ Q_UNUSED(time);
+ mFocus = 0;
+ mParent->handleTouchPoint(id, 0, 0, Qt::TouchPointReleased);
++
++ // As of Weston 1.5.90 there is no touch_frame after the last touch_up
++ // (i.e. when the last finger is released). To accomodate for this, issue a
++ // touch_frame. This cannot hurt since it is safe to call the touch_frame
++ // handler multiple times when there are no points left.
++ if (allTouchPointsReleased())
++ touch_frame();
+ }
+
+ void QWaylandInputDevice::Touch::touch_motion(uint32_t time, int32_t id, wl_fixed_t x, wl_fixed_t y)
+@@ -921,6 +930,15 @@ void QWaylandInputDevice::handleTouchPoint(int id, double x, double y, Qt::Touch
+ mTouch->mTouchPoints.append(tp);
+ }
+
++bool QWaylandInputDevice::Touch::allTouchPointsReleased()
++{
++ for (int i = 0; i < mTouchPoints.count(); ++i)
++ if (mTouchPoints.at(i).state != Qt::TouchPointReleased)
++ return false;
++
++ return true;
++}
++
+ void QWaylandInputDevice::Touch::touch_frame()
+ {
+ // Copy all points, that are in the previous but not in the current list, as stationary.
+@@ -950,13 +968,7 @@ void QWaylandInputDevice::Touch::touch_frame()
+
+ QWindowSystemInterface::handleTouchEvent(window, mParent->mTouchDevice, mTouchPoints);
+
+- bool allReleased = true;
+- for (int i = 0; i < mTouchPoints.count(); ++i)
+- if (mTouchPoints.at(i).state != Qt::TouchPointReleased) {
+- allReleased = false;
+- break;
+- }
+-
++ const bool allReleased = allTouchPointsReleased();
+ mPrevTouchPoints = mTouchPoints;
+ mTouchPoints.clear();
+
+--
+1.7.9.5
+
diff --git a/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend
index 64de589..dca1710 100644
--- a/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend
@@ -1,3 +1,8 @@
-PR_append = "-arago1"
+PR_append = "-arago2"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Fix-touch-with-Weston.patch"
+
QT_MODULE_BRANCH = "5.4"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] packagegroup-arago-*: Conditionally include tslib
2014-09-02 19:07 [PATCH 0/4] New patchset Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 1/4] arago.conf: Disable TSLIB in Qt 5 Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 2/4] qtwayland: Add Touch issue fix Franklin S. Cooper Jr
@ 2014-09-02 19:07 ` Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 4/4] qtbase: Remove references of TSLIB Franklin S. Cooper Jr
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-09-02 19:07 UTC (permalink / raw
To: meta-arago; +Cc: Franklin S. Cooper Jr
From: "Franklin S. Cooper Jr" <fcooper@ti.com>
* Weston handles input so no reason to include both Weston and tslib.
* Having both can possibly cause issues or even hide issues.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
.../packagegroups/packagegroup-arago-console.bb | 4 ++--
.../packagegroup-arago-standalone-sdk-target.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb
index 8d65cac..8d322f5 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Extended task to get more basic and console apps"
LICENSE = "MIT"
-PR = "r6"
+PR = "r7"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -67,7 +67,7 @@ ARAGO_SDK_PREREQ = "\
ARAGO_CONSOLE = "\
${ARAGO_ALSA_EXTRA} \
- ${ARAGO_TSLIB} \
+ ${@base_conditional('QT_PROVIDER', 'qt5', '', '${ARAGO_TSLIB}', d)} \
${ARAGO_NCURSES} \
${ARAGO_FSTOOLS} \
${ARAGO_UTILS} \
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb
index 687de9e..d4a5072 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Target packages for the standalone SDK"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
inherit packagegroup
@@ -25,7 +25,7 @@ RDEPENDS_${PN} = "\
libopkg-dev \
libpng-dev \
readline-dev \
- tslib-dev \
+ ${@base_conditional('QT_PROVIDER', 'qt5', '', 'tslib-dev', d)} \
libusb-compat-dev \
libusb1-dev \
zlib-dev \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] qtbase: Remove references of TSLIB
2014-09-02 19:07 [PATCH 0/4] New patchset Franklin S. Cooper Jr
` (2 preceding siblings ...)
2014-09-02 19:07 ` [PATCH 3/4] packagegroup-arago-*: Conditionally include tslib Franklin S. Cooper Jr
@ 2014-09-02 19:07 ` Franklin S. Cooper Jr
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-09-02 19:07 UTC (permalink / raw
To: meta-arago; +Cc: Franklin S. Cooper Jr
From: "Franklin S. Cooper Jr" <fcooper@ti.com>
* Since Weston handles touch events in Qt 5 when using Wayland and Weston
remove references to tslib since its no longer used.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh | 7 -------
.../recipes-qt/qt5/qtbase_5.2.1.bbappend | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh
index 51c181f..1e8c196 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh
@@ -3,10 +3,3 @@
### QT Environment Variables ###
export QT_QPA_GENERIC_PLUGINS=Auto
export QT_QPA_PLATFORM=wayland
-
-
-# Set the QT_QPA_GENERIC_PLUGINS for touchscreen if it exists
-if [ -e /dev/input/touchscreen0 ]
-then
- export QT_QPA_GENERIC_PLUGINS=Tslib:/dev/input/touchscreen0
-fi
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.2.1.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_5.2.1.bbappend
index 446b72a..a466581 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.2.1.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.2.1.bbappend
@@ -5,7 +5,7 @@ GLES_EXTRA_DEPS_omap-a15 = "libdrm wayland"
PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}"
-PR_append = "-arago2"
+PR_append = "-arago3"
QT_CONFIG_FLAGS += "-qpa wayland"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-02 19:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-02 19:07 [PATCH 0/4] New patchset Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 1/4] arago.conf: Disable TSLIB in Qt 5 Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 2/4] qtwayland: Add Touch issue fix Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 3/4] packagegroup-arago-*: Conditionally include tslib Franklin S. Cooper Jr
2014-09-02 19:07 ` [PATCH 4/4] qtbase: Remove references of TSLIB Franklin S. Cooper Jr
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.