Merge lp:~unity-team/qtmir/dpr into lp:qtmir

[Gerry Boland]

Add device pixel ratio support

* Are there any related MPs required for this MP to build/function as expected? Please list.
Nothing depends on this directly, but to do a full test, you'll need:
https://code.launchpad.net/~unity-team/qtubuntu/DPR2/+merge/281664

* Did you perform an exploratory manual test run of your code change and any related functionality?
Y

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/qtmir-ci/252/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/103/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/103/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/252/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/qtmir-ci/254/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/105/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/105/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/254/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

 * Are there any related MPs required for this MP to build/function as expected? Please list.
Nothing depends on this directly, but to do a full test, you'll need:
https://code.launchpad.net/~unity-team/qtubuntu/DPR/+merge/257515
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr/+merge/256470
https://code.launchpad.net/~mzanetti/ubuntu-settings-components/dpr/+merge/253944

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/qtmir-ci/255/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/106
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/106/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/255/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

In src/modules/Unity/Application/mirsurfaceitem.cpp:

"""
- int qmlWidth = (int)width();
- int qmlHeight = (int)height();
+ const qreal dpr = devicePixelRatio();
+ int qmlWidth = (int)width() * dpr;
+ int qmlHeight = (int)height() * dpr;
"""

Now they're no longer representing the qml width and height, thus the naming is misleading.
Better calling them something like newMirWidth and newMirHeight.

Also it would be more correct to cast to int *after* the dpr multiplication: (int)(width() * dpr)

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

In src/modules/Unity/Application/mirsurfaceitem.cpp:

"""
         qCDebug(QTMIR_SURFACES) << "MirSurfaceItem::syncSurfaceSizeWithItemSize()";
- mir::geometry::Size newMirSize((int)width(), (int)height());
+ mir::geometry::Size newMirSize(scaledWidth, scaledHeight);
         m_surface->resize(newMirSize);
- setImplicitSize(width(), height());
+ setImplicitSize(scaledWidth, scaledHeight);
     }
 }
"""

The implicit size should not be scaled.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/qtmir-ci/263/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/114/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/263/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/qtmir-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/29/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/296/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:333
http://jenkins.qa.ubuntu.com/job/qtmir-ci/307/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/40/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/307/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/qtmir-ci/362/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/95/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/362/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:335
http://jenkins.qa.ubuntu.com/job/qtmir-ci/363/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/96
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/96/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/363/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:336
http://jenkins.qa.ubuntu.com/job/qtmir-ci/376/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/109/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/376/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/qtmir-ci/385/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/118/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/385/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/qtmir-ci/403/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/136/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/136/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/403/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

The debian/changelog entry is misplaced. Likely the result of a bad merge with trunk.

[Daniel d'Andrada (dandrader)]

The only way I see of saving MirSurface from knowing about DPR is passing it the event data directly as parameters instead of giving it the whole QEvent.

Eg:

MirSurface::mouseMoveEvent(QMouseEvent *event, qreal dpr)

Would be:

MirSurface::mouseMoveEvent(Qt::MouseButtons buttons, ulong timestamp, Qt::KeyboardModifiers modifiers, int x, int y)

Which is actually not a bad thing.

[Gerry Boland (gerboland)]

> The only way I see of saving MirSurface from knowing about DPR is passing it
> the event data directly as parameters instead of giving it the whole QEvent.
>
> Eg:
>
> MirSurface::mouseMoveEvent(QMouseEvent *event, qreal dpr)
>
> Would be:
>
> MirSurface::mouseMoveEvent(Qt::MouseButtons buttons, ulong timestamp,
> Qt::KeyboardModifiers modifiers, int x, int y)
>
> Which is actually not a bad thing.

For touch events too?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/qtmir-ci/429/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/125
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/162
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/429/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

On 18/09/15 08:44, Gerry Boland wrote:
>> The only way I see of saving MirSurface from knowing about DPR is passing it
>> the event data directly as parameters instead of giving it the whole QEvent.
>>
>> Eg:
>>
>> MirSurface::mouseMoveEvent(QMouseEvent *event, qreal dpr)
>>
>> Would be:
>>
>> MirSurface::mouseMoveEvent(Qt::MouseButtons buttons, ulong timestamp,
>> Qt::KeyboardModifiers modifiers, int x, int y)
>>
>> Which is actually not a bad thing.
> For touch events too?

You'll have to to copy the QList<QTouchEvent::TouchPoint> parameter so
you can transform the points. Is that what you're afraid of (performance
hit)?

[Gerry Boland (gerboland)]

> On 18/09/15 08:44, Gerry Boland wrote:
> >> The only way I see of saving MirSurface from knowing about DPR is passing
> it
> >> the event data directly as parameters instead of giving it the whole
> QEvent.
> >>
> >> Eg:
> >>
> >> MirSurface::mouseMoveEvent(QMouseEvent *event, qreal dpr)
> >>
> >> Would be:
> >>
> >> MirSurface::mouseMoveEvent(Qt::MouseButtons buttons, ulong timestamp,
> >> Qt::KeyboardModifiers modifiers, int x, int y)
> >>
> >> Which is actually not a bad thing.
> > For touch events too?
>
> You'll have to to copy the QList<QTouchEvent::TouchPoint> parameter so
> you can transform the points. Is that what you're afraid of (performance
> hit)?

Well more generally, it seems to be so much work just for a multiplication. Is why I'm hesitating.

