Mir

Merge lp:~mir-team/mir/add-more-event-getters into lp:mir

add-more-event-getters
Merge into development-branch

Proposed by Robert Carr on 2014-12-03

Status:	Merged
Approved by:	Robert Carr on 2014-12-19
Approved revision:	no longer in the source branch.
Merged at revision:	2182
Proposed branch:	lp:~mir-team/mir/add-more-event-getters
Merge into:	lp:mir
Prerequisite:	lp:~mir-team/mir/introduce-mir-event-2.0
Diff against target:	1720 lines (+990/-331) 24 files modified client-ABI-sha1sums (+11/-5) common-ABI-sha1sums (+12/-6) examples/fingerpaint.c (+1/-1) include/common/mir/log.h (+14/-1) include/common/mir_toolkit/client_types.h (+1/-1) include/common/mir_toolkit/event.h (+24/-0) include/common/mir_toolkit/events/event.h (+85/-211) include/common/mir_toolkit/events/event_deprecated.h (+255/-0) include/common/mir_toolkit/events/input/input_event.h (+40/-13) include/common/mir_toolkit/events/input/key_input_event.h (+1/-25) include/common/mir_toolkit/events/input/touch_input_event.h (+8/-0) include/common/mir_toolkit/events/orientation_event.h (+45/-0) include/common/mir_toolkit/events/prompt_session_event.h (+45/-0) include/common/mir_toolkit/events/resize_event.h (+53/-0) include/common/mir_toolkit/events/surface_event.h (+53/-0) platform-ABI-sha1sums (+12/-6) server-ABI-sha1sums (+12/-6) src/client/mirclient.pc.in (+1/-1) src/common/CMakeLists.txt (+4/-0) src/common/event.cpp (+179/-0) src/common/input/input_event.cpp (+101/-52) src/include/common/mir/event_type_to_string.h (+30/-0) src/server/mirserver.pc.in (+1/-1) tests/unit-tests/input/test_input_event.cpp (+2/-2)
To merge this branch:	bzr merge lp:~mir-team/mir/add-more-event-getters
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-12-19
Kevin DuBois (community)			Approve on 2014-12-19
Alberto Aguirre (community)			Approve on 2014-12-18
Alan Griffiths			Abstain on 2014-12-18
Cemil Azizoglu (community)			Approve on 2014-12-09
Daniel van Vugt		2014-12-03	Abstain on 2014-12-08
Review via email: mp+243579@code.launchpad.net

Commit message

Deprecate direct access to MirEvent.

Description of the change

This completes deprecation of direct access to MirEvent.

The old event headers are moved to a new event_private header. Accessors are added for MirSurfaceEvent, Resize Event, etc...event headers are moved to mir_toolkit/events to avoid polluting top level dir or putting too much in one header.

Boring stuff I know but trying to move the deprecation train along :)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-03:

FAILED: Continuous integration, rev:2099
http://jenkins.qa.ubuntu.com/job/mir-ci/2330/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/410/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/321/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/410/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-12-05:

This approach scales poorly in terms of complexity and maintenance for obvious reasons. And I think that the medicine is worse than the disease here, but the team wants to do it this way...

review: Abstain

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-12-05:

I think you can eliminate all those casts though:

MirResizeEvent const* mir_event_get_resize_event(MirEvent const* ev)
...
return reinterpret_cast<MirResizeEvent const*>(ev);

becomes:

MirResizeEvent const* mir_event_get_resize_event(MirEvent const* ev)
...
return &ev->resize;

review: Needs Fixing

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-05:

Casts be gone!

I think the medicine vs disease metaphor is apt...it is a trade off...im in favor of this given that the structure could be intended to last for a decade!

Revision history for this message

Daniel van Vugt (vanvugt) on 2014-12-08:

review: Abstain

Revision history for this message

Kevin DuBois (kdub) wrote on 2014-12-08:

needs info:
The intermediary seems a bit burdensome in terms of new API... what's the difficult part about transitioning downstreams to the new API again?

review: Needs Information

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2014-12-08:

93 + * Retrieve the surface ID associated wih this MirCloseSurfaceEvent
spelling

929 + abort();
... and others
do we just abort with no error message or anything?

review: Needs Fixing

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-09:

Spoke to Kevin on IRC...he is going to come back and post more :)

Cemil: At l 93 that's the correct spelling of retrieve right? This line is gone now anyway but I believe the spellings to be correct...

I believe abort with no error is the current strategy as discussed in introduce-event-2.0 MR + email thread. Maybe logging is appropriate?

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-09:

Chris correctly points out the surface_id getters are not required or even useful and thus have been removed

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2014-12-09:

> Cemil: At l 93 that's the correct spelling of retrieve right? This line is
> gone now anyway but I believe the spellings to be correct...

It was the "wih" but is now gone.

>
> I believe abort with no error is the current strategy as discussed in
> introduce-event-2.0 MR + email thread. Maybe logging is appropriate?

Yes abort is ok, just wish there was a semi-useful log message to go with it.

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-09:

Log messages added. I would call them semi useless over semi useful :p...no matter what they say you always have to do the same thing...use a debugger to find the calling frame.

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2014-12-09:

We may not always have the ability to repro things with a debugger (think problem reports from the field for rare, hard-to-repro bugs, or the person seeing it may not know how to use a debugger, etc).

This at least gives us a bit of a clue as to where to look.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-11:

FAILED: Continuous integration, rev:2105
http://jenkins.qa.ubuntu.com/job/mir-ci/2342/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/449/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/449/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/423/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/339/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/423/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-11:

FAILED: Continuous integration, rev:2107
http://jenkins.qa.ubuntu.com/job/mir-ci/2364/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/473/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/473/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/447/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/361/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/447/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-12:

FAILED: Continuous integration, rev:2108
http://jenkins.qa.ubuntu.com/job/mir-ci/2367/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/476
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/476/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/450/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/364/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/450/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-15:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-16:

MAde some changes to symbols.map which I think are correct.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-16:

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

review: Approve (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-17:

Move modifiers to the MirInputEvent namespace and added mir_touch_event_get_modifiers.

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-17:

I added mircommon to the pgkconfig file so downstreams can use these newly exported symbols.

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-17:

pkgconfig file for mirserver and client that is

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-17:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-17:

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

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2014-12-17:

475 === added file 'include/common/mir_toolkit/events/event_private.h'

It seems odd to call a public header "private" and also to include it include/common/mir_toolkit/events/event.h.

I assume it is there to support the deprecated API? And will move from the public API once downstream toolkits have had the opportunity to migrate?

~~~~

1636 if(touch_index > old_mev.pointer_count)
1637 + {
1638 + mir::log_critical("touch index is greater than pointer count");
1639 abort();
1640 + }
etc.

This if...log...abort pattern calls out to be formalized - either as a mir::require() function (or maybe a MIR_REQUIRE macro if we feel that __LINE__ and __FILE__ could be useful additions).

review: Needs Information

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-17:

>> I assume it is there to support the deprecated API? And will move from the public API once >> downstream toolkits have had the opportunity to migrate?

Yes. I could rename it to event_deprecated.h :) (and will do so!)

>>
>> This if...log...abort pattern calls out to be formalized - either as a mir::require()
>> function (or maybe a MIR_REQUIRE macro if we feel that __LINE__ and __FILE__ could be useful >> additions).

Ok added mir::logging::require and MIR_REQUIRE with __LINE__ __FILE__ and stringification of cond.

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-17:

I see Alberto has already added MIR_REQUIRE as requested in another branch so I've reverted my MIR_REQUIRE.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18:

FAILED: Continuous integration, rev:2124
http://jenkins.qa.ubuntu.com/job/mir-ci/2479/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/598
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/598/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/572/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/476/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/572/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18:

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

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2014-12-18:

It's hard to be sure about the end state as there's a lot of "in flight".

review: Abstain

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-12-18:

===
820 +n * Copyright © 2014 Canonical Ltd.
===
Extraneous n

Need info:
I guess this is kinda of a pre-existing issue, but I'm wondering about managing the client ABI, as clients will have to link against mircommon to use these event getter apis; there are symbols (all the cursor names) that are intended for client use as well. What is the plan to manage these breakages? Should mircommon put those apis under the MIR_CLIENT symbol version stanza?

review: Needs Fixing

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-12-18:

LGTM

review: Approve

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-12-18:

And summarizing from IRC discussion about the symbols of mircommon (but outside the scope of this MP)

It would probably best if we split the mircommon library into its public and private parts (perhaps mircommon and mircommonprivate)

