Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor into lp:ubuntu-ui-toolkit/staging

fixTouchAdaptor
Merge into staging

Proposed by Zsombor Egri on 2016-04-04

Status:

Merged

Approved by:

Cris Dywan on 2016-04-07

Approved revision:

1934

Merged at revision:

1925

Proposed branch:

lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

1388 lines (+656/-425)

19 files modified

debian/control (+3/-0)
debian/libubuntutoolkit5-dev.install (+2/-0)
src/Ubuntu/Test/plugin/plugin.pri (+3/-5)
src/Ubuntu/Test/plugin/testplugin.cpp (+3/-11)
src/Ubuntu/Test/plugin/uctestextras.cpp (+7/-23)
src/Ubuntu/Test/plugin/uctestextras.h (+0/-1)
src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro (+13/-3)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp (+71/-131)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h (+27/-24)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h (+77/-0)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp (+350/-0)
tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.py (+38/-0)
tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.qml (+51/-0)
tests/unit_x11/tst_components/tst_adaptivepagelayout.qml (+1/-0)
ubuntu-sdk.pro (+4/-1)
ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.cpp (+0/-159)
ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.h (+0/-50)
ubuntu-ui-toolkit-launcher/launcher.cpp (+3/-12)
ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro (+3/-5)

To merge this branch:

bzr merge lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-04-07
Cris Dywan		2016-04-04	Approve on 2016-04-07
Review via email: mp+290858@code.launchpad.net

Commit message

Move MouseTouchAdaptor into UbuntuToolkit library. Fix adaptor code for Xenial.

lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor updated on 2016-04-04

1924. By Zsombor Egri on 2016-04-04: missing license header added

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1923
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/354/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2264/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/354/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor updated on 2016-04-04

1925. By Zsombor Egri on 2016-04-04: revert unwanted change

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1923
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/379/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2265/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/379/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1923
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/599/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2266/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/599/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1923
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/230/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/599/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/379/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/354/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2267/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2266
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2265
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2264

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/230/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1925
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/355/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2268/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/355/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1925
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/380/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2269/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/380/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor updated on 2016-04-04

1926. By Zsombor Egri on 2016-04-04: add missing headers

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1925
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/600/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2270/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/600/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1925
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/231/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/600/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/380/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/355/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2271/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2270
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2269
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2268

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/231/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1926
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/381/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2272/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/381/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1926
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/601/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2273/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/601/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

PASSED: Continuous integration, rev:1926
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/356/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2274/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/356/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/232/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor updated on 2016-04-04

1927. By Zsombor Egri on 2016-04-04: build dependenci to drive UbuntuToolkit lib to be built first

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1927
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/605/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2286/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/605/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

FAILED: Continuous integration, rev:1927
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/385/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2287/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/385/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

PASSED: Continuous integration, rev:1927
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/360/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2288/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/360/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-04:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/234/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor updated on 2016-04-05

1928. By Zsombor Egri on 2016-04-05: wrapped and sorted

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

FAILED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/386/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2290/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/386/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/606/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2291/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/606/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/361/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2292/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/361/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/235/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/390/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2305/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/390/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/610/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2306/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/610/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/391/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2307/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/391/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/611/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2308/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/611/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/365/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2311/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/365/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/238/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/610
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/390
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/365
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2312/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2306
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2305
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2311

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/238/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/366/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2313/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/366/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1928
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/239/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/611
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/391
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/366
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2314/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2308
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2307
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2313

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/239/rebuild

