Mir

Merge lp:~mir-team/mir/port-examples-off-mir-event-access into lp:mir

port-examples-off-mir-event-access
Merge into development-branch

Proposed by Robert Carr on 2014-12-19

Status:	Merged
Approved by:	Cemil Azizoglu on 2015-01-05
Approved revision:	2124
Merged at revision:	2192
Proposed branch:	lp:~mir-team/mir/port-examples-off-mir-event-access
Merge into:	lp:mir
Diff against target:	357 lines (+158/-82) 9 files modified client-ABI-sha1sums (+1/-1) common-ABI-sha1sums (+1/-1) examples/demo_client_display_config.c (+42/-32) examples/eglapp.c (+44/-16) examples/server_example_input_event_filter.cpp (+12/-5) examples/server_example_input_filter.cpp (+51/-25) include/common/mir_toolkit/events/event.h (+5/-0) platform-ABI-sha1sums (+1/-1) server-ABI-sha1sums (+1/-1)
To merge this branch:	bzr merge lp:~mir-team/mir/port-examples-off-mir-event-access
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-12-19	Approve on 2015-01-05
Alan Griffiths		2014-12-19	Abstain on 2015-01-05
Daniel van Vugt			Abstain on 2014-12-29
Alberto Aguirre			Approve on 2014-12-19
Kevin DuBois (community)			Approve on 2014-12-19
Review via email: mp+245240@code.launchpad.net

This proposal supersedes a proposal from 2014-12-19.

Commit Message

Port examples to new event access API.

Description of the Change

Port examples to new event access API. I also updated events.h to include the particular event types...having each client include resize event, input event, etc is frustrating especially considering any realistic client will want them all.

PS Jenkins bot (ps-jenkins) wrote on 2014-12-12: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2111
http://jenkins.qa.ubuntu.com/job/mir-ci/2368/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/477
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/477/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/365/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/451/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-12-15: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2113
http://jenkins.qa.ubuntu.com/job/mir-ci/2396/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/507/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/507/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/481/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/393/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/481/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-12-16: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-12-17: Posted in a previous version of this proposal

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

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2014-12-18: Posted in a previous version of this proposal

222 - else if (ev->surface.value == mir_surface_visibility_occluded)
223 - printf("Surface occluded\n");

179 + case mir_surface_visibility_occluded:
180 + printf("Surface exposed\n");

I think "Surface exposed" is misleading for a mir_surface_visibility_occluded event.

review: Needs Fixing

Robert Carr (robertcarr) wrote on 2014-12-18: Posted in a previous version of this proposal

Whoops! Fixed.

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2014-12-19: Posted in a previous version of this proposal

Looks as though lp:~mir-team/mir/add-more-event-getters should be a prerequisite as we're seeing those diffs here.

review: Resubmit

PS Jenkins bot (ps-jenkins) wrote on 2014-12-19: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2120
http://jenkins.qa.ubuntu.com/job/mir-ci/2526/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/665/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/665/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/639/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/523/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/639/console

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

review: Needs Fixing (continuous-integration)

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

I'm not quite sure what the goals of MirEvent2.0 are, but looks okay to me. The logic in line 205 seems more wordy with MirEvent2.0 than with 1.0...

review: Approve

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

Hey kevin, thanks.

The long term goals are a pretty big redesign of the event semantics. This includes, differentation of pointer/touch events, event synthesis, cleaned up touch model, input methods, etc...

I felt like the only way we were going to get there is if we can quickly iterate MirEvent without breaking Client ABI. The verbosity is unfortunate but the cost isn't really so high. I'd be interested in adding some C++ API to cut down on the verbosity as some of our main clients (though not all) are C++.

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

opaquifying leads to wordiness but much better to easier to support a stable ABI.

review: Approve

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

Heh I don't know how to write....

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/2531/rebuild