Private meaning the symbols needed only by mir libraries - mircommon, mirserver, etc - (basically what's exposed through src/include/common)

Public meaning any symbols for external consumption - like the apis defined in this MP, essentially what is exposed through include/common

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18:

FAILED: Continuous integration, rev:2128
http://jenkins.qa.ubuntu.com/job/mir-ci/2508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/636
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/636/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/610/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/505/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/610/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-19:

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/957/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/652/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/652/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/626/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/137/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/626/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2014-12-19:

The curse strikes again: "Text conflict in client-ABI-sha1sums"

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2014-12-19:

> The curse strikes again: "Text conflict in client-ABI-sha1sums"

Fixed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-19:

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

review: Approve (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2014-12-19:

given that MirEvent 2.0 work is in full swing, this seems like the next step. So okay by me

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-19:

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/962/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/660/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/660/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/634/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/634/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2014-12-19:

Merging 'lp:~mir-team/mir/add-more-event-getters' in to 'mir'.
Text conflict in common-ABI-sha1sums
Text conflict in platform-ABI-sha1sums
Text conflict in server-ABI-sha1sums
Text conflict in src/common/symbols.map
4 conflicts encountered.

The curse lives!

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2014-12-19:

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:

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'client-ABI-sha1sums'
 --- client-ABI-sha1sums	2014-12-18 12:11:25 +0000
 +++ client-ABI-sha1sums	2014-12-19 16:55:48 +0000
@@ -9,13 +9,19 @@
 bcad3a72b47f4d904e6b7033b0001b89cb9779  include/client/mir_toolkit/mir_surface.h
  b141c4d79802ad626d969249c0004744e5c2a525  include/client/mir_toolkit/mir_wait.h
 f7b4ecc22afba923806ed2bd7d8244be90b0cfd  include/client/mir_toolkit/version.h
--23a009b06de7bac17d33d988dc8d968be8bc094a  include/common/mir_toolkit/client_types.h
++3350dac884d6006753de2a955bc7a05663cd9449  include/common/mir_toolkit/client_types.h
  c7c708734715a6d1b6fb2652584adb912071a518  include/common/mir_toolkit/common.h
  fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
--d71dddf6c4275ee423d3e0fa204e3b77b4d87401  include/common/mir_toolkit/event.h
--49403c824f69fa1cc1f58bf5fe635639148765eb  include/common/mir_toolkit/input/input_event.h
--f531c6a49883884a6c694393d5614f9942fe2703  include/common/mir_toolkit/input/key_input_event.h
--fd6d86becfa5ffa367480fd2654180f6ffcbf059  include/common/mir_toolkit/input/touch_input_event.h
++f4d39e9893ce6308bddd83a49b90f0051f565323  include/common/mir_toolkit/event.h
++2507f2929415aa423f9551d3c595c439fe1c6efd  include/common/mir_toolkit/events/event_deprecated.h
++ae75a0434588f2d086936e2a2dbe1e919a5fbc50  include/common/mir_toolkit/events/event.h
++c591a02a8e9851db342c310cf829d018a1eddb51  include/common/mir_toolkit/events/input/input_event.h
++7748a12138474e9be218eeb8f14b372af0fcec7e  include/common/mir_toolkit/events/input/key_input_event.h
++de7c23453e6d897296f32e49d9ba952a1baa0200  include/common/mir_toolkit/events/input/touch_input_event.h
++8642e85a50e2de651589da3ced70e0fc0a915f26  include/common/mir_toolkit/events/orientation_event.h
++f623dcf3c2ed134c1be20106eb54bcccc84af462  include/common/mir_toolkit/events/prompt_session_event.h
++633893b0def2b71f969872908a5b3529bc2fbf10  include/common/mir_toolkit/events/resize_event.h
++5944dc0556223cc54b45b32c8aa70b8c60ee0337  include/common/mir_toolkit/events/surface_event.h
  4975998aa1056ed0d39dcc538127453e516ad8e9  include/common/mir_toolkit/mesa/native_display.h
 c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h
 ce105a3a18241f5d33db31939ca15256f353c37  include/common/mir_toolkit/mir_version_number.h
 === modified file 'common-ABI-sha1sums'
 --- common-ABI-sha1sums	2014-12-19 04:52:10 +0000
 +++ common-ABI-sha1sums	2014-12-19 16:55:48 +0000
@@ -13,16 +13,22 @@
 cd6aed5ef5f8f39b3eb86604e4133cb840485  include/common/mir/input/input_receiver_thread.h
  be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/common/mir/int_wrapper.h
 de47e2790d0f7643e23eada2d8aa2987f58d086  include/common/mir/logging/logger.h
--5ab81600183fdaca3fb949beb2307d1f6e4cbb61  include/common/mir/log.h
++38f159ee67cf380ebd2bfee7a98d62bc0397c631  include/common/mir/log.h
 b9c24e2ce7194aeea6694e81c160354033d28a  include/common/mir/optional_value.h
 ae8473df05dd9e048a73797f01a2f34f7447554  include/common/mir/time/types.h
--23a009b06de7bac17d33d988dc8d968be8bc094a  include/common/mir_toolkit/client_types.h
++3350dac884d6006753de2a955bc7a05663cd9449  include/common/mir_toolkit/client_types.h
  c7c708734715a6d1b6fb2652584adb912071a518  include/common/mir_toolkit/common.h
  fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
--d71dddf6c4275ee423d3e0fa204e3b77b4d87401  include/common/mir_toolkit/event.h
--49403c824f69fa1cc1f58bf5fe635639148765eb  include/common/mir_toolkit/input/input_event.h
--f531c6a49883884a6c694393d5614f9942fe2703  include/common/mir_toolkit/input/key_input_event.h
--fd6d86becfa5ffa367480fd2654180f6ffcbf059  include/common/mir_toolkit/input/touch_input_event.h
++f4d39e9893ce6308bddd83a49b90f0051f565323  include/common/mir_toolkit/event.h
++2507f2929415aa423f9551d3c595c439fe1c6efd  include/common/mir_toolkit/events/event_deprecated.h
++ae75a0434588f2d086936e2a2dbe1e919a5fbc50  include/common/mir_toolkit/events/event.h
++c591a02a8e9851db342c310cf829d018a1eddb51  include/common/mir_toolkit/events/input/input_event.h
++7748a12138474e9be218eeb8f14b372af0fcec7e  include/common/mir_toolkit/events/input/key_input_event.h
++de7c23453e6d897296f32e49d9ba952a1baa0200  include/common/mir_toolkit/events/input/touch_input_event.h
++8642e85a50e2de651589da3ced70e0fc0a915f26  include/common/mir_toolkit/events/orientation_event.h
++f623dcf3c2ed134c1be20106eb54bcccc84af462  include/common/mir_toolkit/events/prompt_session_event.h
++633893b0def2b71f969872908a5b3529bc2fbf10  include/common/mir_toolkit/events/resize_event.h
++5944dc0556223cc54b45b32c8aa70b8c60ee0337  include/common/mir_toolkit/events/surface_event.h
  4975998aa1056ed0d39dcc538127453e516ad8e9  include/common/mir_toolkit/mesa/native_display.h
 c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h
 ce105a3a18241f5d33db31939ca15256f353c37  include/common/mir_toolkit/mir_version_number.h
 === modified file 'examples/fingerpaint.c'
 --- examples/fingerpaint.c	2014-12-15 06:24:03 +0000
 +++ examples/fingerpaint.c	2014-12-19 16:55:48 +0000
@@ -17,7 +17,7 @@
   */
  #include "mir_toolkit/mir_client_library.h"
--#include "mir_toolkit/input/input_event.h"
++#include "mir_toolkit/events/input/input_event.h"
  #include <stdio.h>
  #include <signal.h>
 === modified file 'include/common/mir/log.h'
 --- include/common/mir/log.h	2014-12-09 03:14:55 +0000
 +++ include/common/mir/log.h	2014-12-19 16:55:48 +0000
@@ -59,7 +59,20 @@
                 MIR_LOG_COMPONENT, fmt, args...);
+ }
--// TODO later as required: error, critical, warning, debug
++inline void log_critical(std::string const& message)
++{
++    ::mir::log(::mir::logging::Severity::critical,
++               MIR_LOG_COMPONENT, message);
++}
++
++template<typename... Args>
++void log_critical(char const* fmt, Args... args)
++{
++    ::mir::log(::mir::logging::Severity::critical,
++               MIR_LOG_COMPONENT, fmt, args...);
++}
++
++// TODO later as required: error, warning, debug
  } // (nested anonymous) namespace
  #endif
 === modified file 'include/common/mir_toolkit/client_types.h'
 --- include/common/mir_toolkit/client_types.h	2014-12-15 06:24:03 +0000
 +++ include/common/mir_toolkit/client_types.h	2014-12-19 16:55:48 +0000
@@ -21,7 +21,7 @@
  #ifndef MIR_TOOLKIT_CLIENT_TYPES_H_
  #define MIR_TOOLKIT_CLIENT_TYPES_H_
--#include <mir_toolkit/event.h>
++#include <mir_toolkit/events/event.h>
  #include <mir_toolkit/common.h>
  #include <stddef.h>
 === added file 'include/common/mir_toolkit/event.h'
 --- include/common/mir_toolkit/event.h	1970-01-01 00:00:00 +0000
 +++ include/common/mir_toolkit/event.h	2014-12-19 16:55:48 +0000
@@ -0,0 +1,24 @@
++/*
++ * 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 version 3,
++ * as published by the Free Software Foundation.
++ *
++ * 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: Robert Carr <robert.carr@canonical.com>
++ */
++
++#ifndef MIR_TOOLKIT_EVENT_COMPAT_HEADER_H_
++#define MIR_TOOLKIT_EVENT_COMPAT_HEADER_H_
++
++#include "mir_toolkit/events/event.h"
++
++#endif /* MIR_TOOLKIT_EVENT_COMPAT_HEADER_H_ */
 === added directory 'include/common/mir_toolkit/events'
 === renamed file 'include/common/mir_toolkit/event.h' => 'include/common/mir_toolkit/events/event.h'
 --- include/common/mir_toolkit/event.h	2014-12-11 02:43:01 +0000
 +++ include/common/mir_toolkit/events/event.h	2014-12-19 16:55:48 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2013 Canonical Ltd.