[Daniel d'Andrada (dandrader)]

In mirsurfaceitem.cpp:

"""
m_lastTouchEvent->touchPoints = touchPoints; ////????
"""

????

[Daniel d'Andrada (dandrader)]

In mirsurfceitem.cpp:

"""
Note: all geometry is in device-pixels, except that contained in variables with the
"""

s/device-pixels/device-independent pixels

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:341
http://jenkins.qa.ubuntu.com/job/qtmir-ci/507/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/203
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/240
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/507/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

"""
const float kP = mir_touch_event_axis_value(tev, i, mir_touch_axis_pressure) / dpr;
"""

Not sure if the pressure axis has any relationship with x & y dimensions to deserve the dpr conversion.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:343
http://jenkins.qa.ubuntu.com/job/qtmir-ci/508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/204
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/204/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/241
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/86

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/508/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

http://bazaar.launchpad.net/~dandrader/qtmir/dpr/revision/386

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:344
http://jenkins.qa.ubuntu.com/job/qtmir-ci/510/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/206
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/243
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/510/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/qtmir-ci/522/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/218/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/218
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/218/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/255
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/100

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/522/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:347
http://jenkins.qa.ubuntu.com/job/qtmir-ci/547/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/243
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/125
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/280/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/280/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/125/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/547/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/qtmir-ci/548/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/244
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/126
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/281/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/281/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/126/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/548/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:350
http://jenkins.qa.ubuntu.com/job/qtmir-ci/551/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/247
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/247/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/129
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/129/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/551/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:351
http://jenkins.qa.ubuntu.com/job/qtmir-ci/564/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/260
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/260/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/142
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/142/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/564/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:352
http://jenkins.qa.ubuntu.com/job/qtmir-ci/608/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/304/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/304/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/186/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/341/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/341/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/186/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/608/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:354
http://jenkins.qa.ubuntu.com/job/qtmir-ci/615/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/311
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/193
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/348/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/348/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/193/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/615/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:355
http://jenkins.qa.ubuntu.com/job/qtmir-ci/625/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/321
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/201
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/356/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/201/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/625/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

In MirSurfaceItem::updatePaintNode, I would move the "const qreal dpr" declaration next to the single place where it's used.

[Daniel d'Andrada (dandrader)]

Still in MirSurfaceItem::updatePaintNode:

"""
qreal u = targetRect.width() / textureSize.width() * dpr;
"""

Would be better expressed as:

"""
qreal u = (targetRect.width() * dpr) / textureSize.width();
"""

To make it obvious that your're converting targetRect.width() from DIP (or layout pixels) to actual/physical pixels, which is the unit of textureSize.width().

Likewise for the v coordinate.

[Daniel d'Andrada (dandrader)]

In src/platforms/mirserver/qteventfeeder.cpp:

"""
    qreal getDevicePixelRatio() override
    {
        return qGuiApp->devicePixelRatio(); // FIXME: make per-screen.
    }
"""

Qt coding style doesn't use the "get" prefix for getters. I think we should stick to it unless there's a good reason to deviate.

[Daniel d'Andrada (dandrader)]

In QtEventFeeder::dispatchPointer:

"""
    auto movement = QPointF(mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_x) / dpr,
                            mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_y)) / dpr;
"""

I think you meant:

"""
    auto movement = QPointF(mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_x) / dpr,
                            mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_y) / dpr);
"""

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

Nitpick in Screen::Screen

"""
    bool ok;
    const int dpr = qGetEnvIntValue("QT_DEVICE_PIXEL_RATIO", &ok);
    m_devicePixelRatio = (ok && dpr > 0) ? dpr : 1.0;
"""

You would be better off moving this whole snippet into a separate function instead of just the qGetEnvIntValue part (as it's used only once anyway). That would spare the constructor namespace from getting polluted with those helper variables ok and dpr.

PS: That's what happens when you re-review something. You start to nitpick :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:358
http://jenkins.qa.ubuntu.com/job/qtmir-ci/631/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/327
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/327/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/207
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/362/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/364/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/207/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/631/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

I can merge this into trunk just fine. LP confused?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:360
http://jenkins.qa.ubuntu.com/job/qtmir-ci/633/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/329
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/329/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/209
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/364/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/209/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/633/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:360
http://jenkins.qa.ubuntu.com/job/qtmir-ci/634/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/330
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/210
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/365/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/367/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/210/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/634/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Code looks fine. Didn't test yet.

review: Approve (code)

[Daniel d'Andrada (dandrader)]

And works fine as well.

review: Approve

[Michał Sawicz (saviq)]

Text conflict in debian/changelog

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:360
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/125/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1107/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/125/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Text conflict in src/modules/Unity/Application/mirsurface.cpp
Text conflict in src/platforms/mirserver/screen.h
Text conflict in tests/framework/fake_mirsurface.h
3 conflicts encountered.

[Gerry Boland (gerboland)]

Marking WIP, needs rebasing on top of DGU work

Unmerged revisions

360. By Gerry Boland on 2016-01-07

Move DPR env var reading into dedicated function

359. By Gerry Boland on 2016-01-07

Typo in DPR calculation

358. By Gerry Boland on 2016-01-07

getDevicePixelRatio -> devicePixelRatio

357. By Gerry Boland on 2016-01-07

MirSurfaceItem::updatePaintNode - move calculation around to clarify intention

356. By Gerry Boland on 2016-01-07

MirSurfaceItem::updatePaintNode Move dpr inside block where it is used

355. By Gerry Boland on 2016-01-04

Merge trunk

354. By Gerry Boland on 2015-12-14

Fix scaling to render app surface correctly

353. By Gerry Boland on 2015-12-14

Add units to debug message

352. By Gerry Boland on 2015-12-14

Merge trunk

351. By Gerry Boland on 2015-11-17

Merge trunk

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-04 09:38:12 +0000
+++ debian/changelog	2016-01-07 17:03:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 qtmir (0.4.7+16.04.20160104-0ubuntu1) xenial; urgency=medium
 
   [ Daniel d'Andrada ]
@@ -6,6 +7,14 @@
 
  -- Michał Sawicz <[e-mail]>  Mon, 04 Jan 2016 09:38:12 +0000
 
+=======
+qtmir (0.4.8) UNRELEASED; urgency=medium
+
+  * Add support for devicePixelRatio, the Qt5.4 UI scaling system
+
+ -- Gerry Boland <[e-mail]>  Mon, 04 Jan 2016 12:30:00 +0100
+
+>>>>>>> MERGE-SOURCE
 qtmir (0.4.7+16.04.20151222-0ubuntu1) xenial; urgency=medium
 
   * No-change rebuild to get -gles in sync

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2015-12-10 13:08:43 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2016-01-07 17:03:26 +0000
@@ -73,34 +73,34 @@
     return result;
 }
 
-mir::EventUPtr makeMirEvent(QMouseEvent *qtEvent, MirPointerAction action)
+mir::EventUPtr makeMirEvent(QMouseEvent *qtEvent, MirPointerAction action, qreal dpr)
 {
     auto timestamp = uncompressTimestamp<qtmir::Timestamp>(qtmir::Timestamp(qtEvent->timestamp()));
     auto modifiers = getMirModifiersFromQt(qtEvent->modifiers());
     auto buttons = getMirButtonsFromQt(qtEvent->buttons());
 
     return mir::events::make_event(0 /*DeviceID */, timestamp, 0 /* mac */, modifiers, action,
-                                   buttons, qtEvent->x(), qtEvent->y(), 0, 0, 0, 0);
+                                   buttons, qtEvent->x() * dpr, qtEvent->y() * dpr, 0, 0, 0, 0);
 }
 
-mir::EventUPtr makeMirEvent(QHoverEvent *qtEvent, MirPointerAction action)
+mir::EventUPtr makeMirEvent(QHoverEvent *qtEvent, MirPointerAction action, qreal dpr)
 {
     auto timestamp = uncompressTimestamp<qtmir::Timestamp>(qtmir::Timestamp(qtEvent->timestamp()));
 
     MirPointerButtons buttons = 0;
 
     return mir::events::make_event(0 /*DeviceID */, timestamp, 0 /* mac */, mir_input_event_modifier_none, action,
-                                   buttons, qtEvent->posF().x(), qtEvent->posF().y(), 0, 0, 0, 0);
+                                   buttons, qtEvent->posF().x() * dpr, qtEvent->posF().y() * dpr, 0, 0, 0, 0);
 }
 
-mir::EventUPtr makeMirEvent(QWheelEvent *qtEvent)
+mir::EventUPtr makeMirEvent(QWheelEvent *qtEvent, qreal dpr)
 {
     auto timestamp = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::milliseconds(qtEvent->timestamp()));
     auto modifiers = getMirModifiersFromQt(qtEvent->modifiers());
     auto buttons = getMirButtonsFromQt(qtEvent->buttons());
 
     return mir::events::make_event(0 /*DeviceID */, timestamp, 0 /* mac */, modifiers, mir_pointer_action_motion,
-                                   buttons, qtEvent->x(), qtEvent->y(),
+                                   buttons, qtEvent->x() * dpr, qtEvent->y() * dpr,
                                    qtEvent->angleDelta().x(), qtEvent->angleDelta().y(),
                                    0, 0);
 }
@@ -131,7 +131,8 @@
 mir::EventUPtr makeMirEvent(Qt::KeyboardModifiers qmods,
                             const QList<QTouchEvent::TouchPoint> &qtTouchPoints,
                             Qt::TouchPointStates /* qtTouchPointStates */,
-                            ulong qtTimestamp)
+                            ulong qtTimestamp,
+                            qreal dpr)
 {
     auto modifiers = getMirModifiersFromQt(qmods);
     auto ev = mir::events::make_event(0, uncompressTimestamp<qtmir::Timestamp>(qtmir::Timestamp(qtTimestamp)),
@@ -156,10 +157,10 @@
             tooltype = mir_touch_tooltype_stylus;
 
         mir::events::add_touch(*ev, id, action, tooltype,
-                               touchPoint.pos().x(), touchPoint.pos().y(),
+                               touchPoint.pos().x() * dpr, touchPoint.pos().y() * dpr,
                                touchPoint.pressure(),
-                               touchPoint.rect().width(),
-                               touchPoint.rect().height(),
+                               touchPoint.rect().width() * dpr,
+                               touchPoint.rect().height() * dpr,
                                0 /* size */);
     }
 
@@ -429,16 +430,16 @@
 
 void MirSurface::resize(int width, int height)
 {
-    int mirWidth = m_surface->size().width.as_int();
-    int mirHeight = m_surface->size().height.as_int();
+    const int mirWidth = m_surface->size().width.as_int();
+    const int mirHeight = m_surface->size().height.as_int();
 
     bool mirSizeIsDifferent = width != mirWidth || height != mirHeight;
 
     if (clientIsRunning() && mirSizeIsDifferent) {
         mir::geometry::Size newMirSize(width, height);
         m_surface->resize(newMirSize);
-        DEBUG_MSG << " old (" << mirWidth << "," << mirHeight << ")"
-                  << ", new (" << width << "," << height << ")";
+        DEBUG_MSG << " old (" << mirWidth << "," << mirHeight << ")px"
+                  << ", new (" << width << "," << height << ")px";
     }
 }
 
@@ -576,51 +577,51 @@
     return m_surface->query(mir_surface_attrib_visibility) == mir_surface_visibility_exposed;
 }
 
-void MirSurface::mousePressEvent(QMouseEvent *event)
-{
-    auto ev = makeMirEvent(event, mir_pointer_action_button_down);
-    m_surface->consume(*ev);
-    event->accept();
-}
-
-void MirSurface::mouseMoveEvent(QMouseEvent *event)
-{
-    auto ev = makeMirEvent(event, mir_pointer_action_motion);
-    m_surface->consume(*ev);
-    event->accept();
-}
-
-void MirSurface::mouseReleaseEvent(QMouseEvent *event)
-{
-    auto ev = makeMirEvent(event, mir_pointer_action_button_up);
-    m_surface->consume(*ev);
-    event->accept();
-}
-
-void MirSurface::hoverEnterEvent(QHoverEvent *event)
-{
-    auto ev = makeMirEvent(event, mir_pointer_action_enter);
-    m_surface->consume(*ev);
-    event->accept();
-}
-
-void MirSurface::hoverLeaveEvent(QHoverEvent *event)
-{
-    auto ev = makeMirEvent(event, mir_pointer_action_leave);
-    m_surface->consume(*ev);
-    event->accept();
-}
-
-void MirSurface::hoverMoveEvent(QHoverEvent *event)
-{
-    auto ev = makeMirEvent(event, mir_pointer_action_motion);
-    m_surface->consume(*ev);
-    event->accept();
-}
-
-void MirSurface::wheelEvent(QWheelEvent *event)
-{
-    auto ev = makeMirEvent(event);
+void MirSurface::mousePressEvent(QMouseEvent *event, qreal dpr)
+{
+    auto ev = makeMirEvent(event, mir_pointer_action_button_down, dpr);
+    m_surface->consume(*ev);
+    event->accept();
+}
+
+void MirSurface::mouseMoveEvent(QMouseEvent *event, qreal dpr)
+{
+    auto ev = makeMirEvent(event, mir_pointer_action_motion, dpr);
+    m_surface->consume(*ev);
+    event->accept();
+}
+
+void MirSurface::mouseReleaseEvent(QMouseEvent *event, qreal dpr)
+{
+    auto ev = makeMirEvent(event, mir_pointer_action_button_up, dpr);
+    m_surface->consume(*ev);
+    event->accept();
+}
+
+void MirSurface::hoverEnterEvent(QHoverEvent *event, qreal dpr)
+{
+    auto ev = makeMirEvent(event, mir_pointer_action_enter, dpr);
+    m_surface->consume(*ev);
+    event->accept();
+}
+
+void MirSurface::hoverLeaveEvent(QHoverEvent *event, qreal dpr)
+{
+    auto ev = makeMirEvent(event, mir_pointer_action_leave, dpr);
+    m_surface->consume(*ev);
+    event->accept();
+}
+
+void MirSurface::hoverMoveEvent(QHoverEvent *event, qreal dpr)
+{
+    auto ev = makeMirEvent(event, mir_pointer_action_motion, dpr);
+    m_surface->consume(*ev);
+    event->accept();
+}
+
+void MirSurface::wheelEvent(QWheelEvent *event, qreal dpr)
+{
+    auto ev = makeMirEvent(event, dpr);
     m_surface->consume(*ev);
     event->accept();
 }
@@ -642,9 +643,10 @@
 void MirSurface::touchEvent(Qt::KeyboardModifiers mods,
                             const QList<QTouchEvent::TouchPoint> &touchPoints,
                             Qt::TouchPointStates touchPointStates,
-                            ulong timestamp)
+                            ulong timestamp,
+                            qreal dpr)
 {
-    auto ev = makeMirEvent(mods, touchPoints, touchPointStates, timestamp);
+    auto ev = makeMirEvent(mods, touchPoints, touchPointStates, timestamp, dpr);
     m_surface->consume(*ev);
 }
 

=== modified file 'src/modules/Unity/Application/mirsurface.h'
--- src/modules/Unity/Application/mirsurface.h	2015-12-10 13:08:43 +0000
+++ src/modules/Unity/Application/mirsurface.h	2016-01-07 17:03:26 +0000
@@ -101,13 +101,13 @@
 
     void close() override;
 
-    void mousePressEvent(QMouseEvent *event) override;
-    void mouseMoveEvent(QMouseEvent *event) override;
-    void mouseReleaseEvent(QMouseEvent *event) override;
-    void hoverEnterEvent(QHoverEvent *event) override;
-    void hoverLeaveEvent(QHoverEvent *event) override;
-    void hoverMoveEvent(QHoverEvent *event) override;
-    void wheelEvent(QWheelEvent *event) override;
+    void mousePressEvent(QMouseEvent *event, qreal dpr) override;
+    void mouseMoveEvent(QMouseEvent *event, qreal dpr) override;
+    void mouseReleaseEvent(QMouseEvent *event, qreal dpr) override;
+    void hoverEnterEvent(QHoverEvent *event, qreal dpr) override;
+    void hoverLeaveEvent(QHoverEvent *event, qreal dpr) override;
+    void hoverMoveEvent(QHoverEvent *event, qreal dpr) override;
+    void wheelEvent(QWheelEvent *event, qreal dpr) override;
 
     void keyPressEvent(QKeyEvent *event) override;
     void keyReleaseEvent(QKeyEvent *event) override;
@@ -115,7 +115,7 @@
     void touchEvent(Qt::KeyboardModifiers qmods,
             const QList<QTouchEvent::TouchPoint> &qtTouchPoints,
             Qt::TouchPointStates qtTouchPointStates,
-            ulong qtTimestamp) override;
+            ulong qtTimestamp, qreal dpr) override;
 
     QString appId() const override;
 

=== modified file 'src/modules/Unity/Application/mirsurfaceinterface.h'
--- src/modules/Unity/Application/mirsurfaceinterface.h	2015-12-10 13:08:43 +0000
+++ src/modules/Unity/Application/mirsurfaceinterface.h	2016-01-07 17:03:26 +0000
@@ -66,13 +66,13 @@
 
     virtual void close() = 0;
 
-    virtual void mousePressEvent(QMouseEvent *event) = 0;
-    virtual void mouseMoveEvent(QMouseEvent *event) = 0;
-    virtual void mouseReleaseEvent(QMouseEvent *event) = 0;
-    virtual void hoverEnterEvent(QHoverEvent *event) = 0;
-    virtual void hoverLeaveEvent(QHoverEvent *event) = 0;
-    virtual void hoverMoveEvent(QHoverEvent *event) = 0;
-    virtual void wheelEvent(QWheelEvent *event) = 0;
+    virtual void mousePressEvent(QMouseEvent *event, qreal dpr = 1.0) = 0;
+    virtual void mouseMoveEvent(QMouseEvent *event, qreal dpr = 1.0) = 0;
+    virtual void mouseReleaseEvent(QMouseEvent *event, qreal dpr = 1.0) = 0;
+    virtual void hoverEnterEvent(QHoverEvent *event, qreal dpr = 1.0) = 0;
+    virtual void hoverLeaveEvent(QHoverEvent *event, qreal dpr = 1.0) = 0;
+    virtual void hoverMoveEvent(QHoverEvent *event, qreal dpr = 1.0) = 0;
+    virtual void wheelEvent(QWheelEvent *event, qreal dpr = 1.0) = 0;
 
     virtual void keyPressEvent(QKeyEvent *event) = 0;
     virtual void keyReleaseEvent(QKeyEvent *event) = 0;
@@ -80,7 +80,7 @@
     virtual void touchEvent(Qt::KeyboardModifiers qmods,
             const QList<QTouchEvent::TouchPoint> &qtTouchPoints,
             Qt::TouchPointStates qtTouchPointStates,
-            ulong qtTimestamp) = 0;
+            ulong qtTimestamp, qreal dpr = 1.0) = 0;
 
     virtual QString appId() const = 0;
 

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2015-12-10 13:08:43 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2016-01-07 17:03:26 +0000
@@ -54,6 +54,11 @@
     QObject *textureProvider;
 };
 
