* [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events.
@ 2014-09-04 17:35 Franklin S. Cooper Jr
2014-09-04 17:35 ` [PATCH 2/3] weston: Fix touch calibration issue Franklin S. Cooper Jr
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Franklin S. Cooper Jr @ 2014-09-04 17:35 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
From: "Franklin S. Cooper Jr" <fcooper@ti.com>
* This is another QtWayland bug that was discussed in the Qt bug report:
https://bugreports.qt-project.org/browse/QTBUG-36602
* Patch link:
https://codereview.qt-project.org/#/c/93664/
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
.../0001-Wayland-correct-touch-location.patch | 31 ++++++++++++++++++++
.../recipes-qt/qt5/qtwayland_git.bbappend | 5 ++--
2 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch
diff --git a/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch b/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch
new file mode 100644
index 0000000..caa6dff
--- /dev/null
+++ b/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch
@@ -0,0 +1,31 @@
+From ae54be549e6ebeef829d5c1089d5307d00d0b791 Mon Sep 17 00:00:00 2001
+From: Shawn Rutledge <shawn.rutledge@digia.com>
+Date: Mon, 1 Sep 2014 15:30:42 +0200
+Subject: [PATCH] Wayland: correct touch location
+
+The window margins were offsetting the touch point in the wrong
+direction.
+
+Task-number: QTBUG-36602
+Change-Id: Id8b31d2de4051f36d3ff4e088bbc9bd7cc84ca13
+Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
+---
+ src/client/qwaylandinputdevice.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
+index 4a100f7..014303f 100644
+--- a/src/client/qwaylandinputdevice.cpp
++++ b/src/client/qwaylandinputdevice.cpp
+@@ -921,7 +921,7 @@ void QWaylandInputDevice::handleTouchPoint(int id, double x, double y, Qt::Touch
+
+ tp.area = QRectF(0, 0, 8, 8);
+ QMargins margins = win->frameMargins();
+- tp.area.moveCenter(win->window()->mapToGlobal(QPoint(x+margins.left(), y+margins.top())));
++ tp.area.moveCenter(win->window()->mapToGlobal(QPoint(x - margins.left(), y - margins.top())));
+ }
+
+ tp.state = state;
+--
+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 dca1710..336484b 100644
--- a/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend
@@ -1,8 +1,9 @@
-PR_append = "-arago2"
+PR_append = "-arago3"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://0001-Fix-touch-with-Weston.patch"
+SRC_URI += "file://0001-Fix-touch-with-Weston.patch \
+ file://0001-Wayland-correct-touch-location.patch"
QT_MODULE_BRANCH = "5.4"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] weston: Fix touch calibration issue 2014-09-04 17:35 [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events Franklin S. Cooper Jr @ 2014-09-04 17:35 ` Franklin S. Cooper Jr 2014-09-04 17:35 ` [PATCH 3/3] libinput: " Franklin S. Cooper Jr 2014-09-04 17:45 ` [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events Denys Dmytriyenko 2 siblings, 0 replies; 6+ messages in thread From: Franklin S. Cooper Jr @ 2014-09-04 17:35 UTC (permalink / raw) To: meta-arago; +Cc: Franklin S. Cooper Jr From: "Franklin S. Cooper Jr" <fcooper@ti.com> * Libinput and Weston have a calibration problem when using resistive touch screens. * Bug report and additional information can be found here: https://bugs.freedesktop.org/show_bug.cgi?id=82742 * This patch is part of the fix to resolve the calibration issue. Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com> --- .../wayland/weston/normalize-WL_CALIBRATION.patch | 139 ++++++++++++++++++++ .../recipes-graphics/wayland/weston_1.5.0.bbappend | 3 +- 2 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/normalize-WL_CALIBRATION.patch diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/normalize-WL_CALIBRATION.patch b/meta-arago-distro/recipes-graphics/wayland/weston/normalize-WL_CALIBRATION.patch new file mode 100644 index 0000000..054d4de --- /dev/null +++ b/meta-arago-distro/recipes-graphics/wayland/weston/normalize-WL_CALIBRATION.patch @@ -0,0 +1,139 @@ +Subject: [PATCH weston] libinput: normalize WL_CALIBRATION before passing it + to libinput +In-Reply-To: <1409113902-4180-1-git-send-email-peter.hutterer@who-t.net> +References: <1409113902-4180-1-git-send-email-peter.hutterer@who-t.net> +Message-ID: <1409113902-4180-2-git-send-email-peter.hutterer@who-t.net> + +WL_CALIBRATION, introduced in weston-1.1, requires the translation component +of the calibration matrix to be in screen coordinates. libinput does not have +access to this and it's not a very generic way to do this anyway. So with +the libinput backend, WL_CALIBRATION support is currently broken (#82742). +This cannot be fixed in libinput without changing its API for this specific +use-case. + +This patch lets weston take care of WL_CALIBRATION. It takes the original +format and normalizes it before passing it to libinput. This way libinput +still does the coordinate transformation, weston just needs to provide the +initial configuration. + +Note that this needs an updated libinput, otherwise libinput will try to +transform coordinates as well. +--- + src/libinput-device.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 87 insertions(+) + +diff --git a/src/libinput-device.c b/src/libinput-device.c +index 6e50eeb..96fe2f2 100644 +--- a/src/libinput-device.c ++++ b/src/libinput-device.c +@@ -282,6 +282,90 @@ notify_output_destroy(struct wl_listener *listener, void *data) + } + } + ++/** ++ * The WL_CALIBRATION property requires a pixel-specific matrix to be ++ * applied after scaling device coordinates to screen coordinates. libinput ++ * can't do that, so we need to convert the calibration to the normalized ++ * format libinput expects. ++ */ ++static void ++evdev_device_set_calibration(struct evdev_device *device) ++{ ++ struct udev *udev; ++ struct udev_device *udev_device = NULL; ++ const char *sysname = libinput_device_get_sysname(device->device); ++ const char *calibration_values; ++ uint32_t width, height; ++ float calibration[6]; ++ enum libinput_config_status status; ++ ++ if (!device->output) ++ return; ++ ++ width = device->output->width; ++ height = device->output->height; ++ if (width == 0 || height == 0) ++ return; ++ ++ /* If libinput has a pre-set calibration matrix, don't override it */ ++ if (!libinput_device_config_calibration_has_matrix(device->device) || ++ libinput_device_config_calibration_get_default_matrix( ++ device->device, ++ calibration) != 0) ++ return; ++ ++ udev = udev_new(); ++ if (!udev) ++ return; ++ ++ udev_device = udev_device_new_from_subsystem_sysname(udev, ++ "input", ++ sysname); ++ if (!udev_device) ++ goto out; ++ ++ calibration_values = ++ udev_device_get_property_value(udev_device, ++ "WL_CALIBRATION"); ++ ++ if (!calibration_values || sscanf(calibration_values, ++ "%f %f %f %f %f %f", ++ &calibration[0], ++ &calibration[1], ++ &calibration[2], ++ &calibration[3], ++ &calibration[4], ++ &calibration[5]) != 6) ++ goto out; ++ ++ weston_log("Applying calibration: %f %f %f %f %f %f " ++ "(normalized %f %f)\n", ++ calibration[0], ++ calibration[1], ++ calibration[2], ++ calibration[3], ++ calibration[4], ++ calibration[5], ++ calibration[2]/width, ++ calibration[5]/height); ++ ++ /* normalize to a format libinput can use. There is a chance of ++ this being wrong if the width/height don't match the device ++ width/height but I'm not sure how to fix that */ ++ calibration[2] /= width; ++ calibration[5] /= height; ++ ++ status = libinput_device_config_calibration_set_matrix(device->device, ++ calibration); ++ if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) ++ weston_log("Failed to apply calibration.\n"); ++ ++out: ++ if (udev_device) ++ udev_device_unref(udev_device); ++ udev_unref(udev); ++} ++ + void + evdev_device_set_output(struct evdev_device *device, + struct weston_output *output) +@@ -295,6 +379,7 @@ evdev_device_set_output(struct evdev_device *device, + device->output_destroy_listener.notify = notify_output_destroy; + wl_signal_add(&output->destroy_signal, + &device->output_destroy_listener); ++ evdev_device_set_calibration(device); + } + + static void +@@ -318,6 +403,8 @@ configure_device(struct evdev_device *device) + libinput_device_config_tap_set_enabled(device->device, + enable_tap); + } ++ ++ evdev_device_set_calibration(device); + } + + struct evdev_device * +-- +1.9.3 + diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.5.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_1.5.0.bbappend index 4a1e313..dfbda15 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_1.5.0.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.5.0.bbappend @@ -1,7 +1,7 @@ # When configured for fbdev compositor, make it the default PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev" -PR_append = "-arago0" +PR_append = "-arago1" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" @@ -9,6 +9,7 @@ DEPENDS += "libinput" SRC_URI += "file://wayland_env.sh \ file://weston.ini \ + file://normalize-WL_CALIBRATION.patch \ " SRCREV = "e67118c80ad411ac46b7096aae2635510c80ea6d" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] libinput: Fix touch calibration issue 2014-09-04 17:35 [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events Franklin S. Cooper Jr 2014-09-04 17:35 ` [PATCH 2/3] weston: Fix touch calibration issue Franklin S. Cooper Jr @ 2014-09-04 17:35 ` Franklin S. Cooper Jr 2014-09-04 17:44 ` Denys Dmytriyenko 2014-09-04 17:45 ` [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events Denys Dmytriyenko 2 siblings, 1 reply; 6+ messages in thread From: Franklin S. Cooper Jr @ 2014-09-04 17:35 UTC (permalink / raw) To: meta-arago; +Cc: Franklin S. Cooper Jr From: "Franklin S. Cooper Jr" <fcooper@ti.com> * Libinput and Weston have a calibration problem when using resistive touch screens. * Bug report and additional information can be found here: https://bugs.freedesktop.org/show_bug.cgi?id=82742 * Update to latest commit of libinput that includes the 9 patches that fixes this issue. Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com> --- .../recipes-graphics/wayland/libinput_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arago-extras/recipes-graphics/wayland/libinput_git.bb b/meta-arago-extras/recipes-graphics/wayland/libinput_git.bb index d591f7d..967d5db 100644 --- a/meta-arago-extras/recipes-graphics/wayland/libinput_git.bb +++ b/meta-arago-extras/recipes-graphics/wayland/libinput_git.bb @@ -8,10 +8,10 @@ inherit autotools pkgconfig DEPENDS = "libevdev udev" -PR = "r0" +PR = "r1" BRANCH = "master" -SRCREV = "bb10ec84d3704fc0fb40591bcbffe90f6c77966d" +SRCREV = "0647574c46e5e930063ace7b35385213dca33dc1" PV = "0.5.0" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] libinput: Fix touch calibration issue 2014-09-04 17:35 ` [PATCH 3/3] libinput: " Franklin S. Cooper Jr @ 2014-09-04 17:44 ` Denys Dmytriyenko 0 siblings, 0 replies; 6+ messages in thread From: Denys Dmytriyenko @ 2014-09-04 17:44 UTC (permalink / raw) To: Franklin S. Cooper Jr; +Cc: meta-arago On Thu, Sep 04, 2014 at 12:35:40PM -0500, Franklin S. Cooper Jr wrote: > From: "Franklin S. Cooper Jr" <fcooper@ti.com> > > * Libinput and Weston have a calibration problem when using resistive touch > screens. > * Bug report and additional information can be found here: > https://bugs.freedesktop.org/show_bug.cgi?id=82742 > * Update to latest commit of libinput that includes the 9 patches that fixes > this issue. 9 patches? Wow, that was rather broken :) > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com> > --- > .../recipes-graphics/wayland/libinput_git.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta-arago-extras/recipes-graphics/wayland/libinput_git.bb b/meta-arago-extras/recipes-graphics/wayland/libinput_git.bb > index d591f7d..967d5db 100644 > --- a/meta-arago-extras/recipes-graphics/wayland/libinput_git.bb > +++ b/meta-arago-extras/recipes-graphics/wayland/libinput_git.bb > @@ -8,10 +8,10 @@ inherit autotools pkgconfig > > DEPENDS = "libevdev udev" > > -PR = "r0" > +PR = "r1" > > BRANCH = "master" > -SRCREV = "bb10ec84d3704fc0fb40591bcbffe90f6c77966d" > +SRCREV = "0647574c46e5e930063ace7b35385213dca33dc1" > > PV = "0.5.0" > > -- > 1.7.9.5 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events. 2014-09-04 17:35 [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events Franklin S. Cooper Jr 2014-09-04 17:35 ` [PATCH 2/3] weston: Fix touch calibration issue Franklin S. Cooper Jr 2014-09-04 17:35 ` [PATCH 3/3] libinput: " Franklin S. Cooper Jr @ 2014-09-04 17:45 ` Denys Dmytriyenko 2014-09-04 17:54 ` Cooper Jr., Franklin 2 siblings, 1 reply; 6+ messages in thread From: Denys Dmytriyenko @ 2014-09-04 17:45 UTC (permalink / raw) To: Franklin S. Cooper Jr; +Cc: meta-arago Franklin, Thanks! Have you tested these patches? Are there any other touch/qt5/weston issues remaining? What about that Weston restart one? On Thu, Sep 04, 2014 at 12:35:38PM -0500, Franklin S. Cooper Jr wrote: > From: "Franklin S. Cooper Jr" <fcooper@ti.com> > > * This is another QtWayland bug that was discussed in the Qt bug report: > https://bugreports.qt-project.org/browse/QTBUG-36602 > * Patch link: > https://codereview.qt-project.org/#/c/93664/ > > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com> > --- > .../0001-Wayland-correct-touch-location.patch | 31 ++++++++++++++++++++ > .../recipes-qt/qt5/qtwayland_git.bbappend | 5 ++-- > 2 files changed, 34 insertions(+), 2 deletions(-) > create mode 100644 meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch > > diff --git a/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch b/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch > new file mode 100644 > index 0000000..caa6dff > --- /dev/null > +++ b/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch > @@ -0,0 +1,31 @@ > +From ae54be549e6ebeef829d5c1089d5307d00d0b791 Mon Sep 17 00:00:00 2001 > +From: Shawn Rutledge <shawn.rutledge@digia.com> > +Date: Mon, 1 Sep 2014 15:30:42 +0200 > +Subject: [PATCH] Wayland: correct touch location > + > +The window margins were offsetting the touch point in the wrong > +direction. > + > +Task-number: QTBUG-36602 > +Change-Id: Id8b31d2de4051f36d3ff4e088bbc9bd7cc84ca13 > +Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> > +--- > + src/client/qwaylandinputdevice.cpp | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp > +index 4a100f7..014303f 100644 > +--- a/src/client/qwaylandinputdevice.cpp > ++++ b/src/client/qwaylandinputdevice.cpp > +@@ -921,7 +921,7 @@ void QWaylandInputDevice::handleTouchPoint(int id, double x, double y, Qt::Touch > + > + tp.area = QRectF(0, 0, 8, 8); > + QMargins margins = win->frameMargins(); > +- tp.area.moveCenter(win->window()->mapToGlobal(QPoint(x+margins.left(), y+margins.top()))); > ++ tp.area.moveCenter(win->window()->mapToGlobal(QPoint(x - margins.left(), y - margins.top()))); > + } > + > + tp.state = state; > +-- > +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 dca1710..336484b 100644 > --- a/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend > +++ b/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend > @@ -1,8 +1,9 @@ > -PR_append = "-arago2" > +PR_append = "-arago3" > > FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > -SRC_URI += "file://0001-Fix-touch-with-Weston.patch" > +SRC_URI += "file://0001-Fix-touch-with-Weston.patch \ > + file://0001-Wayland-correct-touch-location.patch" > > > QT_MODULE_BRANCH = "5.4" > -- > 1.7.9.5 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events. 2014-09-04 17:45 ` [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events Denys Dmytriyenko @ 2014-09-04 17:54 ` Cooper Jr., Franklin 0 siblings, 0 replies; 6+ messages in thread From: Cooper Jr., Franklin @ 2014-09-04 17:54 UTC (permalink / raw) To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org > -----Original Message----- > From: Dmytriyenko, Denys > Sent: Thursday, September 04, 2014 12:46 PM > To: Cooper Jr., Franklin > Cc: meta-arago@arago-project.org > Subject: Re: [meta-arago] [PATCH 1/3] qtwayland: Fix windows margin issue > when using touch events. > > Franklin, > > Thanks! Have you tested these patches? Are there any other > touch/qt5/weston issues remaining? What about that Weston restart one? [Franklin] Yep tested for the initial issue which was touch not working with Qt 5. What is still broken is that you can interact with the window's decoration. So you can use the title bar to move a window around, you can't interact with the menu bar and you can't minimize, maximize, and close a window via the icons on the top right. Some might consider this a new bug but I plan on updating the current Qt bug report. This is different than the restart Weston via init script issue and I haven't looked into that one. > > > On Thu, Sep 04, 2014 at 12:35:38PM -0500, Franklin S. Cooper Jr wrote: > > From: "Franklin S. Cooper Jr" <fcooper@ti.com> > > > > * This is another QtWayland bug that was discussed in the Qt bug report: > > https://bugreports.qt-project.org/browse/QTBUG-36602 > > * Patch link: > > https://codereview.qt-project.org/#/c/93664/ > > > > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com> > > --- > > .../0001-Wayland-correct-touch-location.patch | 31 > ++++++++++++++++++++ > > .../recipes-qt/qt5/qtwayland_git.bbappend | 5 ++-- > > 2 files changed, 34 insertions(+), 2 deletions(-) > > create mode 100644 meta-arago-extras/recipes-qt/qt5/qtwayland/0001- > Wayland-correct-touch-location.patch > > > > diff --git a/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland- > correct-touch-location.patch b/meta-arago-extras/recipes- > qt/qt5/qtwayland/0001-Wayland-correct-touch-location.patch > > new file mode 100644 > > index 0000000..caa6dff > > --- /dev/null > > +++ b/meta-arago-extras/recipes-qt/qt5/qtwayland/0001-Wayland- > correct-touch-location.patch > > @@ -0,0 +1,31 @@ > > +From ae54be549e6ebeef829d5c1089d5307d00d0b791 Mon Sep 17 > 00:00:00 2001 > > +From: Shawn Rutledge <shawn.rutledge@digia.com> > > +Date: Mon, 1 Sep 2014 15:30:42 +0200 > > +Subject: [PATCH] Wayland: correct touch location > > + > > +The window margins were offsetting the touch point in the wrong > > +direction. > > + > > +Task-number: QTBUG-36602 > > +Change-Id: Id8b31d2de4051f36d3ff4e088bbc9bd7cc84ca13 > > +Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> > > +--- > > + src/client/qwaylandinputdevice.cpp | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/src/client/qwaylandinputdevice.cpp > b/src/client/qwaylandinputdevice.cpp > > +index 4a100f7..014303f 100644 > > +--- a/src/client/qwaylandinputdevice.cpp > > ++++ b/src/client/qwaylandinputdevice.cpp > > +@@ -921,7 +921,7 @@ void QWaylandInputDevice::handleTouchPoint(int > id, double x, double y, Qt::Touch > > + > > + tp.area = QRectF(0, 0, 8, 8); > > + QMargins margins = win->frameMargins(); > > +- tp.area.moveCenter(win->window()- > >mapToGlobal(QPoint(x+margins.left(), y+margins.top()))); > > ++ tp.area.moveCenter(win->window()->mapToGlobal(QPoint(x - > margins.left(), y - margins.top()))); > > + } > > + > > + tp.state = state; > > +-- > > +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 dca1710..336484b 100644 > > --- a/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend > > +++ b/meta-arago-extras/recipes-qt/qt5/qtwayland_git.bbappend > > @@ -1,8 +1,9 @@ > > -PR_append = "-arago2" > > +PR_append = "-arago3" > > > > FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > > > -SRC_URI += "file://0001-Fix-touch-with-Weston.patch" > > +SRC_URI += "file://0001-Fix-touch-with-Weston.patch \ > > + file://0001-Wayland-correct-touch-location.patch" > > > > > > QT_MODULE_BRANCH = "5.4" > > -- > > 1.7.9.5 > > > > _______________________________________________ > > meta-arago mailing list > > meta-arago@arago-project.org > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-09-04 17:54 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-09-04 17:35 [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events Franklin S. Cooper Jr 2014-09-04 17:35 ` [PATCH 2/3] weston: Fix touch calibration issue Franklin S. Cooper Jr 2014-09-04 17:35 ` [PATCH 3/3] libinput: " Franklin S. Cooper Jr 2014-09-04 17:44 ` Denys Dmytriyenko 2014-09-04 17:45 ` [PATCH 1/3] qtwayland: Fix windows margin issue when using touch events Denys Dmytriyenko 2014-09-04 17:54 ` Cooper Jr., Franklin
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.