++ * 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 version 3,
@@ -13,7 +13,7 @@
   * 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: Thomas Voss <thomas.voss@canonical.com>
++ * Authored by: Robert Carr <robert.carr@canonical.com>
   */
  #ifndef MIR_TOOLKIT_EVENT_H_
@@ -30,10 +30,6 @@
   */
  extern "C" {
  #endif
--/* TODO: To the moon. */
--#define MIR_INPUT_EVENT_MAX_POINTER_COUNT 16
--
--typedef int64_t nsecs_t;
  typedef enum
+ {
@@ -49,211 +45,29 @@
      mir_event_type_input
  } MirEventType;
--typedef enum {
--    mir_key_action_down     = 0,
--    mir_key_action_up       = 1,
--    mir_key_action_multiple = 2
--} MirKeyAction;
--
--typedef enum {
--    mir_key_flag_woke_here           = 0x1,
--    mir_key_flag_soft_keyboard       = 0x2,
--    mir_key_flag_keep_touch_mode     = 0x4,
--    mir_key_flag_from_system         = 0x8,
--    mir_key_flag_editor_action       = 0x10,
--    mir_key_flag_canceled            = 0x20,
--    mir_key_flag_virtual_hard_key    = 0x40,
--    mir_key_flag_long_press          = 0x80,
--    mir_key_flag_canceled_long_press = 0x100,
--    mir_key_flag_tracking            = 0x200,
--    mir_key_flag_fallback            = 0x400
--} MirKeyFlag;
--
--typedef enum {
--    mir_key_modifier_none        = 0,
--    mir_key_modifier_alt         = 0x02,
--    mir_key_modifier_alt_left    = 0x10,
--    mir_key_modifier_alt_right   = 0x20,
--    mir_key_modifier_shift       = 0x01,
--    mir_key_modifier_shift_left  = 0x40,
--    mir_key_modifier_shift_right = 0x80,
--    mir_key_modifier_sym         = 0x04,
--    mir_key_modifier_function    = 0x08,
--    mir_key_modifier_ctrl        = 0x1000,
--    mir_key_modifier_ctrl_left   = 0x2000,
--    mir_key_modifier_ctrl_right  = 0x4000,
--    mir_key_modifier_meta        = 0x10000,
--    mir_key_modifier_meta_left   = 0x20000,
--    mir_key_modifier_meta_right  = 0x40000,
--    mir_key_modifier_caps_lock   = 0x100000,
--    mir_key_modifier_num_lock    = 0x200000,
--    mir_key_modifier_scroll_lock = 0x400000
--} MirKeyModifier;
--
--typedef enum {
--    mir_motion_action_down         = 0,
--    mir_motion_action_up           = 1,
--    mir_motion_action_move         = 2,
--    mir_motion_action_cancel       = 3,
--    mir_motion_action_outside      = 4,
--    mir_motion_action_pointer_down = 5,
--    mir_motion_action_pointer_up   = 6,
--    mir_motion_action_hover_move   = 7,
--    mir_motion_action_scroll       = 8,
--    mir_motion_action_hover_enter  = 9,
--    mir_motion_action_hover_exit   = 10
--} MirMotionAction;
--
--typedef enum {
--    mir_motion_flag_window_is_obscured = 0x1
--} MirMotionFlag;
--
--typedef enum {
--    mir_motion_button_primary   = 1 << 0,
--    mir_motion_button_secondary = 1 << 1,
--    mir_motion_button_tertiary  = 1 << 2,
--    mir_motion_button_back      = 1 << 3,
--    mir_motion_button_forward   = 1 << 4
--} MirMotionButton;
--
--typedef enum {
--   mir_motion_tool_type_unknown = 0,
--   mir_motion_tool_type_finger  = 1,
--   mir_motion_tool_type_stylus  = 2,
--   mir_motion_tool_type_mouse   = 3,
--   mir_motion_tool_type_eraser  = 4
--} MirMotionToolType;
--
--// DEPRECATED
--// Direct access to MirKeyEvent is deprecated. Please use mir_event_get_input_event
--// and the mir_input_event* family of functions.
--typedef struct
--{
--    MirEventType type;
--
--    int32_t device_id;
--    int32_t source_id;
--    MirKeyAction action;
--    MirKeyFlag flags;
--    unsigned int modifiers;
--
--    int32_t key_code;
--    int32_t scan_code;
--    int32_t repeat_count;
--    nsecs_t down_time;
--
--    nsecs_t event_time;
--    int is_system_key;
--} MirKeyEvent;
--
--typedef struct
--{
--    int id;
--    float x, raw_x;
--    float y, raw_y;
--    float touch_major;
--    float touch_minor;
--    float size;
--    float pressure;
--    float orientation;
--    float vscroll;
--    float hscroll;
--    MirMotionToolType tool_type;
--    int unused1;
--    int unused2;
--    int unused3;
--} MirMotionPointer;
--
--// DEPRECATED
--// Direct access to MirMotionEvent is deprecated. Please use mir_event_get_input_event
--// and the mir_input_event* family of functions.
--typedef struct
--{
--    MirEventType type;
--
--    int32_t device_id;
--    int32_t source_id;
--    /*
--     * TODO(racarr): We would like to store this as a MirMotionAction but the android input stack
--     * encodes some non enumerable values in it. It's convenient to keep things
--     * this way for now until we can drop SF/Hybris support in QtUbuntu.
--     */
--    int action;
--    MirMotionFlag flags;
--    unsigned int modifiers;
--
--    int32_t edge_flags;
--    MirMotionButton button_state;
--    float x_offset;
--    float y_offset;
--    float x_precision;
--    float y_precision;
--    nsecs_t down_time;
--    nsecs_t event_time;
--
--    size_t pointer_count;
--    MirMotionPointer pointer_coordinates[MIR_INPUT_EVENT_MAX_POINTER_COUNT];
--    /* "_coordinates" is a misnomer here because there's plenty more info than
--       just coordinates, but renaming it accurately would be an API break */
--
--    int unused0;
--    int unused1;
--    int unused2;
--    int unused3;
--} MirMotionEvent;
--
--typedef struct
--{
--    MirEventType type;
--
--    int id;
--    MirSurfaceAttrib attrib;
--    int value;
--} MirSurfaceEvent;
--
--typedef struct
--{
--    MirEventType type;
--
--    int surface_id;
--    int width;
--    int height;
--} MirResizeEvent;
--
--typedef struct
--{
--    MirEventType type;
--
--    MirPromptSessionState new_state;
--} MirPromptSessionEvent;
--
--typedef struct MirOrientationEvent
--{
--    MirEventType type;
--
--    int surface_id;
--    MirOrientation direction;
--} MirOrientationEvent;
--
--typedef struct MirCloseSurfaceEvent
--{
--    MirEventType type;
--
--    int surface_id;
--} MirCloseSurfaceEvent;
--
--typedef union
--{
--    // Direct access to the type member is deprecated. Instead use mir_event_get_type.
--    MirEventType    type;
--    MirKeyEvent     key;
--    MirMotionEvent  motion;
--    MirSurfaceEvent surface;
--    MirResizeEvent  resize;
--    MirPromptSessionEvent  prompt_session;
--    MirOrientationEvent orientation;
--    MirCloseSurfaceEvent   close_surface;
--} MirEvent;
++typedef struct MirSurfaceEvent MirSurfaceEvent;
++typedef struct MirResizeEvent MirResizeEvent;
++typedef struct MirPromptSessionEvent MirPromptSessionEvent;
++typedef struct MirOrientationEvent MirOrientationEvent;
++typedef struct MirCloseSurfaceEvent MirCloseSurfaceEvent;
++typedef struct MirInputEvent MirInputEvent;
++
++typedef union MirEvent MirEvent;
++
++#ifdef __cplusplus
++}
++/**@}*/
++#endif
++
++#include "mir_toolkit/events/event_deprecated.h"
++
++#ifdef __cplusplus
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++extern "C" {
++#endif
  /*
   * Retrieves the type of a MirEvent. Now preferred over direct access to ev->type.
@@ -265,6 +79,66 @@
   */
  MirEventType mir_event_get_type(MirEvent const* ev);
++/*
++ * Retrieve the MirInputEvent associated with a MirEvent of
++ * type mir_event_type_input. See <mir_toolkit/events/input/input_event.h>
++ * for accessors.
++ *
++ * \param [in] event The event
++ * \return           The associated MirInputEvent
++ */
++MirInputEvent const* mir_event_get_input_event(MirEvent const* ev);
++
++/*
++ * Retrieve the MirSurfaceEvent associated with a MirEvent of
++ * type mir_event_type_surface. See <mir_toolkit/events/surface_event.h>
++ * for accessors.
++ *
++ * \param [in] event The event
++ * \return           The associated MirSurfaceEvent
++ */
++MirSurfaceEvent const* mir_event_get_surface_event(MirEvent const* ev);
++
++/*
++ * Retrieve the MirResizeEvent associated with a MirEvent of
++ * type mir_event_type_resize. See <mir_toolkits/events/resize_event.h>
++ * for accessors.
++ *
++ * \param [in] event The event
++ * \return           The associated MirResizeEvent
++ */
++MirResizeEvent const* mir_event_get_resize_event(MirEvent const* ev);
++
++/*
++ * Retrieve the MirPromptSessionEvent associated with a MirEvent of
++ * type mir_event_type_prompt_session_state_change. See <mir_toolkits/events/prompt_session_event.h>
++ * for accessors.
++ *
++ * \param [in] event The event
++ * \return           The associated MirPromptSessionEvent
++ */
++MirPromptSessionEvent const* mir_event_get_prompt_session_event(MirEvent const* ev);
++
++/*
++ * Retrieve the MirOrientationEvent associated with a MirEvent of
++ * type mir_event_type_orientation. See <mir_toolkit/events/orientation_event.h>
++ * for accessors.
++ *
++ * \param [in] event The event
++ * \return           The associated MirOrientationEvent
++ */
++MirOrientationEvent const* mir_event_get_orientation_event(MirEvent const* ev);
++
++/*
++ * Retrieve the MirCloseSurfaceEvent associated with a MirEvent of
++ * type mir_event_type_close_surface. See <mir_toolkit/events/close_surface_event.h>
++ * for accessors.
++ *
++ * \param [in] event The event
++ * \return           The associated MirCloseSurfaceEvent
++ */
++MirCloseSurfaceEvent const* mir_event_get_close_surface_event(MirEvent const* ev);
++
  #ifdef __cplusplus
+ }
  /**@}*/
 === added file 'include/common/mir_toolkit/events/event_deprecated.h'
 --- include/common/mir_toolkit/events/event_deprecated.h	1970-01-01 00:00:00 +0000
 +++ include/common/mir_toolkit/events/event_deprecated.h	2014-12-19 16:55:48 +0000