review: Approve (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2016-04-05:

Is the XCB 1.9.3 struct ABI specific to Qt's use or XCB itself? Is there any way to check that it's correct, either by Debian dependencies, or compile guards? Or some uni test that sanity-checks the value? Or a warning if the struct looks funny? Maybe there's no good way to handle this, just thinking out loud here.

Also it seems redundant to issue "MouseTouchAdaptor not available on this architecture" in setEnabled when it's always issued from registerTouchDevices regardless of the platform guards. A test case for this would seem useful also because despite "indirect" test coverage immediate failures would be much clearer than unexpected funny results.
Maybe even remove the touchDevices() function from the launcher to avoid false-positives because we have duplicate checks of the touch device? Though that last one could also be a separate mini MR.

review: Needs Information

lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor updated on 2016-04-05

1929. By Zsombor Egri on 2016-04-05: staging sync
1930. By Zsombor Egri on 2016-04-05: load page synchronously if that's what we want to test

Revision history for this message

Zsombor Egri (zsombi) wrote on 2016-04-05:

> Is the XCB 1.9.3 struct ABI specific to Qt's use or XCB itself? Is there any
> way to check that it's correct, either by Debian dependencies, or compile
> guards? Or some uni test that sanity-checks the value? Or a warning if the
> struct looks funny? Maybe there's no good way to handle this, just thinking
> out loud here.

That's a good question, I haven't seen any version check in Unity8 either... would be good though if we could at least guard the package...

>
> Also it seems redundant to issue "MouseTouchAdaptor not available on this
> architecture" in setEnabled when it's always issued from registerTouchDevices
> regardless of the platform guards. A test case for this would seem useful also
> because despite "indirect" test coverage immediate failures would be much
> clearer than unexpected funny results.
> Maybe even remove the touchDevices() function from the launcher to avoid
> false-positives because we have duplicate checks of the touch device? Though
> that last one could also be a separate mini MR.

I was thinking to flag out completely the use of the MouseTouchAdaptor, but then QML code would fail if the API would not be available on certain architectures... However as long as we keep X11 tests separate from the rest, those will not run on ARM....

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1930
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/614/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2322/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/614/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1930
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/394/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2323/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/394/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1930
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/369/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2324/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/369/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-05:

PASSED: Continuous integration, rev:1930
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/242/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/614
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/394
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/369
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2325/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2322
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2323
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2324

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/242/rebuild

review: Approve (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor updated on 2016-04-07

1931. By Zsombor Egri on 2016-04-07: add autopilot test guarding mouse to touch conversion
1932. By Zsombor Egri on 2016-04-07: remove touch device detection from launcher; warn if touch simulation is not available on the platform in constructor, and initialize native event listener only for the valid platforms
1933. By Zsombor Egri on 2016-04-07: staging sync

Revision history for this message

Cris Dywan (kalikiana) wrote on 2016-04-07:

You need to set mouseEnabled: false on the MultiPointTouchArea for this test to work - otherwise it succeeds even if the touch emulation is not happening, such as can be seen by removing the -touch argument from the test case.

review: Needs Fixing

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1933
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/413/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2390/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/413/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1933
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/632/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2391/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/632/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1933
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/387/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2392/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/387/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1933
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/255/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/632
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/413
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/387
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2393/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2391
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2390
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2392

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/255/rebuild

review: Approve (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor updated on 2016-04-07

1934. By Zsombor Egri on 2016-04-07: disable mouse handling on MPTA

Revision history for this message

Cris Dywan (kalikiana) wrote on 2016-04-07:

Sweet. Thanks for the AP test and cleaning up the conditionals!

review: Approve

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1934
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/416/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2402/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/416/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1934
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/635/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2403/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/635/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1934
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/417/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2404/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/417/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1934
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/636/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2405/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/636/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1934
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/390/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2406/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/390/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1934
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/258/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/635
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/416
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/390
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2407/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2403
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2402
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2406

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/258/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-07:

PASSED: Continuous integration, rev:1934
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/391/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2408/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/391/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

Zsombor Egri

 === modified file 'debian/control'
 --- debian/control	2016-03-24 09:14:57 +0000
 +++ debian/control	2016-04-07 16:01:36 +0000
@@ -22,6 +22,9 @@
                 libqt5sql5-sqlite,
                 libqt5svg5-dev,
                 libudev-dev,
++               libx11-dev[!armhf],
++               libxcb1-dev[!armhf],
++               libxi-dev[!armhf],
                 libxkbcommon-dev,
                 libxrender-dev,
                 locales,
 === modified file 'debian/libubuntutoolkit5-dev.install'
 --- debian/libubuntutoolkit5-dev.install	2016-03-04 11:58:12 +0000
 +++ debian/libubuntutoolkit5-dev.install	2016-04-07 16:01:36 +0000
@@ -1,11 +1,13 @@
  usr/include/*/qt5/UbuntuToolkit/AsyncLoader
  usr/include/*/qt5/UbuntuToolkit/ColorUtils
++usr/include/*/qt5/UbuntuToolkit/MouseTouchAdaptor
  usr/include/*/qt5/UbuntuToolkit/Tree
  usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
  usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
  usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
  usr/include/*/qt5/UbuntuToolkit/asyncloader.h
  usr/include/*/qt5/UbuntuToolkit/colorutils.h
++usr/include/*/qt5/UbuntuToolkit/mousetouchadaptor.h
  usr/include/*/qt5/UbuntuToolkit/tree.h
  usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
  usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
 === modified file 'src/Ubuntu/Test/plugin/plugin.pri'
 --- src/Ubuntu/Test/plugin/plugin.pri	2016-02-25 02:29:05 +0000
 +++ src/Ubuntu/Test/plugin/plugin.pri	2016-04-07 16:01:36 +0000
@@ -1,4 +1,4 @@
--QT *= core-private qml qml-private quick quick-private gui-private testlib UbuntuGestures
++QT *= core-private qml qml-private quick quick-private gui-private testlib UbuntuGestures UbuntuToolkit
  equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
      QT *= v8-private
@@ -15,11 +15,9 @@
  HEADERS += \
      $$PWD/uctestcase.h \
      $$PWD/testplugin.h \
--    $$PWD/uctestextras.h \
--    $$PWD/ucmousetouchadaptor.h \
++    $$PWD/uctestextras.h
  SOURCES += \
      $$PWD/uctestcase.cpp \
      $$PWD/testplugin.cpp \
--    $$PWD/uctestextras.cpp \
--    $$PWD/ucmousetouchadaptor.cpp \
++    $$PWD/uctestextras.cpp
 === modified file 'src/Ubuntu/Test/plugin/testplugin.cpp'
 --- src/Ubuntu/Test/plugin/testplugin.cpp	2015-10-21 08:33:21 +0000
 +++ src/Ubuntu/Test/plugin/testplugin.cpp	2016-04-07 16:01:36 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2014 Canonical Ltd.
++ * Copyright 2016 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -17,7 +17,7 @@
  #include "testplugin.h"
  #include <QtQml>
  #include "uctestextras.h"
--#include "ucmousetouchadaptor.h"
++#include <MouseTouchAdaptor>
  static QObject *registerExtras(QQmlEngine *engine, QJSEngine *scriptEngine)
+ {
@@ -27,16 +27,8 @@
      return new UCTestExtras;
+ }
--static QObject *registerAdaptor(QQmlEngine *engine, QJSEngine *scriptEngine)
--{
--    Q_UNUSED(engine)
--    Q_UNUSED(scriptEngine)
--
--    return new UCMouseTouchAdaptor;
--}
--
  void TestPlugin::registerTypes(const char *uri)
+ {
      qmlRegisterSingletonType<UCTestExtras>(uri, 1, 0, "TestExtras", registerExtras);
--    qmlRegisterSingletonType<UCMouseTouchAdaptor>(uri, 1, 0, "MouseTouchAdaptor", registerAdaptor);
++    qmlRegisterSingletonType<UbuntuToolkit::MouseTouchAdaptor>(uri, 1, 0, "MouseTouchAdaptor", UbuntuToolkit::MouseTouchAdaptor::registerQmlSingleton);
+ }
 === modified file 'src/Ubuntu/Test/plugin/uctestextras.cpp'
 --- src/Ubuntu/Test/plugin/uctestextras.cpp	2015-12-17 15:23:26 +0000
 +++ src/Ubuntu/Test/plugin/uctestextras.cpp	2016-04-07 16:01:36 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2014 Canonical Ltd.
++ * Copyright 2016 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -23,6 +23,7 @@
  #include <qpa/qwindowsysteminterface.h>
  #include <private/qobject_p.h>
  #include <QSysInfo>
++#include <MouseTouchAdaptor>
  const char *DEVICE_MISSING_MSG = "No touch device registered. Register one using registerTouchDevice() before using %1";
@@ -40,7 +41,6 @@
          return; \
+     }
--QTouchDevice *UCTestExtras::m_touchDevice = 0;
  UCTestExtras *UCTestExtras::m_testExtras = 0;
  /*!
@@ -118,24 +118,8 @@
   */
  void UCTestExtras::registerTouchDevice()
+ {
--    // check if there is any touch device registered in the system
--    if (!m_touchDevice) {
--        QList<const QTouchDevice*> touchDevices = QTouchDevice::devices();
--        Q_FOREACH(const QTouchDevice *device, touchDevices) {
--            if (device->type() == QTouchDevice::TouchScreen) {
--                m_touchDevice = const_cast<QTouchDevice*>(device);
--                break;
--            }
--        }
--    }
--    // if none, register one
--    if (!m_touchDevice) {
--        m_touchDevice = new QTouchDevice;
--        m_touchDevice->setType(QTouchDevice::TouchScreen);
--        QWindowSystemInterface::registerTouchDevice(m_touchDevice);
--        if (m_testExtras) {
--            Q_EMIT m_testExtras->touchDevicePresentChanged();
--        }
++    if (UbuntuToolkit::MouseTouchAdaptor::registerTouchDevice() && m_testExtras) {
++        Q_EMIT m_testExtras->touchDevicePresentChanged();
+     }
+ }
@@ -148,7 +132,7 @@
  void UCTestExtras::touchPress(int touchId, QQuickItem *item, const QPoint &point)
+ {
      CHECK_TOUCH_DEVICE(touchId, item);
--    QTest::touchEvent(item->window(), m_touchDevice).press(touchId, item->mapToScene(point).toPoint(), item->window());
++    QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).press(touchId, item->mapToScene(point).toPoint(), item->window());
+ }
  /*!
   * \qmlmethod TestExtras::touchRelease(touchId, item, point)
@@ -158,7 +142,7 @@
  void UCTestExtras::touchRelease(int touchId, QQuickItem *item, const QPoint &point)
+ {
      CHECK_TOUCH_DEVICE(touchId, item);
--    QTest::touchEvent(item->window(), m_touchDevice).release(touchId, item->mapToScene(point).toPoint(), item->window());
++    QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).release(touchId, item->mapToScene(point).toPoint(), item->window());
+ }
  /*!
   * \qmlmethod TestExtras::touchClick(touchId, item, point)
@@ -207,7 +191,7 @@
  void UCTestExtras::touchMove(int touchId, QQuickItem *item, const QPoint &point)
+ {
      CHECK_TOUCH_DEVICE(touchId, item);
--    QTest::touchEvent(item->window(), m_touchDevice).move(touchId, item->mapToScene(point).toPoint(), item->window());
++    QTest::touchEvent(item->window(), UbuntuToolkit::MouseTouchAdaptor::touchDevice()).move(touchId, item->mapToScene(point).toPoint(), item->window());
+ }
  /*!
   * \qmlmethod TestExtras::touchDrag(touchId, item, from, delta, steps = 5)
 === modified file 'src/Ubuntu/Test/plugin/uctestextras.h'
 --- src/Ubuntu/Test/plugin/uctestextras.h	2015-12-17 14:42:40 +0000
 +++ src/Ubuntu/Test/plugin/uctestextras.h	2016-04-07 16:01:36 +0000
@@ -53,7 +53,6 @@
      static void mouseDragWithPoints(QQuickItem *item, QList<QPoint> points, Qt::MouseButton button, Qt::KeyboardModifiers stateKey = 0, int delay = -1);
  private:
--    static QTouchDevice *m_touchDevice;
      static UCTestExtras *m_testExtras;
      friend class UCMouseTouchAdaptor;
 === modified file 'src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro'
 --- src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-02-25 14:35:59 +0000
 +++ src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-04-07 16:01:36 +0000
@@ -1,7 +1,14 @@
  TEMPLATE=lib
  TARGET=UbuntuToolkit
--QT *= core-private gui-private qml qml-private quick quick-private
++QT *= core-private gui-private qml qml-private quick quick-private testlib
++
++!contains(QT_ARCH, arm) {
++    DEFINES += UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
++    LIBS += -lX11 -lxcb -lXi
++
++    SOURCES += mousetouchadaptor_x11.cpp
++}
  CONFIG += dll no_keywords c++11
@@ -17,9 +24,12 @@
      ubuntutoolkitglobal.h \
      tree.h \
      asyncloader.h \
--    asyncloader_p.h
++    asyncloader_p.h \
++    mousetouchadaptor.h \
++    mousetouchadaptor_p.h
  SOURCES += \
      colorutils.cpp \
      tree.cpp \
--    asyncloader.cpp
++    asyncloader.cpp \
++    mousetouchadaptor.cpp
 === renamed file 'src/Ubuntu/Test/plugin/ucmousetouchadaptor.cpp' => 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp'
 --- src/Ubuntu/Test/plugin/ucmousetouchadaptor.cpp	2015-11-10 14:42:20 +0000
 +++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp	2016-04-07 16:01:36 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013,2015 Canonical, Ltd.
++ * Copyright (C) 2013,2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -14,36 +14,34 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
   * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
++ *              Zsombor Egri <zsomboir.egri@canonical.com>
   */
--#include "ucmousetouchadaptor.h"
--#include "uctestextras.h"
++#include "mousetouchadaptor_p.h"
++#include <qpa/qplatformnativeinterface.h>
  #include <qpa/qwindowsysteminterface.h>
  #include <QCoreApplication>
  #include <QMouseEvent>
  #include <QTest>
--using QTest::QTouchEventSequence;
--
--namespace {
--
--Qt::MouseButton translateMouseButton(xcb_button_t detail)
++#ifdef UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
++    #define ENABLE_TOUCH_EMULATION
++#endif
++
++namespace UbuntuToolkit {
++
++QTouchDevice *MouseTouchAdaptor::m_touchDevice = nullptr;
++
++MouseTouchAdaptorPrivate::~MouseTouchAdaptorPrivate()
+ {
--    switch (detail) {
--        case 1: return Qt::LeftButton;
--        case 2: return Qt::MidButton;
--        case 3: return Qt::RightButton;
--        // Button values 4-7 are Wheel events
--        default: return Qt::NoButton;
--    }
++    QCoreApplication::instance()->removeNativeEventFilter(this);
+ }
--} // end of anonymous namespace
  /*!
   * \qmltype MouseTouchAdaptor
-- * \instantiates UCMouseTouchAdaptor
++ * \instantiates MouseTouchAdaptor
   * \inqmlmodule Ubuntu.Test 1.0
   * \ingroup ubuntu-test
   * \brief Singleton type turning mouse events into single finger touch events.
@@ -60,109 +58,49 @@
   * \endqml
+  *
   */
--UCMouseTouchAdaptor::UCMouseTouchAdaptor()
--    : QObject(nullptr)
--    , m_leftButtonIsPressed(false)
--    , m_enabled(true)
--{
--    QCoreApplication::instance()->installNativeEventFilter(this);
--
--    UCTestExtras::registerTouchDevice();
--    m_touchDevice = UCTestExtras::m_touchDevice;
--}
--
--bool UCMouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,
--                                          void * message, long * /*result*/)
--{
--    if (!m_enabled) {
--        return false;
--    }
--
--    if (eventType != "xcb_generic_event_t") {
--        // wrong backend.
--        qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");
--        return false;
--    }
--
--    xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);
--
--    switch (xcbEvent->response_type & ~0x80) {
--        case XCB_BUTTON_PRESS:
--            return handleButtonPress(reinterpret_cast<xcb_button_press_event_t *>(xcbEvent));
--            break;
--        case XCB_BUTTON_RELEASE:
--            return handleButtonRelease(reinterpret_cast<xcb_button_release_event_t *>(xcbEvent));
--            break;
--        case XCB_MOTION_NOTIFY:
--            return handleMotionNotify(reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent));
--            break;
--        default:
--            return false;
--            break;
--    };
--}
--
--bool UCMouseTouchAdaptor::handleButtonPress(xcb_button_press_event_t *pressEvent)
--{
--    Qt::MouseButton button = translateMouseButton(pressEvent->detail);
--
--    // Just eat the event if it wasn't a left mouse press
--    if (button != Qt::LeftButton)
--        return true;
--
--    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));
--
--    QPoint windowPos(pressEvent->event_x / targetWindow->devicePixelRatio(), pressEvent->event_y / targetWindow->devicePixelRatio());
--
--    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
--                                                       false /* autoCommit */);
--    touchEvent.press(0 /* touchId */, windowPos);
--    touchEvent.commit(false /* processEvents */);
--
--    m_leftButtonIsPressed = true;
--    return true;
--}
--
--bool UCMouseTouchAdaptor::handleButtonRelease(xcb_button_release_event_t *releaseEvent)
--{
--    Qt::MouseButton button = translateMouseButton(releaseEvent->detail);
--
--    // Just eat the event if it wasn't a left mouse release
--    if (button != Qt::LeftButton)
--        return true;
--
--    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));
--
--    QPoint windowPos(releaseEvent->event_x / targetWindow->devicePixelRatio(), releaseEvent->event_y / targetWindow->devicePixelRatio());
--
--    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
--                                                       false /* autoCommit */);
--    touchEvent.release(0 /* touchId */, windowPos);
--    touchEvent.commit(false /* processEvents */);
--
--    m_leftButtonIsPressed = false;
--    return true;
--}
--
--bool UCMouseTouchAdaptor::handleMotionNotify(xcb_motion_notify_event_t *event)
--{
--    if (!m_leftButtonIsPressed) {
--        return true;
--    }
--
--    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));
--
--    QPoint windowPos(event->event_x / targetWindow->devicePixelRatio(), event->event_y / targetWindow->devicePixelRatio());
--
--    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
--                                                       false /* autoCommit */);
--    touchEvent.move(0 /* touchId */, windowPos);
--    touchEvent.commit(false /* processEvents */);
--
--    return true;
--}
--
--QWindow *UCMouseTouchAdaptor::findQWindowWithXWindowID(WId windowId)
++MouseTouchAdaptor::MouseTouchAdaptor(QObject *parent)
++    :
++#ifdef UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
++      QObject(*(new X11MouseTouchAdaptorPrivate), parent)
++#else
++      QObject(*(new MouseTouchAdaptorPrivate), parent)
++#endif
++{
++#ifdef ENABLE_TOUCH_EMULATION
++    registerTouchDevice();
++#else
++    qWarning() << "MouseTouchAdaptor not available on this architecture.";
++#endif
++    Q_D(MouseTouchAdaptor);
++    d->init();
++}
++
++// registers a test touch device, returns true if a device was found/registered
++bool MouseTouchAdaptor::registerTouchDevice()
++{
++    // check if there is any touch device registered in the system
++    if (!m_touchDevice) {
++        QList<const QTouchDevice*> touchDevices = QTouchDevice::devices();
++        Q_FOREACH(const QTouchDevice *device, touchDevices) {
++            if (device->type() == QTouchDevice::TouchScreen) {
++                m_touchDevice = const_cast<QTouchDevice*>(device);
++                return true;
++            }
++        }
++    }
++    // if none, register one
++#ifdef ENABLE_TOUCH_EMULATION
++    if (!m_touchDevice) {
++        m_touchDevice = new QTouchDevice;
++        m_touchDevice->setType(QTouchDevice::TouchScreen);
++        QWindowSystemInterface::registerTouchDevice(m_touchDevice);
++        return true;
++    }
++#endif
++    return false;
++}
++
++QWindow *MouseTouchAdaptorPrivate::findQWindowWithXWindowID(WId windowId)
+ {
      QWindowList windowList = QGuiApplication::topLevelWindows();
      QWindow *foundWindow = nullptr;
@@ -185,14 +123,16 @@
   * \qmlproperty bool MouseTouchAdaptor::enabled
   * Enables the mouse to touch conversion functionality. Defaults to true.
   */
--bool UCMouseTouchAdaptor::enabled() const
--{
--    return m_enabled;
--}
--void UCMouseTouchAdaptor::setEnabled(bool value)
--{
--    if (value != m_enabled) {
--        m_enabled = value;
--        Q_EMIT enabledChanged(value);
--    }
--}
++bool MouseTouchAdaptorPrivate::isEnabled() const
++{
++    return enabled;
++}
++void MouseTouchAdaptorPrivate::setEnabled(bool value)
++{
++    Q_UNUSED(value);
++    qWarning() << "MouseTouchAdaptor not available on this architecture, thus cannot be enabled.";
++}
++
++} // namespace UbuntuToolkit
++
++#include "moc_mousetouchadaptor.cpp"
 === renamed file 'src/Ubuntu/Test/plugin/ucmousetouchadaptor.h' => 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h'
 --- src/Ubuntu/Test/plugin/ucmousetouchadaptor.h	2015-10-21 08:33:21 +0000
 +++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h	2016-04-07 16:01:36 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013,2015 Canonical, Ltd.