review: Approve (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

lp:~mir-team/mir/port-examples-off-mir-event-access updated on 2014-12-24

2123. By Robert Carr <racarr@ocelot> on 2014-12-24: Merge trunk

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

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

review: Approve (continuous-integration)

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

I think we've now got an API that is unacceptably complex to use. First notice this proposal introduces twice the amount of code that it replaces. Second notice specific instances of using the new API:

205 - if (event.type == mir_event_type_key &&
206 - event.key.action == mir_key_action_down &&
207 - (event.key.modifiers & mir_key_modifier_alt) &&
208 - (event.key.modifiers & mir_key_modifier_ctrl) &&
209 - event.key.scan_code == KEY_BACKSPACE)
210 + if (mir_event_get_type(&event) != mir_event_type_input)
211 + return false;
212 + MirInputEvent const* input_event = mir_event_get_input_event(&event);
213 + if (mir_input_event_get_type(input_event) != mir_input_event_type_key)
214 + return false;
215 + MirKeyInputEvent const* kev = mir_input_event_get_key_input_event(input_event);
216 + if (mir_key_input_event_get_action(kev) != mir_key_input_event_action_down)
217 + return false;
218 + MirInputEventModifiers mods = mir_key_input_event_get_modifiers(kev);
219 + if (!(mods & mir_input_event_modifier_alt) || !(mods & mir_input_event_modifier_ctrl))
220 + return false;
221 + if (mir_key_input_event_get_scan_code(kev) == KEY_BACKSPACE)

I am not a fan. But I know it's too late to disapprove again.

review: Abstain

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

Hi Daniel. Nice to hear from you...inbox was so quiet! This is a good example you point out, where its not just find replace accessors->function name...

I had an idea for an API improvement classes of convenience functions e.g.

MirKeyEvent* mir_is_maybe_key_event(MirEvent)

Should help a little...

Ill whip something up tomorrow.

Alan Griffiths (alan-griffiths) wrote on 2015-01-05:

Yes, some event matcher functions could help. But I'm not not sure what the right design is for those...

MirKeyEvent* mir_matches_key_event(MirEvent, mir_key_action_down, mir_key_modifier_alt + mir_key_modifier_ctrl, KEY_BACKSPACE)

...is perhaps a little too specific.

review: Abstain

lp:~mir-team/mir/port-examples-off-mir-event-access updated on 2015-01-05

2124. By Robert Carr on 2015-01-05: Merge trunk

Robert Carr (robertcarr) wrote on 2015-01-05:

I thought about the mir_is_key_event accessor...but that doesnt help

it just changes

if (type != foo)
return;
mir_event_get_foo_type(ev)

ev = mir_event_get_foo_type(ev)
if (!ev)
return

I think deeper accessors, e.g. mir_matches_key_event is too specific. I think they are unlikely to be used outside of example code.

Test code uses the gmock matchers.
Realistic clients (toolkits or apps with a platform abstraction layer) translate MirEvent to something else and thus are interested in accessing every field, not matching it.

I think the cost is not that high to pay.

PS Jenkins bot (ps-jenkins) wrote on 2015-01-05:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) on 2015-01-05:

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-19 23:15:04 +0000
 +++ client-ABI-sha1sums	2015-01-05 17:06:41 +0000
@@ -14,7 +14,7 @@
  fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
  f4d39e9893ce6308bddd83a49b90f0051f565323  include/common/mir_toolkit/event.h
 f2929415aa423f9551d3c595c439fe1c6efd  include/common/mir_toolkit/events/event_deprecated.h
--d929f623c98b3842ae72059edeba9c89c04edd0f  include/common/mir_toolkit/events/event.h
++cb2358a701db2b9c8d9ba1c877f29f834af259a7  include/common/mir_toolkit/events/event.h
  c591a02a8e9851db342c310cf829d018a1eddb51  include/common/mir_toolkit/events/input/input_event.h
 a12138474e9be218eeb8f14b372af0fcec7e  include/common/mir_toolkit/events/input/key_input_event.h
  de7c23453e6d897296f32e49d9ba952a1baa0200  include/common/mir_toolkit/events/input/touch_input_event.h
 === modified file 'common-ABI-sha1sums'
 --- common-ABI-sha1sums	2014-12-19 23:15:04 +0000
 +++ common-ABI-sha1sums	2015-01-05 17:06:41 +0000
@@ -21,7 +21,7 @@
  fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
  f4d39e9893ce6308bddd83a49b90f0051f565323  include/common/mir_toolkit/event.h
 f2929415aa423f9551d3c595c439fe1c6efd  include/common/mir_toolkit/events/event_deprecated.h
--d929f623c98b3842ae72059edeba9c89c04edd0f  include/common/mir_toolkit/events/event.h
++cb2358a701db2b9c8d9ba1c877f29f834af259a7  include/common/mir_toolkit/events/event.h
  c591a02a8e9851db342c310cf829d018a1eddb51  include/common/mir_toolkit/events/input/input_event.h
 a12138474e9be218eeb8f14b372af0fcec7e  include/common/mir_toolkit/events/input/key_input_event.h
  de7c23453e6d897296f32e49d9ba952a1baa0200  include/common/mir_toolkit/events/input/touch_input_event.h
 === modified file 'examples/demo_client_display_config.c'
 --- examples/demo_client_display_config.c	2013-10-21 10:40:19 +0000
 +++ examples/demo_client_display_config.c	2015-01-05 17:06:41 +0000
