summaryrefslogtreecommitdiffstats
path: root/src/compositor/wayland_wrapper
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-04-26 11:11:50 +0300
committerJørgen Lind <jorgen.lind@nokia.com>2012-04-26 10:35:46 +0200
commit9070ed4887f6d000dc8fab95eec2d3a15099da1a (patch)
tree57a649642e6cd894ddb9a9f1b891a659b6a03c44 /src/compositor/wayland_wrapper
parentd6235eb6574fd2327a98bf6a1a762d3edab4f4c5 (diff)
Pass device capabilities to client in the touch extension
Assuming that all capabilities are available is not a good idea. Change-Id: I06c0f6c14583e7a25d4a07058976ea347e2dc8fa Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper')
-rw-r--r--src/compositor/wayland_wrapper/wltouch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/wayland_wrapper/wltouch.cpp b/src/compositor/wayland_wrapper/wltouch.cpp
index 85763db07..b6d259042 100644
--- a/src/compositor/wayland_wrapper/wltouch.cpp
+++ b/src/compositor/wayland_wrapper/wltouch.cpp
@@ -129,7 +129,7 @@ bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, Surface *surface)
uint32_t id = tp.id();
uint32_t state = (tp.state() & 0xFFFF) | (sentPointCount << 16);
- uint32_t flags = tp.flags();
+ uint32_t flags = (tp.flags() & 0xFFFF) | (int(event->device()->capabilities()) << 16);
QPointF p = tp.pos() - surfacePos; // surface-relative
int x = toFixed(p.x());