++ * Copyright (C) 2013,2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -14,47 +14,50 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
   * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
++ *              Zsombor Egri <zsomboir.egri@canonical.com>
   */
  #ifndef MOUSE_TOUCH_ADAPTOR_H
  #define MOUSE_TOUCH_ADAPTOR_H
--#include <QtCore/QAbstractNativeEventFilter>
--#include <QWindow>
--#include <xcb/xcb.h>
++#include "ubuntutoolkitglobal.h"
++
++#include <QtCore/QObject>
  class QMouseEvent;
  class QTouchDevice;
++class QQmlEngine;
++class QJSEngine;
++
++namespace UbuntuToolkit {
  // Transforms QMouseEvents into single-finger QTouchEvents.
--class UCMouseTouchAdaptor : public QObject, public QAbstractNativeEventFilter
++class MouseTouchAdaptorPrivate;
++class UBUNTUTOOLKIT_EXPORT MouseTouchAdaptor : public QObject
+ {
      Q_OBJECT
++    Q_PRIVATE_PROPERTY(MouseTouchAdaptor::d_func(), bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
  public:
--    UCMouseTouchAdaptor();
--
--    // Filters mouse events and posts the equivalent QTouchEvents.
--    bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) override;
--
--    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
--
--    bool enabled() const;
--    void setEnabled(bool value);
++    explicit MouseTouchAdaptor(QObject *parent = Q_NULLPTR);
++
++    static bool registerTouchDevice();
++    inline static QTouchDevice *touchDevice()
++    {
++        return m_touchDevice;
++    }
++    static QObject *registerQmlSingleton(QQmlEngine*, QJSEngine*)
++    {
++        return new MouseTouchAdaptor;
++    }
  Q_SIGNALS:
      void enabledChanged(bool value);
  private:
--
--    bool handleButtonPress(xcb_button_press_event_t *pressEvent);
--    bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);
--    bool handleMotionNotify(xcb_motion_notify_event_t *event);
--    QWindow *findQWindowWithXWindowID(WId windowId);
--
--    QTouchDevice *m_touchDevice;
--    bool m_leftButtonIsPressed;
--
--    bool m_enabled;
++    Q_DECLARE_PRIVATE(MouseTouchAdaptor)
++    static QTouchDevice *m_touchDevice;
  };