@@ -295,42 +295,52 @@
      ctx->reconfigure = 1;
+ }
++static void handle_key_input_event(struct ClientContext *ctx, MirKeyInputEvent const* event)
++{
++    if (mir_key_input_event_get_action(event) != mir_key_input_event_action_up)
++        return;
++    xkb_keysym_t key_code = mir_key_input_event_get_key_code(event);
++
++    if (key_code >= XKB_KEY_1 &&
++        key_code <= XKB_KEY_9)
++    {
++        configure_display(ctx, configuration_mode_single,
++                          key_code - XKB_KEY_0);
++    }
++
++    switch (key_code)
++    {
++    case XKB_KEY_q:
++        ctx->running = 0;
++        break;
++    case XKB_KEY_c:
++        configure_display(ctx, configuration_mode_clone, 0);
++        break;
++    case XKB_KEY_h:
++        configure_display(ctx, configuration_mode_horizontal, 0);
++        break;
++    case XKB_KEY_v:
++        configure_display(ctx, configuration_mode_vertical, 0);
++        break;
++    case XKB_KEY_p:
++        print_current_configuration(ctx->connection);
++        break;
++    }
++}
++
  static void event_callback(
      MirSurface* surface, MirEvent const* event, void* context)
+ {
--    (void)surface;
++    (void) surface;
      struct ClientContext *ctx = (struct ClientContext*) context;
--
--    if (event->type == mir_event_type_key &&
--        event->key.action == mir_key_action_up)
--    {
--        if (event->key.key_code == XKB_KEY_q)
--        {
--            ctx->running = 0;
--        }
--        else if (event->key.key_code == XKB_KEY_c)
--        {
--            configure_display(ctx, configuration_mode_clone, 0);
--        }
--        else if (event->key.key_code == XKB_KEY_h)
--        {
--            configure_display(ctx, configuration_mode_horizontal, 0);
--        }
--        else if (event->key.key_code == XKB_KEY_v)
--        {
--            configure_display(ctx, configuration_mode_vertical, 0);
--        }
--        else if (event->key.key_code >= XKB_KEY_1 &&
--                 event->key.key_code <= XKB_KEY_9)
--        {
--            configure_display(ctx, configuration_mode_single,
--                              event->key.key_code - XKB_KEY_0);
--        }
--        else if (event->key.key_code == XKB_KEY_p)
--        {
--            print_current_configuration(ctx->connection);
--        }
--    }
++
++    if (mir_event_get_type(event) != mir_event_type_input)
++        return;
++    MirInputEvent const* input_event = mir_event_get_input_event(event);
++    if (mir_input_event_get_type(input_event) != mir_input_event_type_key)
++        return;
++
++    handle_key_input_event(ctx, mir_input_event_get_key_input_event(input_event));
+ }
  int main(int argc, char *argv[])
 === modified file 'examples/eglapp.c'
 --- examples/eglapp.c	2014-12-15 06:24:03 +0000
 +++ examples/eglapp.c	2015-01-05 17:06:41 +0000
@@ -90,18 +90,51 @@
+     }
+ }
++static void mir_eglapp_handle_input_event(MirInputEvent const* event)
++{
++    if (mir_input_event_get_type(event) != mir_input_event_type_key)
++        return;
++    MirKeyInputEvent const* kev = mir_input_event_get_key_input_event(event);
++    if (mir_key_input_event_get_action(kev) != mir_key_input_event_action_up)
++        return;
++    if (mir_key_input_event_get_key_code(kev) != XKB_KEY_q)
++        return;
++
++    running = 0;
++}
++
++static void mir_eglapp_handle_surface_event(MirSurfaceEvent const* sev)
++{
++    MirSurfaceAttrib attrib = mir_surface_event_get_attribute(sev);
++    if (attrib != mir_surface_attrib_visibility)
++        return;
++    switch (mir_surface_event_get_attribute_value(sev))
++    {
++    case mir_surface_visibility_exposed:
++        printf("Surface exposed\n");
++        break;
++    case mir_surface_visibility_occluded:
++        printf("Surface occluded\n");
++        break;
++    default:
++        break;
++    }
++}
++
  static void mir_eglapp_handle_event(MirSurface* surface, MirEvent const* ev, void* context)