+inline int divideAndRoundUp(int numerator, qreal denominator)
+{
+    return ceil((qreal)numerator / denominator);
+}
+
 } // namespace {
 
 class MirTextureProvider : public QSGTextureProvider
@@ -81,6 +86,11 @@
     QSharedPointer<QSGTexture> t;
 };
 
+/*
+ * Note: all geometry is in device-independent pixels, except that contained in variables with the
+ * suffix "Px" - whose units are physical pixels
+ */
+
 MirSurfaceItem::MirSurfaceItem(QQuickItem *parent)
     : MirSurfaceItemInterface(parent)
     , m_surface(nullptr)
@@ -248,13 +258,14 @@
 
     if (m_fillMode == PadOrCrop) {
         const QSize &textureSize = m_textureProvider->texture()->textureSize();
+        const qreal dpr = devicePixelRatio();
 
         QRectF targetRect;
         targetRect.setWidth(qMin(width(), static_cast<qreal>(textureSize.width())));
         targetRect.setHeight(qMin(height(), static_cast<qreal>(textureSize.height())));
 
-        qreal u = targetRect.width() / textureSize.width();
-        qreal v = targetRect.height() / textureSize.height();
+        qreal u = (targetRect.width() * dpr) / textureSize.width();
+        qreal v = (targetRect.height() * dpr) / textureSize.height();
         node->setSubSourceRect(QRectF(0, 0, u, v));
 
         node->setTargetRect(targetRect);
@@ -285,12 +296,12 @@
         if (type() == Mir::InputMethodType) {
             // FIXME: Hack to get the VKB use case working while we don't have the proper solution in place.
             if (isMouseInsideUbuntuKeyboard(event)) {
-                m_surface->mousePressEvent(event);
+                m_surface->mousePressEvent(event, devicePixelRatio());
             } else {
                 event->ignore();
             }
         } else {
-            m_surface->mousePressEvent(event);
+            m_surface->mousePressEvent(event, devicePixelRatio());
         }
     } else {
         event->ignore();
@@ -300,7 +311,7 @@
 void MirSurfaceItem::mouseMoveEvent(QMouseEvent *event)
 {
     if (m_consumesInput && m_surface && m_surface->live()) {
-        m_surface->mouseMoveEvent(event);
+        m_surface->mouseMoveEvent(event, devicePixelRatio());
     } else {
         event->ignore();
     }
@@ -309,7 +320,7 @@
 void MirSurfaceItem::mouseReleaseEvent(QMouseEvent *event)
 {
     if (m_consumesInput && m_surface && m_surface->live()) {
-        m_surface->mouseReleaseEvent(event);
+        m_surface->mouseReleaseEvent(event, devicePixelRatio());
     } else {
         event->ignore();
     }
@@ -327,7 +338,7 @@
 void MirSurfaceItem::hoverEnterEvent(QHoverEvent *event)
 {
     if (m_consumesInput && m_surface && m_surface->live()) {
-        m_surface->hoverEnterEvent(event);
+        m_surface->hoverEnterEvent(event, devicePixelRatio());
     } else {
         event->ignore();
     }
@@ -336,7 +347,7 @@
 void MirSurfaceItem::hoverLeaveEvent(QHoverEvent *event)
 {
     if (m_consumesInput && m_surface && m_surface->live()) {
-        m_surface->hoverLeaveEvent(event);
+        m_surface->hoverLeaveEvent(event, devicePixelRatio());
     } else {
         event->ignore();
     }
@@ -345,7 +356,7 @@
 void MirSurfaceItem::hoverMoveEvent(QHoverEvent *event)
 {
     if (m_consumesInput && m_surface && m_surface->live()) {
-        m_surface->hoverMoveEvent(event);
+        m_surface->hoverMoveEvent(event, devicePixelRatio());
     } else {
         event->ignore();
     }
@@ -404,7 +415,7 @@
         touchEvent.updateTouchPointStatesAndType();
 
         m_surface->touchEvent(touchEvent.modifiers, touchEvent.touchPoints,
-                               touchEvent.touchPointStates, touchEvent.timestamp);
+                              touchEvent.touchPointStates, touchEvent.timestamp, devicePixelRatio());
 
         *m_lastTouchEvent = touchEvent;
 
@@ -425,7 +436,7 @@
         endCurrentTouchSequence(timestamp);
     }
 
-    m_surface->touchEvent(mods, touchPoints, touchPointStates, timestamp);
+    m_surface->touchEvent(mods, touchPoints, touchPointStates, timestamp, devicePixelRatio());
 
     if (!m_lastTouchEvent) {
         m_lastTouchEvent = new TouchEvent;
@@ -537,10 +548,12 @@
     }
 
     // If one dimension is not set, fallback to the current value
-    int width = m_surfaceWidth > 0 ? m_surfaceWidth : m_surface->size().width();
-    int height = m_surfaceHeight > 0 ? m_surfaceHeight : m_surface->size().height();
+    const int width = m_surfaceWidth > 0 ? m_surfaceWidth : m_surface->size().width();
+    const int height = m_surfaceHeight > 0 ? m_surfaceHeight : m_surface->size().height();
+    const int widthPx = width * devicePixelRatio();
+    const int heightPx = height * devicePixelRatio();
 
-    m_surface->resize(width, height);
+    m_surface->resize(widthPx, heightPx);
 }
 
 void MirSurfaceItem::updateMirSurfaceVisibility()
@@ -565,6 +578,11 @@
     m_textureProvider = nullptr;
 }
 
+qreal MirSurfaceItem::devicePixelRatio() const
+{
+    return window() ? window()->devicePixelRatio() : 1.0;
+}
+
 void MirSurfaceItem::TouchEvent::updateTouchPointStatesAndType()
 {
     touchPointStates = 0;
@@ -654,7 +672,8 @@
         Q_EMIT surfaceStateChanged(m_surface->state());
 
         updateMirSurfaceSize();
-        setImplicitSize(m_surface->size().width(), m_surface->size().height());
+        setImplicitSize(divideAndRoundUp(m_surface->size().width(), devicePixelRatio()),
+                        divideAndRoundUp(m_surface->size().height(), devicePixelRatio()));
         updateMirSurfaceVisibility();
 
         // Qt::ArrowCursor is the default when no cursor has been explicitly set, so no point forwarding it.
@@ -729,7 +748,8 @@
 
 void MirSurfaceItem::onActualSurfaceSizeChanged(const QSize &size)
 {
-    setImplicitSize(size.width(), size.height());
+    setImplicitSize(divideAndRoundUp(size.width(), devicePixelRatio()),
+                    divideAndRoundUp(size.height(), devicePixelRatio()));
 }
 
 int MirSurfaceItem::surfaceHeight() const

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.h'
--- src/modules/Unity/Application/mirsurfaceitem.h	2015-12-10 13:08:43 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.h	2016-01-07 17:03:26 +0000
@@ -123,6 +123,7 @@
     void onWindowChanged(QQuickWindow *window);
 
 private:
+    qreal devicePixelRatio() const;
     void ensureTextureProvider();
 
     bool hasTouchInsideUbuntuKeyboard(const QList<QTouchEvent::TouchPoint> &touchPoints);

=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
--- src/platforms/mirserver/qteventfeeder.cpp	2015-12-07 08:06:16 +0000
+++ src/platforms/mirserver/qteventfeeder.cpp	2016-01-07 17:03:26 +0000
@@ -395,6 +395,11 @@
         return m_screenController->getWindowForPoint(point);
     }
 
+    qreal devicePixelRatio() override
+    {
+        return qGuiApp->devicePixelRatio(); // FIXME: make per-screen.
+    }
+
     void registerTouchDevice(QTouchDevice *device) override
     {
         QWindowSystemInterface::registerTouchDevice(device);
@@ -558,8 +563,9 @@
 
     auto modifiers = getQtModifiersFromMir(mir_pointer_event_modifiers(pev));
 
-    auto movement = QPointF(mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_x),
-                            mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_y));
+    const qreal dpr = mQtWindowSystem->devicePixelRatio();
+    auto movement = QPointF(mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_x) / dpr,
+                            mir_pointer_event_axis_value(pev, mir_pointer_axis_relative_y) / dpr);
 
     switch (action) {
     case mir_pointer_action_button_up:
@@ -653,6 +659,7 @@
     // FIXME(loicm) Max pressure is device specific. That one is for the Samsung Galaxy Nexus. That
     //     needs to be fixed as soon as the compat input lib adds query support.
     const float kMaxPressure = 1.28;
+    const qreal dpr = mQtWindowSystem->devicePixelRatio();
     const int kPointerCount = mir_touch_event_point_count(tev);
     QList<QWindowSystemInterface::TouchPoint> touchPoints;
     QWindow *window = nullptr;
@@ -674,10 +681,10 @@
         for (int i = 0; i < kPointerCount; ++i) {
             QWindowSystemInterface::TouchPoint touchPoint;
 
-            const float kX = mir_touch_event_axis_value(tev, i, mir_touch_axis_x);
-            const float kY = mir_touch_event_axis_value(tev, i, mir_touch_axis_y);
-            const float kW = mir_touch_event_axis_value(tev, i, mir_touch_axis_touch_major);
-            const float kH = mir_touch_event_axis_value(tev, i, mir_touch_axis_touch_minor);
+            const float kX = mir_touch_event_axis_value(tev, i, mir_touch_axis_x) / dpr;
+            const float kY = mir_touch_event_axis_value(tev, i, mir_touch_axis_y) / dpr;
+            const float kW = mir_touch_event_axis_value(tev, i, mir_touch_axis_touch_major) / dpr;
+            const float kH = mir_touch_event_axis_value(tev, i, mir_touch_axis_touch_minor) / dpr;
             const float kP = mir_touch_event_axis_value(tev, i, mir_touch_axis_pressure);
             touchPoint.id = mir_touch_event_id(tev, i);
 

=== modified file 'src/platforms/mirserver/qteventfeeder.h'
--- src/platforms/mirserver/qteventfeeder.h	2015-11-19 14:17:54 +0000
+++ src/platforms/mirserver/qteventfeeder.h	2016-01-07 17:03:26 +0000
@@ -39,6 +39,7 @@
         virtual ~QtWindowSystemInterface() {}
         virtual void setScreenController(const QSharedPointer<ScreenController> &sc) = 0;
         virtual QWindow* getWindowForTouchPoint(const QPoint &point) = 0;
+        virtual qreal devicePixelRatio() { return 1.0; }
         virtual QWindow* focusedWindow() = 0;
         virtual void registerTouchDevice(QTouchDevice *device) = 0;
         virtual void handleExtendedKeyEvent(QWindow *window, ulong timestamp, QEvent::Type type, int key,

=== modified file 'src/platforms/mirserver/screen.cpp'
--- src/platforms/mirserver/screen.cpp	2015-10-14 22:59:04 +0000
+++ src/platforms/mirserver/screen.cpp	2016-01-07 17:03:26 +0000
@@ -44,6 +44,7 @@
     char *c = (char*)&i;
     return *c == 1;
 }
+
 static mir::renderer::gl::RenderTarget *as_render_target(
     mir::graphics::DisplayBuffer *displayBuffer)
 {
@@ -56,6 +57,17 @@
     return render_target;
 }
 
+qreal readDevicePixelRatioEnvVar()
+{
+    bool ok;
+    const int dpr = qgetenv("QT_DEVICE_PIXEL_RATIO").toInt(&ok);
+    if (ok && dpr > 0) {
+        return (qreal) dpr;
+    } else {
+        return 1.0; // fallback value
+    }
+}
+
 enum QImage::Format qImageFormatFromMirPixelFormat(MirPixelFormat mirPixelFormat) {
     switch (mirPixelFormat) {
     case mir_pixel_format_abgr_8888:
@@ -123,6 +135,9 @@
     , m_screenWindow(nullptr)
     , m_unityScreen(nullptr)
 {
+    // Get screen resolution and properties.
+    m_devicePixelRatio = readDevicePixelRatioEnvVar();
+
     setMirDisplayConfiguration(screen);
 
     // Set the default orientation based on the initial screen dimmensions.
@@ -197,14 +212,20 @@
     m_powerMode = screen.power_mode;
 
     QRect oldGeometry = m_geometry;
-    // Position of screen in virtual desktop coordinate space
-    m_geometry.setTop(screen.top_left.y.as_int());
-    m_geometry.setLeft(screen.top_left.x.as_int());
+    // Position of screen in virtual desktop coordinate space (physical pixels)
+    m_nativeGeometry.setTop(screen.top_left.y.as_int());
+    m_nativeGeometry.setLeft(screen.top_left.x.as_int());
 
     // Mode = current resolution & refresh rate
     mir::graphics::DisplayConfigurationMode mode = screen.modes.at(screen.current_mode_index);
-    m_geometry.setWidth(mode.size.width.as_int());
-    m_geometry.setHeight(mode.size.height.as_int());
+    m_nativeGeometry.setWidth(mode.size.width.as_int());
+    m_nativeGeometry.setHeight(mode.size.height.as_int());
+
+    // Geometry is in terms of device-independent pixels
+    m_geometry.setTop(m_nativeGeometry.top() / m_devicePixelRatio);
+    m_geometry.setLeft(m_nativeGeometry.left() / m_devicePixelRatio);
+    m_geometry.setWidth(m_nativeGeometry.width() / m_devicePixelRatio);
+    m_geometry.setHeight(m_nativeGeometry.height() / m_devicePixelRatio);
 
     // DPI - unnecessary to calculate, default implementation in QPlatformScreen is sufficient
 

=== modified file 'src/platforms/mirserver/screen.h'
--- src/platforms/mirserver/screen.h	2015-10-14 22:59:04 +0000
+++ src/platforms/mirserver/screen.h	2016-01-07 17:03:26 +0000
@@ -44,13 +44,15 @@
     ~Screen();
 
     // QPlatformScreen methods.
-    QRect geometry() const override { return m_geometry; }
+    QRect geometry() const override { return m_geometry; } // in device-independent pixels
+    QRect nativeGeometry() const { return m_nativeGeometry; } // in physical pixels
     int depth() const override { return m_depth; }
     QImage::Format format() const override { return m_format; }
     QSizeF physicalSize() const override { return m_physicalSize; }
     qreal refreshRate() const override { return m_refreshRate; }
     Qt::ScreenOrientation nativeOrientation() const override { return m_nativeOrientation; }
     Qt::ScreenOrientation orientation() const override { return m_currentOrientation; }
+    qreal devicePixelRatio() const override { return m_devicePixelRatio; }
     QPlatformCursor *cursor() const override;
 
     void toggleSensors(const bool enable) const;
@@ -79,11 +81,12 @@
     void doneCurrent();
 
 private:
-    QRect m_geometry;
+    QRect m_geometry, m_nativeGeometry;
     int m_depth;
     QImage::Format m_format;
     QSizeF m_physicalSize;
     qreal m_refreshRate;
+    qreal m_devicePixelRatio;
 
     mir::renderer::gl::RenderTarget *m_renderTarget;
     mir::graphics::DisplaySyncGroup *m_displayGroup;

=== modified file 'src/platforms/mirserver/screencontroller.cpp'
--- src/platforms/mirserver/screencontroller.cpp	2015-10-21 11:34:56 +0000
+++ src/platforms/mirserver/screencontroller.cpp	2016-01-07 17:03:26 +0000
@@ -163,7 +163,7 @@
                          buffer.view_area().size.height.as_int());
 
             for (auto screen : m_screenList) {
-                if (dbGeom == screen->geometry()) {
+                if (dbGeom == screen->nativeGeometry()) {
                     screen->setMirDisplayBuffer(&buffer, &group);
                     break;
                 }
@@ -174,7 +174,7 @@
     qCDebug(QTMIR_SCREENS) << "=======================================";
     for (auto screen: m_screenList) {
         qCDebug(QTMIR_SCREENS) << screen << "- id:" << screen->m_outputId.as_value()
-                               << "geometry:" << screen->geometry()
+                               << "geometry (px):" << screen->nativeGeometry()
                                << "window:" << screen->window()
                                << "type" << static_cast<int>(screen->outputType());
     }

=== modified file 'src/platforms/mirserver/screenwindow.cpp'
--- src/platforms/mirserver/screenwindow.cpp	2015-10-15 07:05:16 +0000
+++ src/platforms/mirserver/screenwindow.cpp	2016-01-07 17:03:26 +0000
@@ -60,6 +60,11 @@
     window->setSurfaceType(QSurface::OpenGLSurface);
 }
 
+qreal ScreenWindow::devicePixelRatio() const
+{
+    return screen()->devicePixelRatio();
+}
+
 ScreenWindow::~ScreenWindow()
 {
     qCDebug(QTMIR_SCREENS) << "Destroying ScreenWindow" << this;

=== modified file 'src/platforms/mirserver/screenwindow.h'
--- src/platforms/mirserver/screenwindow.h	2015-10-14 22:59:04 +0000
+++ src/platforms/mirserver/screenwindow.h	2016-01-07 17:03:26 +0000
@@ -29,6 +29,8 @@
     explicit ScreenWindow(QWindow *window);
     virtual ~ScreenWindow();
 
+    qreal devicePixelRatio() const override;
+
     bool isExposed() const override;
     void setExposed(const bool exposed);
 

=== modified file 'tests/modules/common/fake_mirsurface.h'
--- tests/modules/common/fake_mirsurface.h	2015-12-10 13:08:43 +0000
+++ tests/modules/common/fake_mirsurface.h	2016-01-07 17:03:26 +0000
@@ -152,13 +152,13 @@
 
     void setFocus(bool focus) override { m_focused = focus; }
 
-    void mousePressEvent(QMouseEvent *) override {}
-    void mouseMoveEvent(QMouseEvent *) override {}
-    void mouseReleaseEvent(QMouseEvent *) override {}
-    void hoverEnterEvent(QHoverEvent *) override {}
-    void hoverLeaveEvent(QHoverEvent *) override {}
-    void hoverMoveEvent(QHoverEvent *) override {}
-    void wheelEvent(QWheelEvent *) override {}
+    void mousePressEvent(QMouseEvent *, qreal) override {}
+    void mouseMoveEvent(QMouseEvent *, qreal) override {}
+    void mouseReleaseEvent(QMouseEvent *, qreal) override {}
+    void hoverEnterEvent(QHoverEvent *, qreal) override {}
+    void hoverLeaveEvent(QHoverEvent *, qreal) override {}
+    void hoverMoveEvent(QHoverEvent *, qreal) override {}
+    void wheelEvent(QWheelEvent *, qreal) override {}
 
     void keyPressEvent(QKeyEvent *) override {}
     void keyReleaseEvent(QKeyEvent *) override {}
@@ -166,7 +166,7 @@
     void touchEvent(Qt::KeyboardModifiers mods,
             const QList<QTouchEvent::TouchPoint> &points,
             Qt::TouchPointStates states,
-            ulong timestamp) override {
+            ulong timestamp, qreal) override {
         m_touchesReceived.append(TouchEvent(mods, points, states, timestamp));
     }