++} // namespace UbuntuToolkit
++
  #endif // MOUSE_TOUCH_ADAPTOR_H
 === added file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h'
 --- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	1970-01-01 00:00:00 +0000
 +++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	2016-04-07 16:01:36 +0000
@@ -0,0 +1,77 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Zsombor Egri <zsombor.egri@canonical.com>
++ */
++
++#ifndef MOUSETOUCHADAPTOR_P
++#define MOUSETOUCHADAPTOR_P
++
++#include "mousetouchadaptor.h"
++#include <QtCore/private/qobject_p.h>
++#include <QtCore/QAbstractNativeEventFilter>
++#include <QWindow>
++#include <xcb/xcb.h>
++
++namespace UbuntuToolkit {
++
++class MouseTouchAdaptorPrivate : public QObjectPrivate, public QAbstractNativeEventFilter
++{
++    Q_DECLARE_PUBLIC(MouseTouchAdaptor)
++public:
++    MouseTouchAdaptorPrivate() : QObjectPrivate() {}
++    ~MouseTouchAdaptorPrivate();
++
++    virtual void init() {}
++    virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result)
++            { Q_UNUSED(eventType); Q_UNUSED(message); Q_UNUSED(result); return false; }
++    bool isEnabled() const;
++    virtual void setEnabled(bool enabled);
++
++    QWindow *findQWindowWithXWindowID(WId windowId);
++
++    // fields
++    bool enabled{false};
++};
++
++#ifdef UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
++class X11MouseTouchAdaptorPrivate : public MouseTouchAdaptorPrivate
++{
++    Q_DECLARE_PUBLIC(MouseTouchAdaptor)
++public:
++    X11MouseTouchAdaptorPrivate();
++
++    void init() Q_DECL_OVERRIDE;
++    bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) Q_DECL_OVERRIDE;
++    void setEnabled(bool value);
++
++    bool xi2HandleEvent(xcb_ge_event_t *event);
++    bool handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);
++    bool handleButtonRelease(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);
++    bool handleMotionNotify(WId windowId, uint32_t modifiers, int x, int y);
++
++    bool m_leftButtonIsPressed;
++    bool m_triPressModifier;
++
++    bool m_xi2Enabled{false};
++    int m_xi2Minor{-1};
++    int m_xiOpCode, m_xiEventBase, m_xiErrorBase;
++};
++#endif
++
++} // namespace UbuntuToolkit
++
++#endif // MOUSETOUCHADAPTOR_P
++
 === added file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp'
 --- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp	1970-01-01 00:00:00 +0000
 +++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp	2016-04-07 16:01:36 +0000
