Merge lp:~brandontschaefer/mir/lp.1233089-fix-v-h-scroll into lp:~mir-team/mir/trunk

[Brandon Schaefer]

When Scroll events come in we don't keep around the android vscroll hscroll data. Store it now.

When Scroll events come in we don't keep around the android vscroll hscroll data. Store it now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1087
http://jenkins.qa.ubuntu.com/job/mir-ci/1576/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2071
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/820
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/820/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/76
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/76/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1576/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

For client ABI compatibility we can't change the size of MirMotionEvent right now.

I suggest finding some unused float or int fields and replacing them to keep the structure size. Perhaps touch_major/touch_minor/raw_x/raw_y/id/orientation?...

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Also, please retarget to lp:~mir-team/mir/development-branch

review: Needs Resubmitting

[lp:~brandontschaefer/mir/lp.1233089-fix-v-h-scroll]

1087. By PS Jenkins bot on 2013-10-01

Releasing 0.0.12+13.10.20131001.1-0ubuntu1 (revision 1086 from lp:mir).

Approved by PS Jenkins bot.

1088. By Alan Griffiths on 2013-10-03

* bump deb changelog to 0.0.13 and libmirserver5.
lp:~kgunn72/mir/bump-libmirserver5-take2

* graphics: android: disable vsync notifications when screen is off as per hwc specs. rename unblank_or_blank_display to apply_display_state() to remove ambiguity about what is being done.
fixes: lp1233870. Fixes: https://bugs.launchpad.net/bugs/1233870.
branch lp:~kdub/mir/deactive-notifications-when-display-off

* Simplify {Default,Basic}DisplayBufferCompositor classes into one.
branch lp:~vanvugt/mir/simplify-DisplayBufferCompositors

* Make cross-compile-chroot.sh build in parallel when suitable
branch lp:~dandrader/mir/cross-compile-parallel

* Fix race in connection failures. Fixes: https://bugs.launchpad.net/bugs/1201436.
branch lp:~alan-griffiths/mir/fix-1201436
Bug #1201436: Intermittent hang in ClientPidTestFixture.authorizer_may_prevent_connection_of_clients test

* Privatize surface_data.h; not required in any public APIs.
Fixes: https://bugs.launchpad.net/bugs/1223393.
branch lp:~vanvugt/mir/privatize-SurfaceData

* client: Clean up client side error handling and suicide if connection fails
branch lp:~alan-griffiths/mir/client-dies-without-server

* frontend, logging: Provide reporting from frontend::Connector.
branch lp:~alan-griffiths/mir/frontend-ConnectorReport-enablement