@@ -0,0 +1,255 @@
++/*
++ * Copyright © 2013 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 version 3,
++ * as published by the Free Software Foundation.
++ *
++ * 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: Thomas Voss <thomas.voss@canonical.com>
++ */
++
++// ==================================
++//
++// Direct access to MirEvent deprecated. Prefer mir_event_* family of functions.
++//
++// ==================================
++
++#ifndef MIR_TOOLKIT_EVENT_DEPRECATED_H_
++#define MIR_TOOLKIT_EVENT_DEPRECATED_H_
++
++#include <stddef.h>
++#include <stdint.h>
++#include "mir_toolkit/common.h"
++
++#ifdef __cplusplus
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++extern "C" {
++#endif
++/* TODO: To the moon. */
++#define MIR_INPUT_EVENT_MAX_POINTER_COUNT 16
++
++typedef int64_t nsecs_t;
++
++typedef enum {
++    mir_key_action_down     = 0,
++    mir_key_action_up       = 1,
++    mir_key_action_multiple = 2
++} MirKeyAction;
++
++typedef enum {
++    mir_key_flag_woke_here           = 0x1,
++    mir_key_flag_soft_keyboard       = 0x2,
++    mir_key_flag_keep_touch_mode     = 0x4,
++    mir_key_flag_from_system         = 0x8,
++    mir_key_flag_editor_action       = 0x10,
++    mir_key_flag_canceled            = 0x20,
++    mir_key_flag_virtual_hard_key    = 0x40,
++    mir_key_flag_long_press          = 0x80,
++    mir_key_flag_canceled_long_press = 0x100,
++    mir_key_flag_tracking            = 0x200,
++    mir_key_flag_fallback            = 0x400
++} MirKeyFlag;
++
++typedef enum {
++    mir_key_modifier_none        = 0,
++    mir_key_modifier_alt         = 0x02,
++    mir_key_modifier_alt_left    = 0x10,
++    mir_key_modifier_alt_right   = 0x20,
++    mir_key_modifier_shift       = 0x01,
++    mir_key_modifier_shift_left  = 0x40,
++    mir_key_modifier_shift_right = 0x80,
++    mir_key_modifier_sym         = 0x04,
++    mir_key_modifier_function    = 0x08,
++    mir_key_modifier_ctrl        = 0x1000,
++    mir_key_modifier_ctrl_left   = 0x2000,
++    mir_key_modifier_ctrl_right  = 0x4000,
++    mir_key_modifier_meta        = 0x10000,
++    mir_key_modifier_meta_left   = 0x20000,
++    mir_key_modifier_meta_right  = 0x40000,
++    mir_key_modifier_caps_lock   = 0x100000,
++    mir_key_modifier_num_lock    = 0x200000,
++    mir_key_modifier_scroll_lock = 0x400000
++} MirKeyModifier;
++
++typedef enum {
++    mir_motion_action_down         = 0,
++    mir_motion_action_up           = 1,
++    mir_motion_action_move         = 2,
++    mir_motion_action_cancel       = 3,
++    mir_motion_action_outside      = 4,
++    mir_motion_action_pointer_down = 5,
++    mir_motion_action_pointer_up   = 6,
++    mir_motion_action_hover_move   = 7,
++    mir_motion_action_scroll       = 8,
++    mir_motion_action_hover_enter  = 9,
++    mir_motion_action_hover_exit   = 10
++} MirMotionAction;
++
++typedef enum {
++    mir_motion_flag_window_is_obscured = 0x1
++} MirMotionFlag;
++
++typedef enum {
++    mir_motion_button_primary   = 1 << 0,
++    mir_motion_button_secondary = 1 << 1,
++    mir_motion_button_tertiary  = 1 << 2,
++    mir_motion_button_back      = 1 << 3,
++    mir_motion_button_forward   = 1 << 4
++} MirMotionButton;
++
++typedef enum {
++   mir_motion_tool_type_unknown = 0,
++   mir_motion_tool_type_finger  = 1,
++   mir_motion_tool_type_stylus  = 2,
++   mir_motion_tool_type_mouse   = 3,
++   mir_motion_tool_type_eraser  = 4
++} MirMotionToolType;
++
++// DEPRECATED
++// Direct access to MirKeyEvent is deprecated. Please use mir_event_get_input_event
++// and the mir_input_event* family of functions.
++typedef struct
++{
++    MirEventType type;
++
++    int32_t device_id;
++    int32_t source_id;
++    MirKeyAction action;
++    MirKeyFlag flags;
++    unsigned int modifiers;
++
++    int32_t key_code;
++    int32_t scan_code;
++    int32_t repeat_count;
++    nsecs_t down_time;
++
++    nsecs_t event_time;
++    int is_system_key;
++} MirKeyEvent;
++
++typedef struct
++{
++    int id;
++    float x, raw_x;
++    float y, raw_y;
++    float touch_major;
++    float touch_minor;
++    float size;
++    float pressure;
++    float orientation;
++    float vscroll;
++    float hscroll;
++    MirMotionToolType tool_type;
++    int unused1;
++    int unused2;
++    int unused3;
++} MirMotionPointer;
++
++// DEPRECATED
++// Direct access to MirMotionEvent is deprecated. Please use mir_event_get_input_event
++// and the mir_input_event* family of functions.
++typedef struct
++{
++    MirEventType type;
++
++    int32_t device_id;
++    int32_t source_id;
++    /*
++     * TODO(racarr): We would like to store this as a MirMotionAction but the android input stack
++     * encodes some non enumerable values in it. It's convenient to keep things
++     * this way for now until we can drop SF/Hybris support in QtUbuntu.
++     */
++    int action;
++    MirMotionFlag flags;
++    unsigned int modifiers;
++
++    int32_t edge_flags;
++    MirMotionButton button_state;
++    float x_offset;
++    float y_offset;
++    float x_precision;
++    float y_precision;
++    nsecs_t down_time;
++    nsecs_t event_time;
++
++    size_t pointer_count;
++    MirMotionPointer pointer_coordinates[MIR_INPUT_EVENT_MAX_POINTER_COUNT];
++    /* "_coordinates" is a misnomer here because there's plenty more info than
++       just coordinates, but renaming it accurately would be an API break */
++
++    int unused0;
++    int unused1;
++    int unused2;
++    int unused3;
++} MirMotionEvent;
++
++struct MirSurfaceEvent
++{
++    MirEventType type;
++
++    int id;
++    MirSurfaceAttrib attrib;
++    int value;
++};
++
++struct MirResizeEvent
++{
++    MirEventType type;
++
++    int surface_id;
++    int width;
++    int height;
++};
++
++struct MirPromptSessionEvent
++{
++    MirEventType type;
++
++    MirPromptSessionState new_state;
++};
++
++struct MirOrientationEvent
++{
++    MirEventType type;
++
++    int surface_id;
++    MirOrientation direction;
++};
++
++struct MirCloseSurfaceEvent
++{
++    MirEventType type;
++
++    int surface_id;
++};
++
++union MirEvent
++{
++    // Direct access to the type member is deprecated. Instead use mir_event_get_type.
++    MirEventType    type;
++    MirKeyEvent     key;
++    MirMotionEvent  motion;
++    MirSurfaceEvent surface;
++    MirResizeEvent  resize;
++    MirPromptSessionEvent  prompt_session;
++    MirOrientationEvent orientation;
++    MirCloseSurfaceEvent   close_surface;
++};
++
++#ifdef __cplusplus
++}
++/**@}*/
++#endif
++
++#endif /* MIR_TOOLKIT_EVENT_DEPRECATED_H_ */
 === renamed directory 'include/common/mir_toolkit/input' => 'include/common/mir_toolkit/events/input'
 === modified file 'include/common/mir_toolkit/events/input/input_event.h'
 --- include/common/mir_toolkit/input/input_event.h	2014-12-01 20:04:41 +0000
 +++ include/common/mir_toolkit/events/input/input_event.h	2014-12-19 16:55:48 +0000