@@ -0,0 +1,350 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Zsombor Egri <zsombor.egri@canonical.com>
++ */
++
++/* Some parts of the code were copied from the XCB platform plugin of the Qt Toolkit,
++ * which is under the following license:
++ */
++
++/****************************************************************************
++**
++** Copyright (C) 2015 The Qt Company Ltd.
++** Contact: http://www.qt.io/licensing/
++**
++** This file is part of the .
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see http://www.qt.io/terms-conditions. For further
++** information use the contact form at http://www.qt.io/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** As a special exception, The Qt Company gives you certain additional
++** rights. These rights are described in The Qt Company LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "mousetouchadaptor_p.h"
++
++#include <qpa/qplatformnativeinterface.h>
++
++#include <QCoreApplication>
++#include <QMouseEvent>
++#include <QTest>
++
++#include <X11/extensions/XInput2.h>
++#include <X11/extensions/XI2proto.h>
++
++using QTest::QTouchEventSequence;
++
++namespace {
++
++const Qt::KeyboardModifiers TRI_PRESS_MODIFIER = Qt::ShiftModifier|Qt::ControlModifier|Qt::AltModifier;
++
++Qt::MouseButton translateMouseButton(xcb_button_t detail)
++{
++    switch (detail) {
++        case 1: return Qt::LeftButton;
++        case 2: return Qt::MidButton;
++        case 3: return Qt::RightButton;
++        // Button values 4-7 are Wheel events
++        default: return Qt::NoButton;
++    }
++}
++
++Qt::KeyboardModifiers translateMofidier(uint32_t mod)
++{
++    Qt::KeyboardModifiers qtMod = Qt::NoModifier;
++
++    if (mod & 0x01) qtMod |= Qt::ShiftModifier;
++    if (mod & 0x04) qtMod |= Qt::ControlModifier;
++    if (mod & 0x08) qtMod |= Qt::AltModifier;
++    if (mod & 0x80) qtMod |= Qt::MetaModifier;
++
++    return qtMod;
++}
++
++} // end of anonymous namespace
++
++
++namespace UbuntuToolkit {
++
++X11MouseTouchAdaptorPrivate::X11MouseTouchAdaptorPrivate()
++    : m_leftButtonIsPressed(false)
++    , m_triPressModifier(false)
++{
++    enabled = true;
++}
++
++void X11MouseTouchAdaptorPrivate::init()
++{
++    QPlatformNativeInterface *nativeInterface = qGuiApp->platformNativeInterface();
++    Display *xDisplay = static_cast<Display*>(nativeInterface->nativeResourceForIntegration("Display"));
++    if (xDisplay && XQueryExtension(xDisplay, "XInputExtension", &m_xiOpCode, &m_xiEventBase, &m_xiErrorBase)) {
++        int xiMajor = 2;
++        m_xi2Minor = 2; // try 2.2 first, needed for TouchBegin/Update/End
++        if (XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) == BadRequest) {
++            m_xi2Minor = 1; // for smooth scrolling 2.1 is enough
++            if (XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) == BadRequest) {
++                m_xi2Minor = 0; // for tablet support 2.0 is enough
++                m_xi2Enabled = XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) != BadRequest;
++            } else
++                m_xi2Enabled = true;
++        } else {
++            m_xi2Enabled = true;
++        }
++    }
++
++    QCoreApplication::instance()->installNativeEventFilter(this);
++}
++
++void X11MouseTouchAdaptorPrivate::setEnabled(bool value)
++{
++    if (value != enabled) {
++        enabled = value;
++        Q_EMIT q_func()->enabledChanged(value);
++    }
++}
++
++// Starting from the xcb version 1.9.3 struct xcb_ge_event_t has changed:
++// - "pad0" became "extension"
++// - "pad1" and "pad" became "pad0"
++// New and old version of this struct share the following fields:
++// NOTE: API might change again in the next release of xcb in which case this comment will
++// need to be updated to reflect the reality.
++typedef struct qt_xcb_ge_event_t {
++    uint8_t  response_type;
++    uint8_t  extension;
++    uint16_t sequence;
++    uint32_t length;
++    uint16_t event_type;
++} qt_xcb_ge_event_t;
++
++bool xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *ev, int opCode)
++{
++    qt_xcb_ge_event_t *event = (qt_xcb_ge_event_t *)ev;
++    // xGenericEvent has "extension" on the second byte, the same is true for xcb_ge_event_t starting from
++    // the xcb version 1.9.3, prior to that it was called "pad0".
++    if (event->extension == 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, overwriting the full_sequence field.
++        memmove((char*) event + 32, (char*) event + 36, event->length * 4);
++        return true;
++    }
++    return false;
++}
++
++static inline qreal fixed1616ToReal(FP1616 val)
++{
++    return qreal(val) / 0x10000;
++}
++
++bool X11MouseTouchAdaptorPrivate::xi2HandleEvent(xcb_ge_event_t *event)
++{
++    if (!xi2PrepareXIGenericDeviceEvent(event, m_xiOpCode)) {
++        return false;
++    }
++
++    xXIGenericDeviceEvent *xiEvent = reinterpret_cast<xXIGenericDeviceEvent *>(event);
++    xXIDeviceEvent *xiDeviceEvent = 0;
++
++    switch (xiEvent->evtype) {
++    case XI_ButtonPress:
++    case XI_ButtonRelease:
++    case XI_Motion:
++        xiDeviceEvent = reinterpret_cast<xXIDeviceEvent *>(event);
++        break;
++    default:
++        break;
++    }
++
++    if (!xiDeviceEvent) {
++        return false;
++    }
++
++    switch (xiDeviceEvent->evtype) {
++    case XI_ButtonPress:
++        return handleButtonPress(
++                static_cast<WId>(xiDeviceEvent->event),
++                xiDeviceEvent->detail,
++                xiDeviceEvent->mods.base_mods,
++                fixed1616ToReal(xiDeviceEvent->event_x),
++                fixed1616ToReal(xiDeviceEvent->event_y));
++    case XI_ButtonRelease:
++        return handleButtonRelease(
++                static_cast<WId>(xiDeviceEvent->event),
++                xiDeviceEvent->detail,
++                    xiDeviceEvent->mods.base_mods,
++                fixed1616ToReal(xiDeviceEvent->event_x),
++                fixed1616ToReal(xiDeviceEvent->event_y));
++    case XI_Motion:
++        return handleMotionNotify(
++                static_cast<WId>(xiDeviceEvent->event),
++                xiDeviceEvent->mods.base_mods,
++                fixed1616ToReal(xiDeviceEvent->event_x),
++                fixed1616ToReal(xiDeviceEvent->event_y));
++        return true;
++    default:
++        return false;
++    }
++}
++
++bool X11MouseTouchAdaptorPrivate::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
++{
++    Q_UNUSED(result);
++    static int eventCount = 0;
++    eventCount++;
++    if (!enabled) {
++        return false;
++    }
++
++    if (eventType != "xcb_generic_event_t") {
++        // wrong backend.
++        qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");
++        return false;
++    }
++
++    xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);
++
++    switch (xcbEvent->response_type & ~0x80) {
++        case XCB_BUTTON_PRESS: {
++            auto pressEvent = reinterpret_cast<xcb_button_press_event_t *>(xcbEvent);
++            return handleButtonPress(static_cast<WId>(pressEvent->event), pressEvent->detail, 0,
++                    pressEvent->event_x, pressEvent->event_y);
++        }
++        case XCB_BUTTON_RELEASE: {
++            auto releaseEvent = reinterpret_cast<xcb_button_release_event_t *>(xcbEvent);
++            return handleButtonRelease(static_cast<WId>(releaseEvent->event), releaseEvent->detail, 0,
++                    releaseEvent->event_x, releaseEvent->event_y);
++        }
++        case XCB_MOTION_NOTIFY: {
++            auto motionEvent = reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent);
++            return handleMotionNotify(static_cast<WId>(motionEvent->event), 0,
++                                      motionEvent->event_x, motionEvent->event_y);
++        }
++        case XCB_GE_GENERIC:
++            if (m_xi2Enabled) {
++                return xi2HandleEvent(reinterpret_cast<xcb_ge_event_t *>(xcbEvent));
++            } else {
++                return false;
++            }
++        default:
++            return false;
++    };
++}
++
++bool X11MouseTouchAdaptorPrivate::handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y)
++{
++    Qt::MouseButton button = translateMouseButton(detail);
++    Qt::KeyboardModifiers qtMod = translateMofidier(modifiers);
++
++    // Just eat the event if it wasn't a left mouse press
++    if (button != Qt::LeftButton)
++        return true;
++
++    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
++
++    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
++
++    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
++                                                       false /* autoCommit */);
++    touchEvent.press(0 /* touchId */, windowPos);
++    if (qtMod == TRI_PRESS_MODIFIER) {
++        touchEvent.press(1, windowPos);
++        touchEvent.press(2, windowPos);
++        m_triPressModifier = true;
++    }
++    touchEvent.commit(false /* processEvents */);
++
++    m_leftButtonIsPressed = true;
++    return true;
++}
++
++bool X11MouseTouchAdaptorPrivate::handleButtonRelease(WId windowId, uint32_t detail, uint32_t, int x, int y)
++{
++    Qt::MouseButton button = translateMouseButton(detail);
++
++    // Don't eat the event if it wasn't a left mouse press
++    if (button != Qt::LeftButton)
++        return false;
++
++    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
++
++    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
++
++    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
++                                                       false /* autoCommit */);
++    touchEvent.release(0 /* touchId */, windowPos);
++    if (m_triPressModifier) {
++        touchEvent.release(1, windowPos);
++        touchEvent.release(2, windowPos);
++    }
++    touchEvent.commit(false /* processEvents */);
++
++    m_leftButtonIsPressed = false;
++    m_triPressModifier = false;
++    return true;
++}
++
++bool X11MouseTouchAdaptorPrivate::handleMotionNotify(WId windowId, uint32_t modifiers, int x, int y)
++{
++    if (!m_leftButtonIsPressed) {
++        return true;
++    }
++    Qt::KeyboardModifiers qtMod = translateMofidier(modifiers);
++
++    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
++
++    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
++
++    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, MouseTouchAdaptor::touchDevice(),
++                                                       false /* autoCommit */);
++    touchEvent.move(0 /* touchId */, windowPos);
++    if (m_triPressModifier) {
++        if (qtMod == TRI_PRESS_MODIFIER) {
++            touchEvent.move(1, windowPos);
++            touchEvent.move(2, windowPos);
++        } else {
++            // released modifiers
++            touchEvent.release(1, windowPos);
++            touchEvent.release(2, windowPos);
++            m_triPressModifier = false;
++        }
++    }
++    touchEvent.commit(false /* processEvents */);
++
++    return true;
++}
++
++} // namespace UbuntuToolkit
 === added file 'tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.py	2016-04-07 16:01:36 +0000