+ {
      (void) surface;
      (void) context;
--    if (ev->type == mir_event_type_key &&
--        ev->key.key_code == XKB_KEY_q &&
--        ev->key.action == mir_key_action_up)
--    {
--        running = 0;
--    }
--    else if (ev->type == mir_event_type_resize)
--    {
++
++    switch (mir_event_get_type(ev))
++    {
++    case mir_event_type_input:
++        mir_eglapp_handle_input_event(mir_event_get_input_event(ev));
++        break;
++    case mir_event_type_surface:
++        mir_eglapp_handle_surface_event(mir_event_get_surface_event(ev));
++        break;
++    case mir_event_type_resize:
          /*
           * FIXME: https://bugs.launchpad.net/mir/+bug/1194384
           * It is unsafe to set the width and height here because we're in a
@@ -110,14 +143,9 @@
           * full single-threaded callbacks. (LP: #1194384).
           */
          printf("Resized to %dx%d\n", ev->resize.width, ev->resize.height);
--    }
--    else if (ev->type == mir_event_type_surface &&
--             ev->surface.attrib == mir_surface_attrib_visibility)
--    {
--        if (ev->surface.value == mir_surface_visibility_exposed)
--            printf("Surface exposed\n");
--        else if (ev->surface.value == mir_surface_visibility_occluded)
--            printf("Surface occluded\n");
++        break;
++    default:
++        break;
+     }
+ }
 === modified file 'examples/server_example_input_event_filter.cpp'
 --- examples/server_example_input_event_filter.cpp	2014-12-11 02:43:01 +0000
 +++ examples/server_example_input_event_filter.cpp	2015-01-05 17:06:41 +0000
@@ -35,11 +35,18 @@
  bool me::QuitFilter::handle(MirEvent const& event)
+ {
--    if (event.type == mir_event_type_key &&
--        event.key.action == mir_key_action_down &&
--        (event.key.modifiers & mir_key_modifier_alt) &&
--        (event.key.modifiers & mir_key_modifier_ctrl) &&
--        event.key.scan_code == KEY_BACKSPACE)
++    if (mir_event_get_type(&event) != mir_event_type_input)
++        return false;
++    MirInputEvent const* input_event = mir_event_get_input_event(&event);
++    if (mir_input_event_get_type(input_event) != mir_input_event_type_key)
++        return false;
++    MirKeyInputEvent const* kev = mir_input_event_get_key_input_event(input_event);
++    if (mir_key_input_event_get_action(kev) != mir_key_input_event_action_down)
++        return false;
++    MirInputEventModifiers mods = mir_key_input_event_get_modifiers(kev);
++    if (!(mods & mir_input_event_modifier_alt) || !(mods & mir_input_event_modifier_ctrl))
++        return false;
++    if (mir_key_input_event_get_scan_code(kev) == KEY_BACKSPACE)
+     {
          quit_action();
          return true;
 === modified file 'examples/server_example_input_filter.cpp'
 --- examples/server_example_input_filter.cpp	2014-12-08 17:10:25 +0000
 +++ examples/server_example_input_filter.cpp	2015-01-05 17:06:41 +0000
@@ -32,35 +32,61 @@
  /// Demonstrate adding a custom input filter to a server
  namespace
+ {
++void print_key_event(MirInputEvent const* ev)
++{
++    auto event_time = mir_input_event_get_event_time(ev);
++    auto kev = mir_input_event_get_key_input_event(ev);
++    auto scan_code = mir_key_input_event_get_scan_code(kev);
++    auto key_code = mir_key_input_event_get_key_code(kev);
++
++    std::cout << "Handling key event (time, scancode, keycode): " << event_time << " " <<
++              scan_code << " " << key_code << std::endl;
++}
++
++void print_touch_event(MirInputEvent const* ev)
++{
++    auto event_time = mir_input_event_get_event_time(ev);
++    auto tev = mir_input_event_get_touch_input_event(ev);
++    auto tc = mir_touch_input_event_get_touch_count(tev);
++
++    std::cout << "Handline touch event time=" << event_time
++              << " touch_count=" << tc << std::endl;
++    for (unsigned i = 0; i < tc; i++)
++    {
++        auto id = mir_touch_input_event_get_touch_id(tev, i);
++        auto px = mir_touch_input_event_get_touch_axis_value(tev, i,
++            mir_touch_input_axis_x);
++        auto py = mir_touch_input_event_get_touch_axis_value(tev, i,
++            mir_touch_input_axis_y);
++
++        std::cout << "  "
++            << " id=" << id
++            << " pos=(" << px << ", " << py << ")"
++            << std::endl;
++    }
++    std::cout << "----------------" << std::endl << std::endl;
++}
++
  struct PrintingEventFilter : public mi::EventFilter
+ {
--    void print_motion_event(MirMotionEvent const& ev)
--    {
--        std::cout << "Motion Event time=" << ev.event_time
--            << " pointer_count=" << ev.pointer_count << std::endl;
--
--        for (size_t i = 0; i < ev.pointer_count; ++i)
--        {
--            std::cout << "  "
--                << " id=" << ev.pointer_coordinates[i].id
--                << " pos=(" << ev.pointer_coordinates[i].x << ", " << ev.pointer_coordinates[i].y << ")"
--                << std::endl;
--        }
--        std::cout << "----------------" << std::endl << std::endl;
--    }
--
      bool handle(MirEvent const& ev) override
+     {
--        // TODO: Enhance printing
--        if (ev.type == mir_event_type_key)
--        {
--            std::cout << "Handling key event (time, scancode, keycode): " << ev.key.event_time << " "
--                << ev.key.scan_code << " " << ev.key.key_code << std::endl;
--        }
--        else if (ev.type == mir_event_type_motion)
--        {
--            print_motion_event(ev.motion);
--        }
++        if (mir_event_get_type(&ev) != mir_event_type_input)
++            return false;
++        auto input_event = mir_event_get_input_event(&ev);
++
++        switch (mir_input_event_get_type(input_event))
++        {
++        case mir_input_event_type_key:
++            print_key_event(input_event);
++            break;
++        case mir_input_event_type_touch:
++            print_touch_event(input_event);
++            break;
++        default:
++            abort();
++        }
++
          return false;
+     }
  };
 === modified file 'include/common/mir_toolkit/events/event.h'
 --- include/common/mir_toolkit/events/event.h	2014-12-18 19:11:01 +0000
 +++ include/common/mir_toolkit/events/event.h	2015-01-05 17:06:41 +0000
@@ -60,6 +60,11 @@
  #endif
  #include "mir_toolkit/events/event_deprecated.h"
++#include "mir_toolkit/events/input/input_event.h"
++#include "mir_toolkit/events/resize_event.h"
++#include "mir_toolkit/events/surface_event.h"
++#include "mir_toolkit/events/orientation_event.h"
++#include "mir_toolkit/events/prompt_session_event.h"
  #ifdef __cplusplus
  /**
 === modified file 'platform-ABI-sha1sums'
 --- platform-ABI-sha1sums	2014-12-20 00:20:16 +0000
 +++ platform-ABI-sha1sums	2015-01-05 17:06:41 +0000
@@ -21,7 +21,7 @@
  fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
  f4d39e9893ce6308bddd83a49b90f0051f565323  include/common/mir_toolkit/event.h
 f2929415aa423f9551d3c595c439fe1c6efd  include/common/mir_toolkit/events/event_deprecated.h
--d929f623c98b3842ae72059edeba9c89c04edd0f  include/common/mir_toolkit/events/event.h
++cb2358a701db2b9c8d9ba1c877f29f834af259a7  include/common/mir_toolkit/events/event.h
  c591a02a8e9851db342c310cf829d018a1eddb51  include/common/mir_toolkit/events/input/input_event.h
 a12138474e9be218eeb8f14b372af0fcec7e  include/common/mir_toolkit/events/input/key_input_event.h
  de7c23453e6d897296f32e49d9ba952a1baa0200  include/common/mir_toolkit/events/input/touch_input_event.h
 === modified file 'server-ABI-sha1sums'
 --- server-ABI-sha1sums	2014-12-20 00:20:16 +0000
 +++ server-ABI-sha1sums	2015-01-05 17:06:41 +0000
@@ -21,7 +21,7 @@
  fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
  f4d39e9893ce6308bddd83a49b90f0051f565323  include/common/mir_toolkit/event.h
 f2929415aa423f9551d3c595c439fe1c6efd  include/common/mir_toolkit/events/event_deprecated.h
--d929f623c98b3842ae72059edeba9c89c04edd0f  include/common/mir_toolkit/events/event.h
++cb2358a701db2b9c8d9ba1c877f29f834af259a7  include/common/mir_toolkit/events/event.h
  c591a02a8e9851db342c310cf829d018a1eddb51  include/common/mir_toolkit/events/input/input_event.h
 a12138474e9be218eeb8f14b372af0fcec7e  include/common/mir_toolkit/events/input/key_input_event.h
  de7c23453e6d897296f32e49d9ba952a1baa0200  include/common/mir_toolkit/events/input/touch_input_event.h