@@ -19,9 +19,7 @@
  #ifndef MIR_TOOLKIT_INPUT_EVENT_H_
  #define MIR_TOOLKIT_INPUT_EVENT_H_
--#include "mir_toolkit/event.h"
--#include "mir_toolkit/input/key_input_event.h"
--#include "mir_toolkit/input/touch_input_event.h"
++#include "mir_toolkit/events/event.h"
  #include <stdint.h>
@@ -33,8 +31,6 @@
  extern "C" {
  #endif
--typedef struct MirInputEvent MirInputEvent;
--
  typedef int64_t MirInputDeviceId;
  typedef enum {
@@ -42,14 +38,45 @@
      mir_input_event_type_touch = 1
  } MirInputEventType;
--/*
-- * Retrieve the MirInputEvent associated with a MirEvent of
-- * type mir_event_type_input.
-- *
-- * \param [in] event The event
-- * \return           The associated MirInputEvent
-- */
--MirInputEvent const* mir_event_get_input_event(MirEvent const* ev);
++/**
++ * Description of key modifier state.
++ */
++typedef enum {
++    mir_input_event_modifier_none        = 1 << 0,
++    mir_input_event_modifier_alt         = 1 << 1,
++    mir_input_event_modifier_alt_left    = 1 << 2,
++    mir_input_event_modifier_alt_right   = 1 << 3,
++    mir_input_event_modifier_shift       = 1 << 4,
++    mir_input_event_modifier_shift_left  = 1 << 5,
++    mir_input_event_modifier_shift_right = 1 << 6,
++    mir_input_event_modifier_sym         = 1 << 7,
++    mir_input_event_modifier_function    = 1 << 8,
++    mir_input_event_modifier_ctrl        = 1 << 9,
++    mir_input_event_modifier_ctrl_left   = 1 << 10,
++    mir_input_event_modifier_ctrl_right  = 1 << 11,
++    mir_input_event_modifier_meta        = 1 << 12,
++    mir_input_event_modifier_meta_left   = 1 << 13,
++    mir_input_event_modifier_meta_right  = 1 << 14,
++    mir_input_event_modifier_caps_lock   = 1 << 15,
++    mir_input_event_modifier_num_lock    = 1 << 16,
++    mir_input_event_modifier_scroll_lock = 1 << 17
++} MirInputEventModifiers;
++
++#ifdef __cplusplus
++}
++/**@}*/
++#endif
++
++#include "mir_toolkit/events/input/touch_input_event.h"
++#include "mir_toolkit/events/input/key_input_event.h"
++
++#ifdef __cplusplus
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++extern "C" {
++#endif
  /*
   * Retrieves the device id responsible for generating an input event.
 === modified file 'include/common/mir_toolkit/events/input/key_input_event.h'
 --- include/common/mir_toolkit/input/key_input_event.h	2014-12-01 17:00:22 +0000
 +++ include/common/mir_toolkit/events/input/key_input_event.h	2014-12-19 16:55:48 +0000
@@ -48,30 +48,6 @@
  } MirKeyInputEventAction;
  /**
-- * Description of key modifier state.
-- */
--typedef enum {
--    mir_key_input_event_modifier_none        = 1 << 0,
--    mir_key_input_event_modifier_alt         = 1 << 1,
--    mir_key_input_event_modifier_alt_left    = 1 << 2,
--    mir_key_input_event_modifier_alt_right   = 1 << 3,
--    mir_key_input_event_modifier_shift       = 1 << 4,
--    mir_key_input_event_modifier_shift_left  = 1 << 5,
--    mir_key_input_event_modifier_shift_right = 1 << 6,
--    mir_key_input_event_modifier_sym         = 1 << 7,
--    mir_key_input_event_modifier_function    = 1 << 8,
--    mir_key_input_event_modifier_ctrl        = 1 << 9,
--    mir_key_input_event_modifier_ctrl_left   = 1 << 10,
--    mir_key_input_event_modifier_ctrl_right  = 1 << 11,
--    mir_key_input_event_modifier_meta        = 1 << 12,
--    mir_key_input_event_modifier_meta_left   = 1 << 13,
--    mir_key_input_event_modifier_meta_right  = 1 << 14,
--    mir_key_input_event_modifier_caps_lock   = 1 << 15,
--    mir_key_input_event_modifier_num_lock    = 1 << 16,
--    mir_key_input_event_modifier_scroll_lock = 1 << 17
--} MirKeyInputEventModifiers;
--
--/**
   * Retrieve the action which triggered a given key event.
+  *
   *  \param [in] event The key event
@@ -103,7 +79,7 @@
   *   \param [in] event The key event
   *   \return           The modifier mask
   */
--MirKeyInputEventModifiers mir_key_input_event_get_modifiers(MirKeyInputEvent const* event);
++MirInputEventModifiers mir_key_input_event_get_modifiers(MirKeyInputEvent const* event);
  #ifdef __cplusplus
+ }
 === modified file 'include/common/mir_toolkit/events/input/touch_input_event.h'
 --- include/common/mir_toolkit/input/touch_input_event.h	2014-11-25 23:00:05 +0000
 +++ include/common/mir_toolkit/events/input/touch_input_event.h	2014-12-19 16:55:48 +0000
@@ -85,6 +85,14 @@
  } MirTouchInputEventTouchTooltype;
  /**
++ * Retrieve the modifier keys pressed when the touch action occured.
++ *
++ *   \param [in] event The key event
++ *   \return           The modifier mask
++ */
++MirInputEventModifiers mir_touch_input_event_get_modifiers(MirTouchInputEvent const* event);
++
++/**
   * Retrieve the number of touches reported for a given touch event. Each touch
   * is said to be index in the event and may be accessed by index 0, 1, ... , (touch_count - 1)
+  *
 === added file 'include/common/mir_toolkit/events/orientation_event.h'
 --- include/common/mir_toolkit/events/orientation_event.h	1970-01-01 00:00:00 +0000
 +++ include/common/mir_toolkit/events/orientation_event.h	2014-12-19 16:55:48 +0000
@@ -0,0 +1,45 @@
++/*
++ * 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 version 3,
++ * as published by the Free Software Foundation.
++ *
++ * 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: Robert Carr <robert.carr@canonical.com>
++ */
++
++#ifndef MIR_TOOLKIT_EVENTS_ORIENTATION_EVENT_H_
++#define MIR_TOOLKIT_EVENTS_ORIENTATION_EVENT_H_
++
++#include <mir_toolkit/events/event.h>
++
++#ifdef __cplusplus
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++extern "C" {
++#endif
++
++/*
++ * Retrieve the new orientation reported by this MirOrientationEvent
++ *
++ * \param[in] ev The orientation event
++ * \return       The new orientation
++ */
++MirOrientation mir_orientation_event_get_direction(MirOrientationEvent const* ev);
++
++#ifdef __cplusplus
++}
++/**@}*/
++#endif
++
++#endif /* MIR_TOOLKIT_ORIENTATION_EVENT_H_ */
 === added file 'include/common/mir_toolkit/events/prompt_session_event.h'
 --- include/common/mir_toolkit/events/prompt_session_event.h	1970-01-01 00:00:00 +0000
 +++ include/common/mir_toolkit/events/prompt_session_event.h	2014-12-19 16:55:48 +0000
@@ -0,0 +1,45 @@
++/*
++ * 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 version 3,
++ * as published by the Free Software Foundation.
++ *
++ * 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: Robert Carr <robert.carr@canonical.com>
++ */
++
++#ifndef MIR_TOOLKIT_EVENTS_PROMPT_SESSION_EVENT_H_
++#define MIR_TOOLKIT_EVENTS_PROMPT_SESSION_EVENT_H_
++
++#include <mir_toolkit/events/event.h>
++
++#ifdef __cplusplus
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++extern "C" {
++#endif
++
++/*
++ * Retrieve the new prompt session state reported by a given MirPromptSessionEvent
++ *
++ * \param [in] event The prompt session event
++ * \return           The new state
++ */
++MirPromptSessionState mir_prompt_session_event_get_state(MirPromptSessionEvent const* ev);
++
++#ifdef __cplusplus
++}
++/**@}*/
++#endif
++
++#endif /* MIR_TOOLKIT_PROMPT_SESSION_EVENT_H_ */
 === added file 'include/common/mir_toolkit/events/resize_event.h'
 --- include/common/mir_toolkit/events/resize_event.h	1970-01-01 00:00:00 +0000
 +++ include/common/mir_toolkit/events/resize_event.h	2014-12-19 16:55:48 +0000