@@ -0,0 +1,38 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Copyright (C) 2016 Canonical Ltd.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License as published by
++# the Free Software Foundation; version 3.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU Lesser General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++import os
++from testtools.matchers import Equals
++from autopilot.matchers import Eventually
++from ubuntuuitoolkit import tests
++
++
++class TouchAdaptorTestCase(tests.QMLFileAppTestCase):
++    path = os.path.abspath(__file__)
++    dir_path = os.path.dirname(path)
++    test_qml_file_path = os.path.join(
++        dir_path, 'test_touchadaptor.qml')
++
++    def get_command_line(self, command_line):
++        command_line.append('-touch')
++        return command_line
++
++    def test_apparent_touch_screen(self):
++        touchArea = self.main_view.select_single(objectName="touchArea")
++        label = self.main_view.select_single(objectName="label")
++        # Trigger handlers as a courtesy to a watching person
++        self.pointing_device.click_object(touchArea)
++        self.assertThat(label.text, Eventually(Equals("Touched")))
 === added file 'tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.qml'
 --- tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.qml	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/test_touchadaptor.qml	2016-04-07 16:01:36 +0000
@@ -0,0 +1,51 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++
++MainView {
++    width: units.gu(48)
++    height: units.gu(60)
++    objectName: "mainView"
++
++    Page {
++        title: "TouchAdaptor"
++
++        MultiPointTouchArea {
++            id: mpa
++            property bool touched: false
++            anchors.fill: parent
++            mouseEnabled: false
++            objectName: "touchArea"
++            touchPoints: TouchPoint {
++                id: point1
++                onPressedChanged: {
++                    if (pressed) {
++                        label.text = "Touched";
++                    }
++                }
++            }
++
++            Label {
++                id: label
++                objectName: "label"
++                anchors.centerIn: parent
++                text: "Not touched"
++            }
++        }
++    }
++}
 === modified file 'tests/unit_x11/tst_components/tst_adaptivepagelayout.qml'
 --- tests/unit_x11/tst_components/tst_adaptivepagelayout.qml	2016-03-07 06:19:27 +0000
 +++ tests/unit_x11/tst_components/tst_adaptivepagelayout.qml	2016-04-07 16:01:36 +0000