* Properly track buffers per-surface (not per session). Failure to do so was
causing premature buffer release and re-use in cases with multiple surfaces
per client/session. In XMir this was seen as out of order, glitchy and slow
frames when using multiple monitors (LP: #1216472). Fixes: https://bugs.launchpad.net/bugs/1216472.
branch lp:~afrantzis/mir/fix-out-of-order-buffers-1216472.

Approved by PS Jenkins bot, Robert Ancell.

1089. By Daniel d'Andrada on 2013-10-03

Fix for LP#1233944

Fixes the Mir-side of bug https://bugs.launchpad.net/mir/+bug/1233944

Event files are first created with root:root permissions and only later
udev rules are applied to it, changing its permissions to root:android-input
and therefore making it readable by unity8-mir

in short: Retry opening a file when its permissions change as it might be
readable now. Fixes: https://bugs.launchpad.net/bugs/1233944.

Approved by PS Jenkins bot, Robert Ancell.

1090. By PS Jenkins bot on 2013-10-03

Releasing 0.0.13+13.10.20131003-0ubuntu1 (revision 1089 from lp:mir).

Approved by PS Jenkins bot.

1091. By Brandon Schaefer on 2013-10-07

* Add v/h scroll to the MirMotionEvent vs the pointer_cor* struct.
  getPointerCount is guaranteed to be >= 1. So just assume we are using the first pointer count.

Unmerged revisions

1091. By Brandon Schaefer on 2013-10-07

* Add v/h scroll to the MirMotionEvent vs the pointer_cor* struct.
  getPointerCount is guaranteed to be >= 1. So just assume we are using the first pointer count.

1090. By PS Jenkins bot on 2013-10-03

Releasing 0.0.13+13.10.20131003-0ubuntu1 (revision 1089 from lp:mir).

Approved by PS Jenkins bot.

1089. By Daniel d'Andrada on 2013-10-03

Fix for LP#1233944

Fixes the Mir-side of bug https://bugs.launchpad.net/mir/+bug/1233944

Event files are first created with root:root permissions and only later
udev rules are applied to it, changing its permissions to root:android-input
and therefore making it readable by unity8-mir

in short: Retry opening a file when its permissions change as it might be
readable now. Fixes: https://bugs.launchpad.net/bugs/1233944.

Approved by PS Jenkins bot, Robert Ancell.

1088. By Alan Griffiths on 2013-10-03

* bump deb changelog to 0.0.13 and libmirserver5.
lp:~kgunn72/mir/bump-libmirserver5-take2

* graphics: android: disable vsync notifications when screen is off as per hwc specs. rename unblank_or_blank_display to apply_display_state() to remove ambiguity about what is being done.
fixes: lp1233870. Fixes: https://bugs.launchpad.net/bugs/1233870.
branch lp:~kdub/mir/deactive-notifications-when-display-off

* Simplify {Default,Basic}DisplayBufferCompositor classes into one.
branch lp:~vanvugt/mir/simplify-DisplayBufferCompositors

* Make cross-compile-chroot.sh build in parallel when suitable
branch lp:~dandrader/mir/cross-compile-parallel

* Fix race in connection failures. Fixes: https://bugs.launchpad.net/bugs/1201436.
branch lp:~alan-griffiths/mir/fix-1201436
Bug #1201436: Intermittent hang in ClientPidTestFixture.authorizer_may_prevent_connection_of_clients test

* Privatize surface_data.h; not required in any public APIs.
Fixes: https://bugs.launchpad.net/bugs/1223393.
branch lp:~vanvugt/mir/privatize-SurfaceData

* client: Clean up client side error handling and suicide if connection fails
branch lp:~alan-griffiths/mir/client-dies-without-server

* frontend, logging: Provide reporting from frontend::Connector.
branch lp:~alan-griffiths/mir/frontend-ConnectorReport-enablement

* Properly track buffers per-surface (not per session). Failure to do so was
causing premature buffer release and re-use in cases with multiple surfaces
per client/session. In XMir this was seen as out of order, glitchy and slow
frames when using multiple monitors (LP: #1216472). Fixes: https://bugs.launchpad.net/bugs/1216472.
branch lp:~afrantzis/mir/fix-out-of-order-buffers-1216472.

Approved by PS Jenkins bot, Robert Ancell.

1087. By PS Jenkins bot on 2013-10-01

Releasing 0.0.12+13.10.20131001.1-0ubuntu1 (revision 1086 from lp:mir).

Approved by PS Jenkins bot.

1086. By Kevin DuBois on 2013-09-29

merge latest dev branch.

Approved by PS Jenkins bot, Alan Griffiths, Kevin DuBois.

1085. By PS Jenkins bot on 2013-09-26

Releasing 0.0.12+13.10.20130926.1-0ubuntu1 (revision 1084 from lp:mir).

Approved by PS Jenkins bot.

1084. By Alexandros Frantzis on 2013-09-26

tests: Fix compiler warning about maybe-uninitialized struct member

1083. By Kevin DuBois on 2013-09-26

frontend, config: Mechanism for connecting via a socket pair.
graphics: android: stop nex4 from tearing
gbm: Blank unused connected outputs.
compositor: tidy up configuration logic for initializing bypass flag.
tests: Add tests for Android's InputReader & friends
Bump libmirserver soname and Mir project version.

Approved by kevin gunn, PS Jenkins bot.

1082. By PS Jenkins bot on 2013-09-24

Releasing 0.0.11+13.10.20130924.1-0ubuntu1 (revision 1081 from lp:mir).

Approved by PS Jenkins bot.

=== modified file 'include/shared/mir_toolkit/event.h'
--- include/shared/mir_toolkit/event.h	2013-08-28 03:41:48 +0000
+++ include/shared/mir_toolkit/event.h	2013-10-01 02:09:20 +0000
@@ -162,6 +162,8 @@
         float size;
         float pressure;
         float orientation;
+        float vscroll;
+        float hscroll;
     } pointer_coordinates[MIR_INPUT_EVENT_MAX_POINTER_COUNT];
 } MirMotionEvent;
 

=== modified file 'src/shared/input/android/android_input_lexicon.cpp'
--- src/shared/input/android/android_input_lexicon.cpp	2013-08-28 03:41:48 +0000
+++ src/shared/input/android/android_input_lexicon.cpp	2013-10-01 02:09:20 +0000
@@ -74,6 +74,8 @@
                     mir_event.motion.pointer_coordinates[i].size = mev->getSize(i);
                     mir_event.motion.pointer_coordinates[i].pressure = mev->getPressure(i);
                     mir_event.motion.pointer_coordinates[i].orientation = mev->getOrientation(i);
+                    mir_event.motion.pointer_coordinates[i].vscroll = mev->getRawAxisValue(AMOTION_EVENT_AXIS_VSCROLL, i);
+                    mir_event.motion.pointer_coordinates[i].hscroll = mev->getRawAxisValue(AMOTION_EVENT_AXIS_HSCROLL, i);
             }
             break;
         }