@@ -0,0 +1,53 @@
++/*
++ * 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 version 3,
++ * as published by the Free Software Foundation.
++ *
++ * 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: Robert Carr <robert.carr@canonical.com>
++ */
++
++#ifndef MIR_TOOLKIT_EVENTS_RESIZE_EVENT_H_
++#define MIR_TOOLKIT_EVENTS_RESIZE_EVENT_H_
++
++#include <mir_toolkit/events/event.h>
++
++#ifdef __cplusplus
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++extern "C" {
++#endif
++
++/*
++ * Retrieve the new width reported by a given MirResizeEvent
++ *
++ * \param[in] ev The resize event
++ * \return       The reported width
++ */
++int mir_resize_event_get_width(MirResizeEvent const* ev);
++
++/*
++ * Retrieve the new height reported by a given MirResizeEvent
++ *
++ * \param[in] ev The resize event
++ * \return       The reported height
++ */
++int mir_resize_event_get_height(MirResizeEvent const* ev);
++
++#ifdef __cplusplus
++}
++/**@}*/
++#endif
++
++#endif /* MIR_TOOLKIT_RESIZE_EVENT_H_ */
 === added file 'include/common/mir_toolkit/events/surface_event.h'
 --- include/common/mir_toolkit/events/surface_event.h	1970-01-01 00:00:00 +0000
 +++ include/common/mir_toolkit/events/surface_event.h	2014-12-19 16:55:48 +0000
@@ -0,0 +1,53 @@
++/*
++ * 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 version 3,
++ * as published by the Free Software Foundation.
++ *
++ * 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: Robert Carr <robert.carr@canonical.com>
++ */
++
++#ifndef MIR_TOOLKIT_EVENTS_SURFACE_EVENT_H_
++#define MIR_TOOLKIT_EVENTS_SURFACE_EVENT_H_
++
++#include <mir_toolkit/events/event.h>
++
++#ifdef __cplusplus
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++extern "C" {
++#endif
++
++/*
++ * Retrieve the attribute index configured with a given MirSurfaceEvent
++ *
++ * \param [in] Event The event
++ * \return           The associated attribute
++ */
++MirSurfaceAttrib mir_surface_event_get_attribute(MirSurfaceEvent const* ev);
++
++/*
++ * Retrieve the new value of the associated attribute for a given MirSurfaceEvent
++ *
++ * \param [in] Event The event
++ * \return           The associated attribute value
++ */
++int mir_surface_event_get_attribute_value(MirSurfaceEvent const* ev);
++
++#ifdef __cplusplus
++}
++/**@}*/
++#endif
++
++#endif /* MIR_TOOLKIT_SURFACE_EVENT_H_ */
 === modified file 'platform-ABI-sha1sums'
 --- platform-ABI-sha1sums	2014-12-19 15:31:01 +0000
 +++ platform-ABI-sha1sums	2014-12-19 16:55:48 +0000
@@ -13,16 +13,22 @@
 cd6aed5ef5f8f39b3eb86604e4133cb840485  include/common/mir/input/input_receiver_thread.h
  be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/common/mir/int_wrapper.h
 de47e2790d0f7643e23eada2d8aa2987f58d086  include/common/mir/logging/logger.h
--5ab81600183fdaca3fb949beb2307d1f6e4cbb61  include/common/mir/log.h
++38f159ee67cf380ebd2bfee7a98d62bc0397c631  include/common/mir/log.h
 b9c24e2ce7194aeea6694e81c160354033d28a  include/common/mir/optional_value.h
 ae8473df05dd9e048a73797f01a2f34f7447554  include/common/mir/time/types.h
--23a009b06de7bac17d33d988dc8d968be8bc094a  include/common/mir_toolkit/client_types.h
++3350dac884d6006753de2a955bc7a05663cd9449  include/common/mir_toolkit/client_types.h
  c7c708734715a6d1b6fb2652584adb912071a518  include/common/mir_toolkit/common.h
  fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
--d71dddf6c4275ee423d3e0fa204e3b77b4d87401  include/common/mir_toolkit/event.h
--49403c824f69fa1cc1f58bf5fe635639148765eb  include/common/mir_toolkit/input/input_event.h
--f531c6a49883884a6c694393d5614f9942fe2703  include/common/mir_toolkit/input/key_input_event.h
--fd6d86becfa5ffa367480fd2654180f6ffcbf059  include/common/mir_toolkit/input/touch_input_event.h
++f4d39e9893ce6308bddd83a49b90f0051f565323  include/common/mir_toolkit/event.h
++2507f2929415aa423f9551d3c595c439fe1c6efd  include/common/mir_toolkit/events/event_deprecated.h
++ae75a0434588f2d086936e2a2dbe1e919a5fbc50  include/common/mir_toolkit/events/event.h
++c591a02a8e9851db342c310cf829d018a1eddb51  include/common/mir_toolkit/events/input/input_event.h
++7748a12138474e9be218eeb8f14b372af0fcec7e  include/common/mir_toolkit/events/input/key_input_event.h
++de7c23453e6d897296f32e49d9ba952a1baa0200  include/common/mir_toolkit/events/input/touch_input_event.h
++8642e85a50e2de651589da3ced70e0fc0a915f26  include/common/mir_toolkit/events/orientation_event.h
++f623dcf3c2ed134c1be20106eb54bcccc84af462  include/common/mir_toolkit/events/prompt_session_event.h
++633893b0def2b71f969872908a5b3529bc2fbf10  include/common/mir_toolkit/events/resize_event.h
++5944dc0556223cc54b45b32c8aa70b8c60ee0337  include/common/mir_toolkit/events/surface_event.h
  4975998aa1056ed0d39dcc538127453e516ad8e9  include/common/mir_toolkit/mesa/native_display.h
 c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h
 ce105a3a18241f5d33db31939ca15256f353c37  include/common/mir_toolkit/mir_version_number.h
 === modified file 'server-ABI-sha1sums'
 --- server-ABI-sha1sums	2014-12-19 15:31:01 +0000
 +++ server-ABI-sha1sums	2014-12-19 16:55:48 +0000
@@ -13,16 +13,22 @@
 cd6aed5ef5f8f39b3eb86604e4133cb840485  include/common/mir/input/input_receiver_thread.h
  be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/common/mir/int_wrapper.h
 de47e2790d0f7643e23eada2d8aa2987f58d086  include/common/mir/logging/logger.h
--5ab81600183fdaca3fb949beb2307d1f6e4cbb61  include/common/mir/log.h
++38f159ee67cf380ebd2bfee7a98d62bc0397c631  include/common/mir/log.h
 b9c24e2ce7194aeea6694e81c160354033d28a  include/common/mir/optional_value.h
 ae8473df05dd9e048a73797f01a2f34f7447554  include/common/mir/time/types.h
--23a009b06de7bac17d33d988dc8d968be8bc094a  include/common/mir_toolkit/client_types.h
++3350dac884d6006753de2a955bc7a05663cd9449  include/common/mir_toolkit/client_types.h
  c7c708734715a6d1b6fb2652584adb912071a518  include/common/mir_toolkit/common.h
  fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
--d71dddf6c4275ee423d3e0fa204e3b77b4d87401  include/common/mir_toolkit/event.h
--49403c824f69fa1cc1f58bf5fe635639148765eb  include/common/mir_toolkit/input/input_event.h
--f531c6a49883884a6c694393d5614f9942fe2703  include/common/mir_toolkit/input/key_input_event.h
--fd6d86becfa5ffa367480fd2654180f6ffcbf059  include/common/mir_toolkit/input/touch_input_event.h
++f4d39e9893ce6308bddd83a49b90f0051f565323  include/common/mir_toolkit/event.h
++2507f2929415aa423f9551d3c595c439fe1c6efd  include/common/mir_toolkit/events/event_deprecated.h
++ae75a0434588f2d086936e2a2dbe1e919a5fbc50  include/common/mir_toolkit/events/event.h
++c591a02a8e9851db342c310cf829d018a1eddb51  include/common/mir_toolkit/events/input/input_event.h
++7748a12138474e9be218eeb8f14b372af0fcec7e  include/common/mir_toolkit/events/input/key_input_event.h
++de7c23453e6d897296f32e49d9ba952a1baa0200  include/common/mir_toolkit/events/input/touch_input_event.h
++8642e85a50e2de651589da3ced70e0fc0a915f26  include/common/mir_toolkit/events/orientation_event.h
++f623dcf3c2ed134c1be20106eb54bcccc84af462  include/common/mir_toolkit/events/prompt_session_event.h
++633893b0def2b71f969872908a5b3529bc2fbf10  include/common/mir_toolkit/events/resize_event.h
++5944dc0556223cc54b45b32c8aa70b8c60ee0337  include/common/mir_toolkit/events/surface_event.h
  4975998aa1056ed0d39dcc538127453e516ad8e9  include/common/mir_toolkit/mesa/native_display.h
 c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h
 ce105a3a18241f5d33db31939ca15256f353c37  include/common/mir_toolkit/mir_version_number.h
 === modified file 'src/client/mirclient.pc.in'
 --- src/client/mirclient.pc.in	2014-12-08 04:03:47 +0000
 +++ src/client/mirclient.pc.in	2014-12-19 16:55:48 +0000
@@ -9,5 +9,5 @@
  Description: Mir client library
  Version: @MIR_VERSION@
  Requires.private: protobuf >= 2.4.1
--Libs: -L${libdir} -lmirclient
++Libs: -L${libdir} -lmirclient -lmircommon
  Cflags: -I${includedir} -I${common_includedir}
 === modified file 'src/common/CMakeLists.txt'
 --- src/common/CMakeLists.txt	2014-12-08 04:03:47 +0000
 +++ src/common/CMakeLists.txt	2014-12-19 16:55:48 +0000
@@ -36,6 +36,10 @@
  MESSAGE( STATUS "MIR_COMMON_SOURCES. . . : ${MIR_COMMON_SOURCES}" )
  MESSAGE( STATUS "MIR_COMMON_REFERENCES . : ${MIR_COMMON_REFERENCES}" )