@@ -314,6 +314,7 @@
              ];
+         }
          function test_forced_synchronous_loading_bug1540449(data) {
++            layout.asynchronous = false;
              layout[data.func](layout.primaryPage, data.page);
              waitForRendering(layout, 400);
 === modified file 'ubuntu-sdk.pro'
 --- ubuntu-sdk.pro	2015-12-11 13:35:10 +0000
 +++ ubuntu-sdk.pro	2016-04-07 16:01:36 +0000
@@ -8,7 +8,10 @@
  requires(qtHaveModule(quick))
  load(qt_parts)
--SUBDIRS += po documentation app-launch-profiler ubuntu-ui-toolkit-launcher apicheck
++src_uitk_launcher.subdir = ubuntu-ui-toolkit-launcher
++src_uitk_launcher.depends = sub-src
++
++SUBDIRS += po documentation app-launch-profiler src_uitk_launcher apicheck
  sub_tests.CONFIG -= no_default_target
  sub_tests.CONFIG -= no_default_install
 === removed file 'ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.cpp'
 --- ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.cpp	2014-06-16 09:50:56 +0000
 +++ ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.cpp	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
--/*
-- * Copyright 2014 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
-- *
-- */
--
--#include "MouseTouchAdaptor.h"
--
--#include <qpa/qwindowsysteminterface.h>
--
--#include <QtGui/QMouseEvent>
--#include <QtTest/QTest>
--
--using QTest::QTouchEventSequence;
--
--namespace {
--Qt::MouseButton translateMouseButton(xcb_button_t detail)
--{
--    switch (detail) {
--        case 1: return Qt::LeftButton;
--        case 2: return Qt::MidButton;
--        case 3: return Qt::RightButton;
--        // Button values 4-7 are Wheel events
--        default: return Qt::NoButton;
--    }
--}
--} // end of anonymous namespace
--
--MouseTouchAdaptor::MouseTouchAdaptor()
--    : m_leftButtonIsPressed(false)
--{
--    m_touchDevice = new QTouchDevice;
--    m_touchDevice->setType(QTouchDevice::TouchScreen);
--    QWindowSystemInterface::registerTouchDevice(m_touchDevice);
--}
--
--bool MouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,
--                                          void * message, long * /*result*/)
--{
--    if (eventType != "xcb_generic_event_t") {
--        // wrong backend.
--        qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");
--        return false;
--    }
--
--    xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);
--
--    switch (xcbEvent->response_type & ~0x80) {
--        case XCB_BUTTON_PRESS:
--            return handleButtonPress(reinterpret_cast<xcb_button_press_event_t *>(xcbEvent));
--            break;
--        case XCB_BUTTON_RELEASE:
--            return handleButtonRelease(reinterpret_cast<xcb_button_release_event_t *>(xcbEvent));
--            break;
--        case XCB_MOTION_NOTIFY:
--            return handleMotionNotify(reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent));
--            break;
--        default:
--            return false;
--            break;
--    };
--}
--
--bool MouseTouchAdaptor::handleButtonPress(xcb_button_press_event_t *pressEvent)
--{
--    Qt::MouseButton button = translateMouseButton(pressEvent->detail);
--
--    // Skip the event if it wasn't a left mouse press
--    if (button != Qt::LeftButton) {
--        return false;
--    }
--
--    QPoint windowPos(pressEvent->event_x, pressEvent->event_y);
--
--    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));
--
--    // no autoCommit
--    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice, false);
--    touchEvent.press(0, windowPos);
--    // do not process events when committed, let the events be processed with next event loop
--    touchEvent.commit(false);
--
--    m_leftButtonIsPressed = true;
--    return true;
--}
--
--bool MouseTouchAdaptor::handleButtonRelease(xcb_button_release_event_t *releaseEvent)
--{
--    Qt::MouseButton button = translateMouseButton(releaseEvent->detail);
--
--    // Skip the event if it wasn't a left mouse release
--    if (button != Qt::LeftButton) {
--        return false;
--    }
--
--    QPoint windowPos(releaseEvent->event_x, releaseEvent->event_y);
--
--    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));
--
--    // no autoCommit
--    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice, false);
--    touchEvent.release(0, windowPos);
--    // do not process events when committed, let the events be processed with next event loop
--    touchEvent.commit(false);
--
--    m_leftButtonIsPressed = false;
--    return true;
--}
--
--bool MouseTouchAdaptor::handleMotionNotify(xcb_motion_notify_event_t *event)
--{
--    if (!m_leftButtonIsPressed) {
--        return false;
--    }
--
--    QPoint windowPos(event->event_x, event->event_y);
--
--    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));
--
--    // no autoCommit
--    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice, false);
--    touchEvent.move(0, windowPos);
--    // do not process events when committed, let the events be processed with next event loop
--    touchEvent.commit(false);
--
--    return true;
--}
--
--QWindow *MouseTouchAdaptor::findQWindowWithXWindowID(WId windowId)
--{
--    QWindowList windowList = QGuiApplication::topLevelWindows();
--    QWindow *foundWindow = 0;
--
--    int i = 0;
--    while (!foundWindow && i < windowList.count()) {
--        QWindow *window = windowList[i];
--        if (window->winId() == windowId) {
--            foundWindow = window;
--        } else {
--            ++i;
--        }
--    }
--
--    Q_ASSERT(foundWindow);
--    return foundWindow;
--}
 === removed file 'ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.h'
 --- ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.h	2014-06-16 09:50:56 +0000
 +++ ubuntu-ui-toolkit-launcher/MouseTouchAdaptor.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
--/*
-- * Copyright 2014 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
-- *
-- */
--
--#ifndef MOUSE_TOUCH_ADAPTOR_H
--#define MOUSE_TOUCH_ADAPTOR_H
--
--#include <QtCore/QAbstractNativeEventFilter>
--#include <QWindow>
--#include <xcb/xcb.h>
--
--class QMouseEvent;
--class QTouchDevice;
--
--// Transforms QMouseEvents into single-finger QTouchEvents.
--class MouseTouchAdaptor : public QAbstractNativeEventFilter {
--
--public:
--    MouseTouchAdaptor();
--
--    // Filters mouse events and posts the equivalent QTouchEvents.
--    virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result);
--
--private:
--
--    bool handleButtonPress(xcb_button_press_event_t *pressEvent);
--    bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);
--    bool handleMotionNotify(xcb_motion_notify_event_t *event);
--    QWindow *findQWindowWithXWindowID(WId windowId);
--
--    QTouchDevice *m_touchDevice;
--    bool m_leftButtonIsPressed;
--};
--
--#endif // MOUSE_TOUCH_ADAPTOR_H
 === modified file 'ubuntu-ui-toolkit-launcher/launcher.cpp'
 --- ubuntu-ui-toolkit-launcher/launcher.cpp	2015-11-13 09:29:40 +0000
 +++ ubuntu-ui-toolkit-launcher/launcher.cpp	2016-04-07 16:01:36 +0000
@@ -32,19 +32,10 @@
  #include <QtQuick/private/qsgcontext_p.h>
  #include <QtCore/QCommandLineParser>
  #include <QtCore/QCommandLineOption>
--#include "MouseTouchAdaptor.h"
++#include <MouseTouchAdaptor>
  #include <QtGui/QTouchDevice>
  #include <QtQml/qqml.h>
--bool touchDevicePresent()
--{
--    Q_FOREACH(const QTouchDevice *device, QTouchDevice::devices()) {
--        if (device->type() == QTouchDevice::TouchScreen)
--            return true;
--    }
--    return false;
--}
--
  static QObject *s_testRootObject = 0;
  static QObject *testRootObject(QQmlEngine *engine, QJSEngine *jsEngine)
+ {
@@ -151,9 +142,9 @@
          view->setFlags(Qt::FramelessWindowHint);
+     }
--    if (args.isSet(_enableTouch) && !touchDevicePresent()) {
++    if (args.isSet(_enableTouch)) {
          // has no effect if we have touch screen
--        application.installNativeEventFilter(new MouseTouchAdaptor);
++        new UbuntuToolkit::MouseTouchAdaptor(&application);
+     }
      QUrl source(QUrl::fromLocalFile(filename));
 === modified file 'ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro'
 --- ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro	2015-11-19 08:45:15 +0000
 +++ ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro	2016-04-07 16:01:36 +0000
@@ -1,11 +1,9 @@
  TEMPLATE = app
  QT += qml quick
  # For setSharedOpenGLContext
--QT += core-private gui-private testlib quick-private
--CONFIG += no_keywords
--HEADERS += MouseTouchAdaptor.h
--SOURCES += launcher.cpp \
--    MouseTouchAdaptor.cpp
++QT += core-private gui-private testlib quick-private UbuntuToolkit
++CONFIG += no_keywords c++11
++SOURCES += launcher.cpp
  installPath = $$[QT_INSTALL_PREFIX]/bin
  launcher.path = $$installPath
  launcher.files = ubuntu-ui-toolkit-launcher

Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/fixTouchAdaptor into lp:ubuntu-ui-toolkit/staging

Commit message

Description of the change

Preview Diff

Subscribers