++list(APPEND MIR_COMMON_SOURCES
++  ${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
++)
++
  add_library(mircommon
    SHARED
    ${MIR_COMMON_SOURCES}
 === added file 'src/common/event.cpp'
 --- src/common/event.cpp	1970-01-01 00:00:00 +0000
 +++ src/common/event.cpp	2014-12-19 16:55:48 +0000
@@ -0,0 +1,179 @@
++/*
++ * 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 version 3,
++ * as published by the Free Software Foundation.
++ *
++ * 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: Robert Carr <robert.carr@canonical.com>
++ */
++
++#define MIR_LOG_COMPONENT "event-access"
++
++#include "mir/event_type_to_string.h"
++#include "mir/log.h"
++
++#include "mir_toolkit/events/event.h"
++#include "mir_toolkit/events/event_deprecated.h"
++
++#include "mir_toolkit/events/surface_event.h"
++#include "mir_toolkit/events/resize_event.h"
++#include "mir_toolkit/events/prompt_session_event.h"
++#include "mir_toolkit/events/orientation_event.h"
++
++#include <stdlib.h>
++
++namespace ml = mir::logging;
++
++namespace
++{
++template <typename EventType>
++void expect_event_type(EventType const* ev, MirEventType t)
++{
++    if (ev->type != t)
++    {
++        mir::log_critical("Expected " + mir::event_type_to_string(t) + " but event is of type " +
++            mir::event_type_to_string(ev->type));
++        abort();
++    }
++}
++}
++
++std::string mir::event_type_to_string(MirEventType t)
++{
++    switch (t)
++    {
++    case mir_event_type_key:
++        return "mir_event_type_key";
++    case mir_event_type_motion:
++        return "mir_event_type_motion";
++    case mir_event_type_surface:
++        return "mir_event_type_surface";
++    case mir_event_type_resize:
++        return "mir_event_type_resize";
++    case mir_event_type_prompt_session_state_change:
++        return "mir_event_type_prompt_session_state_change";
++    case mir_event_type_orientation:
++        return "mir_event_type_orientation";
++    case mir_event_type_close_surface:
++        return "mir_event_type_close_surface";
++    case mir_event_type_input:
++        return "mir_event_type_input";
++    default:
++        abort();
++    }
++}
++
++
++MirEventType mir_event_get_type(MirEvent const* ev)
++{
++    switch (ev->type)
++    {
++    case mir_event_type_key:
++    case mir_event_type_motion:
++        return mir_event_type_input;
++    default:
++        return ev->type;
++    }
++}
++
++MirInputEvent const* mir_event_get_input_event(MirEvent const* ev)
++{
++    if (ev->type != mir_event_type_key && ev->type != mir_event_type_motion)
++    {
++        mir::log_critical("Expected input event but event is of type " +
++            mir::event_type_to_string(ev->type));
++        abort();
++    }
++
++    return reinterpret_cast<MirInputEvent const*>(ev);
++}
++
++MirSurfaceEvent const* mir_event_get_surface_event(MirEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_surface);
++
++    return &ev->surface;
++}
++
++MirResizeEvent const* mir_event_get_resize_event(MirEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_resize);
++
++    return &ev->resize;
++}
++
++MirPromptSessionEvent const* mir_event_get_prompt_session_event(MirEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_prompt_session_state_change);
++
++    return &ev->prompt_session;
++}
++
++MirOrientationEvent const* mir_event_get_orientation_event(MirEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_orientation);
++
++    return &ev->orientation;
++}
++
++MirCloseSurfaceEvent const* mir_event_get_close_surface_event(MirEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_close_surface);
++
++    return &ev->close_surface;
++}
++
++/* Surface event accessors */
++
++MirSurfaceAttrib mir_surface_event_get_attribute(MirSurfaceEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_surface);
++
++    return ev->attrib;
++}
++
++int mir_surface_event_get_attribute_value(MirSurfaceEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_surface);
++
++    return ev->value;
++}
++
++/* Resize event accessors */
++
++int mir_resize_event_get_width(MirResizeEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_resize);
++    return ev->width;
++}
++
++int mir_resize_event_get_height(MirResizeEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_resize);
++    return ev->height;
++}
++
++/* Prompt session event accessors */
++
++MirPromptSessionState mir_prompt_session_event_get_state(MirPromptSessionEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_prompt_session_state_change);
++    return ev->new_state;
++}
++
++/* Orientation event accessors */
++
++MirOrientation mir_orientation_event_get_direction(MirOrientationEvent const* ev)
++{
++    expect_event_type(ev, mir_event_type_orientation);
++    return ev->direction;
++}
 === modified file 'src/common/input/input_event.cpp'
 --- src/common/input/input_event.cpp	2014-12-01 17:00:22 +0000
 +++ src/common/input/input_event.cpp	2014-12-19 16:55:48 +0000
@@ -16,7 +16,12 @@
   * Authored by: Robert Carr <robert.carr@canonical.com>
   */
--#include "mir_toolkit/input/input_event.h"
++#define MIR_LOGGING_COMPONENT "input-event-access"
++
++#include "mir/event_type_to_string.h"
++#include "mir/log.h"
++
++#include "mir_toolkit/events/input/input_event.h"
  #include <assert.h>
  #include <stdlib.h>
@@ -26,8 +31,33 @@
  #define MIR_EVENT_ACTION_POINTER_INDEX_MASK 0xff00
  #define MIR_EVENT_ACTION_POINTER_INDEX_SHIFT 8;
++namespace ml = mir::logging;
++
  namespace
+ {
++void expect_old_event_type(MirEvent const* ev, MirEventType t)
++{
++    if (ev->type != t)
++    {
++        mir::log_critical("Expected " + mir::event_type_to_string(t) + " but event is of type " +
++            mir::event_type_to_string(ev->type));
++        abort();
++    }
++}
++
++std::string input_event_type_to_string(MirInputEventType input_event_type)
++{
++    switch (input_event_type)
++    {
++        case mir_input_event_type_key:
++            return "mir_input_event_type_key";
++        case mir_input_event_type_touch:
++            return "mir_input_event_type_touch";
++        default:
++            abort();
++    }
++}
++
  MirEvent const* old_ev_from_new(MirInputEvent const* ev)
+ {
      return reinterpret_cast<MirEvent const*>(ev);
@@ -35,43 +65,26 @@
  MirKeyEvent const& old_kev_from_new(MirKeyInputEvent const* ev)
+ {
      auto old_ev = reinterpret_cast<MirEvent const*>(ev);
--    if (old_ev->type != mir_event_type_key)
--        abort();
++    expect_old_event_type(old_ev, mir_event_type_key);
      return old_ev->key;
+ }
  MirMotionEvent const& old_mev_from_new(MirTouchInputEvent const* ev)
+ {
      auto old_ev = reinterpret_cast<MirEvent const*>(ev);
--    if (old_ev->type != mir_event_type_motion)
--        abort();
++    expect_old_event_type(old_ev, mir_event_type_motion);
      return old_ev->motion;
+ }
+ }
--MirEventType mir_event_get_type(MirEvent const* ev)
--{
--    switch (ev->type)
--    {
--    case mir_event_type_key:
--    case mir_event_type_motion:
--        return mir_event_type_input;
--    default:
--        return ev->type;
--    }
--}
--
--MirInputEvent const* mir_event_get_input_event(MirEvent  const* ev)
--{
--    if(mir_event_get_type(ev) != mir_event_type_input)
--        abort();
--
--    return reinterpret_cast<MirInputEvent const*>(ev);
--}
--
  MirInputEventType mir_input_event_get_type(MirInputEvent const* ev)
+ {
      auto old_ev = old_ev_from_new(ev);
--    assert(old_ev->type == mir_event_type_key || old_ev->type == mir_event_type_motion);
++
++    if (old_ev->type != mir_event_type_key && old_ev->type != mir_event_type_motion)
++    {
++        mir::log_critical("expected input event but event was of type " + mir::event_type_to_string(old_ev->type));
++        abort();
++    }
      switch (old_ev->type)
+     {
@@ -87,7 +100,12 @@
  MirInputDeviceId mir_input_event_get_device_id(MirInputEvent const* ev)
+ {
      auto old_ev = old_ev_from_new(ev);
--    assert(mir_event_get_type(old_ev) == mir_event_type_input);
++
++    if(mir_event_get_type(old_ev) != mir_event_type_input)
++    {
++        mir::log_critical("expected input event but event was of type " + mir::event_type_to_string(old_ev->type));
++        abort();
++    }
      switch (old_ev->type)
+     {
@@ -103,7 +121,11 @@
  int64_t mir_input_event_get_event_time(MirInputEvent const* ev)
+ {
      auto old_ev = old_ev_from_new(ev);
--    assert(mir_event_get_type(old_ev) == mir_event_type_input);
++    if(mir_event_get_type(old_ev) != mir_event_type_input)
++    {
++        mir::log_critical("expected input event but event was of type " + mir::event_type_to_string(old_ev->type));
++        abort();
++    }
      switch (old_ev->type)
+     {
@@ -121,7 +143,11 @@
  MirKeyInputEvent const* mir_input_event_get_key_input_event(MirInputEvent const* ev)
+ {
      if (mir_input_event_get_type(ev) != mir_input_event_type_key)
++    {
++        mir::log_critical("expected key input event but event was of type " +
++            input_event_type_to_string(mir_input_event_get_type(ev)));
          abort();
++    }
      return reinterpret_cast<MirKeyInputEvent const*>(ev);
+ }
@@ -161,59 +187,70 @@
  namespace
+ {
--MirKeyInputEventModifiers old_modifiers_to_new(MirKeyModifier old_modifier)
++MirInputEventModifiers old_modifiers_to_new(MirKeyModifier old_modifier)
+ {
      unsigned modifier = 0;
      if (old_modifier & mir_key_modifier_none)
--        modifier |= mir_key_input_event_modifier_none;
++        modifier |= mir_input_event_modifier_none;
      if (old_modifier & mir_key_modifier_alt)
--        modifier |= mir_key_input_event_modifier_alt;
++        modifier |= mir_input_event_modifier_alt;
      if (old_modifier & mir_key_modifier_alt_left)
--        modifier |= mir_key_input_event_modifier_alt_left;
++        modifier |= mir_input_event_modifier_alt_left;
      if (old_modifier & mir_key_modifier_alt_right)
--        modifier |= mir_key_input_event_modifier_alt_right;
++        modifier |= mir_input_event_modifier_alt_right;
      if (old_modifier & mir_key_modifier_shift)
--        modifier |= mir_key_input_event_modifier_shift;
++        modifier |= mir_input_event_modifier_shift;
      if (old_modifier & mir_key_modifier_shift_left)
--        modifier |= mir_key_input_event_modifier_shift_left;
++        modifier |= mir_input_event_modifier_shift_left;
      if (old_modifier & mir_key_modifier_shift_right)
--        modifier |= mir_key_input_event_modifier_shift_right;
++        modifier |= mir_input_event_modifier_shift_right;
      if (old_modifier & mir_key_modifier_sym)
--        modifier |= mir_key_input_event_modifier_sym;
++        modifier |= mir_input_event_modifier_sym;
      if (old_modifier & mir_key_modifier_function)
--        modifier |= mir_key_input_event_modifier_function;
++        modifier |= mir_input_event_modifier_function;
      if (old_modifier & mir_key_modifier_ctrl)
--        modifier |= mir_key_input_event_modifier_ctrl;
++        modifier |= mir_input_event_modifier_ctrl;
      if (old_modifier & mir_key_modifier_ctrl_left)
--        modifier |= mir_key_input_event_modifier_ctrl_left;
++        modifier |= mir_input_event_modifier_ctrl_left;
      if (old_modifier & mir_key_modifier_ctrl_right)
--        modifier |= mir_key_input_event_modifier_ctrl_right;
++        modifier |= mir_input_event_modifier_ctrl_right;
      if (old_modifier & mir_key_modifier_meta)
--        modifier |= mir_key_input_event_modifier_meta;
++        modifier |= mir_input_event_modifier_meta;
      if (old_modifier & mir_key_modifier_meta_left)
--        modifier |= mir_key_input_event_modifier_meta_left;
++        modifier |= mir_input_event_modifier_meta_left;
      if (old_modifier & mir_key_modifier_meta_right)
--        modifier |= mir_key_input_event_modifier_meta_right;
++        modifier |= mir_input_event_modifier_meta_right;
      if (old_modifier & mir_key_modifier_caps_lock)
--        modifier |= mir_key_input_event_modifier_caps_lock;
++        modifier |= mir_input_event_modifier_caps_lock;
      if (old_modifier & mir_key_modifier_num_lock)
--        modifier |= mir_key_input_event_modifier_num_lock;
++        modifier |= mir_input_event_modifier_num_lock;
      if (old_modifier & mir_key_modifier_scroll_lock)
--        modifier |= mir_key_input_event_modifier_scroll_lock;
--    return static_cast<MirKeyInputEventModifiers>(modifier);
--}
--}
--MirKeyInputEventModifiers mir_key_input_event_get_modifiers(MirKeyInputEvent const* kev)
--{    auto const& old_kev = old_kev_from_new(kev);
++        modifier |= mir_input_event_modifier_scroll_lock;
++    return static_cast<MirInputEventModifiers>(modifier);
++}
++}
++MirInputEventModifiers mir_key_input_event_get_modifiers(MirKeyInputEvent const* kev)
++{
++    auto const& old_kev = old_kev_from_new(kev);
      return old_modifiers_to_new(static_cast<MirKeyModifier>(old_kev.modifiers));
+ }
  /* Touch event accessors */
++MirInputEventModifiers mir_touch_input_event_get_modifiers(MirTouchInputEvent const* tev)
++{
++    auto const& old_mev = old_mev_from_new(tev);
++    return old_modifiers_to_new(static_cast<MirKeyModifier>(old_mev.modifiers));
++}
++
  MirTouchInputEvent const* mir_input_event_get_touch_input_event(MirInputEvent const* ev)
+ {
      if(mir_input_event_get_type(ev) != mir_input_event_type_touch)
++    {
++        mir::log_critical("expected touch input event but event was of type " +
++            input_event_type_to_string(mir_input_event_get_type(ev)));
          abort();
++    }
      return reinterpret_cast<MirTouchInputEvent const*>(ev);
+ }
@@ -229,7 +266,10 @@
      auto const& old_mev = old_mev_from_new(event);
      if (touch_index >= old_mev.pointer_count)
++    {
++        mir::log_critical("touch index is greater than pointer count");
          abort();
++    }
      return old_mev.pointer_coordinates[touch_index].id;
+ }
@@ -239,7 +279,10 @@
      auto const& old_mev = old_mev_from_new(event);
      if(touch_index > old_mev.pointer_count)
++    {
++        mir::log_critical("touch index is greater than pointer count");
          abort();
++    }
      auto masked_action = old_mev.action & MIR_EVENT_ACTION_MASK;
      size_t masked_index = (old_mev.action & MIR_EVENT_ACTION_POINTER_INDEX_MASK) >> MIR_EVENT_ACTION_POINTER_INDEX_SHIFT;
@@ -285,7 +328,10 @@
      auto const& old_mev = old_mev_from_new(event);
      if(touch_index > old_mev.pointer_count)
++    {
++        mir::log_critical("touch index is greater than pointer count");
          abort();
++    }
      switch (old_mev.pointer_coordinates[touch_index].tool_type)
+     {
@@ -307,7 +353,10 @@
      auto const& old_mev = old_mev_from_new(event);
      if(touch_index > old_mev.pointer_count)
++    {
++        mir::log_critical("touch index is greater than pointer count");
          abort();
++    }
      auto const& old_pc = old_mev.pointer_coordinates[touch_index];
      switch (axis)
 === added file 'src/include/common/mir/event_type_to_string.h'
 --- src/include/common/mir/event_type_to_string.h	1970-01-01 00:00:00 +0000
 +++ src/include/common/mir/event_type_to_string.h	2014-12-19 16:55:48 +0000
@@ -0,0 +1,30 @@
++/*
++ * 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 version 3,
++ * as published by the Free Software Foundation.
++ *
++ * 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: Robert Carr <robert.carr@canonical.com>
++ */
++
++#ifndef MIR_EVENT_TYPE_TO_STRING_H_
++#define MIR_EVENT_TYPE_TO_STRING_H_
++
++#include <string>
++#include "mir_toolkit/client_types.h"
++
++namespace mir
++{
++std::string event_type_to_string(MirEventType t);
++}
++
++#endif // MIR_EVENT_TYPE_TO_STRING_H_
 === modified file 'src/server/mirserver.pc.in'
 --- src/server/mirserver.pc.in	2014-12-08 04:03:47 +0000
 +++ src/server/mirserver.pc.in	2014-12-19 16:55:48 +0000
@@ -8,5 +8,5 @@
  Version: @MIR_VERSION@
  Requires.private: mirclient
  Requires: mirplatform
--Libs: -L@LIBDIR@ -lmirserver
++Libs: -L@LIBDIR@ -lmirserver -lmircommon
  Cflags: -I@INCLUDEDIR@
 === modified file 'tests/unit-tests/input/test_input_event.cpp'
 --- tests/unit-tests/input/test_input_event.cpp	2014-11-25 22:20:10 +0000
 +++ tests/unit-tests/input/test_input_event.cpp	2014-12-19 16:55:48 +0000
@@ -19,7 +19,7 @@
  #include <gtest/gtest.h>
  #include "mir_toolkit/event.h"
--#include "mir_toolkit/input/input_event.h"
++#include "mir_toolkit/events/input/input_event.h"
  // See: https://bugs.launchpad.net/mir/+bug/1311699
  #define MIR_EVENT_ACTION_POINTER_INDEX_MASK 0xff00
@@ -115,7 +115,7 @@
      auto new_kev = mir_input_event_get_key_input_event(mir_event_get_input_event(&old_ev));
      EXPECT_EQ(key_code, mir_key_input_event_get_key_code(new_kev));
      EXPECT_EQ(scan_code, mir_key_input_event_get_scan_code(new_kev));
--    EXPECT_EQ(mir_key_input_event_modifier_shift, mir_key_input_event_get_modifiers(new_kev));
++    EXPECT_EQ(mir_input_event_modifier_shift, mir_key_input_event_get_modifiers(new_kev));
+ }
  TEST(TouchInputEventProperties, touch_count_taken_from_pointer_count)