Merge lp:~unity-team/platform-api/devel-for-qtmircompositor into lp:platform-api

[Gerry Boland]

Add window resize & focus handling. Involves renaming "input event" to just "event"

A window resize event is not an "input event", hence the rename

Needed for QtCompositor. By Daniel d'Andrada

Add window resize & focus handling

Needed for QtCompositor

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/platform-api-ci/339/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/72

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/339/rebuild

review: Approve (continuous-integration)

[lp:~unity-team/platform-api/devel-for-qtmircompositor]

228. By Gerry Boland on 2014-07-03

Merge trunk

229. By Gerry Boland on 2014-07-03

Restore racarr's comment

230. By Gerry Boland on 2014-07-08

Add comment to clarify code that is phone/tablet specific

231. By Gerry Boland on 2014-07-08

Bump library so number

[Robert Carr (robertcarr)]

Thanks :) LGTM now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/platform-api-ci/340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/73

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/340/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/platform-api-ci/341/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/74/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/341/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/platform-api/devel-for-qtmircompositor]

232. By Gerry Boland on 2014-07-08

Update soname of test base to match soname, fix test fails

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/platform-api-ci/342/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/75

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/342/rebuild

review: Approve (continuous-integration)

[Ricardo Mendoza (ricmm)]

Few things:

1. If we can avoid breaking ABI, lets avoid breaking ABI. Please lets just add new functions for window event handling in addition to the existing input event ones, just mark them as deprecated in their comments. Not a big commitment to ABI stability, but in this case it looks relatively easy to *not* break it.

2. All new functions need to have stubs provided in the other modules (testbackend, for example). They also need to be added to the base ubuntu_application_api.cpp source that builds the base SO from macros. window_is_focused is not there.

3. All module_version.h files need to be updated the reflect the version. Same goes for base_module.h, neither of these are modified in here.

review: Needs Fixing

[Ricardo Mendoza (ricmm)]

> Few things:
>
> 1. If we can avoid breaking ABI, lets avoid breaking ABI. Please lets just add
> new functions for window event handling in addition to the existing input
> event ones, just mark them as deprecated in their comments. Not a big
> commitment to ABI stability, but in this case it looks relatively easy to
> *not* break it.
>
> 2. All new functions need to have stubs provided in the other modules
> (testbackend, for example). They also need to be added to the base
> ubuntu_application_api.cpp source that builds the base SO from macros.
> window_is_focused is not there.
>
> 3. All module_version.h files need to be updated the reflect the version. Same
> goes for base_module.h, neither of these are modified in here.

Some of these things are commented in line

[Daniel d'Andrada (dandrader)]

> Few things:
>
> 1. If we can avoid breaking ABI, lets avoid breaking ABI. Please lets just add
> new functions for window event handling in addition to the existing input
> event ones, just mark them as deprecated in their comments. Not a big
> commitment to ABI stability, but in this case it looks relatively easy to
> *not* break it.

And what are we gaining by keeping ABI compatibility? We are the sole consumers of platform-api currently, thus I don't see any real gain.

But I do see a big drawback of keeping ABI compatibility in this MP, which is ending up with clunkier API.

Take mir as an example: It's constantly breaking its API and ABI because it's a new project that is rapidly and constantly evolving. Freezing its API so early would severely hamper its evolution. I see the same for platform-api, as it's a thin wrapper of mir & others. It's an illusion to think you will get the API right right off the bat. So it's a moot point to enforce ABI stability right now IMHO.

[kevin gunn (kgunn72)]

> > Few things:
> >
> > 1. If we can avoid breaking ABI, lets avoid breaking ABI. Please lets just
> add
> > new functions for window event handling in addition to the existing input
> > event ones, just mark them as deprecated in their comments. Not a big
> > commitment to ABI stability, but in this case it looks relatively easy to
> > *not* break it.
>
> And what are we gaining by keeping ABI compatibility? We are the sole
> consumers of platform-api currently, thus I don't see any real gain.
>
> But I do see a big drawback of keeping ABI compatibility in this MP, which is
> ending up with clunkier API.
>
> Take mir as an example: It's constantly breaking its API and ABI because it's
> a new project that is rapidly and constantly evolving. Freezing its API so
> early would severely hamper its evolution. I see the same for platform-api, as
> it's a thin wrapper of mir & others. It's an illusion to think you will get
> the API right right off the bat. So it's a moot point to enforce ABI stability
> right now IMHO.

I have to agree, I don't get it either. If we own the clients, why keep the deprecated methods in place & working ? How many clients are there ? just 1 (qtubuntu)?

[lp:~unity-team/platform-api/devel-for-qtmircompositor]

233. By Daniel d'Andrada on 2014-07-15

Changes as per code review feedback

1 - not breaking the ABI anymore. Instead of replacing symbols we're deprecating
    them and adding new ones instead

2 - adding stubs for new functions in other modules

3 - updating versions throughout the source tree so they all match

[Daniel d'Andrada (dandrader)]

> Few things:
>
> 1. If we can avoid breaking ABI, lets avoid breaking ABI. Please lets just add
> new functions for window event handling in addition to the existing input
> event ones, just mark them as deprecated in their comments. Not a big
> commitment to ABI stability, but in this case it looks relatively easy to
> *not* break it.
>
> 2. All new functions need to have stubs provided in the other modules
> (testbackend, for example). They also need to be added to the base
> ubuntu_application_api.cpp source that builds the base SO from macros.
> window_is_focused is not there.
>
> 3. All module_version.h files need to be updated the reflect the version. Same
> goes for base_module.h, neither of these are modified in here.

Anyway, all 3 points have been implemented now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/platform-api-ci/344/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/77

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/344/rebuild

review: Approve (continuous-integration)

[Ricardo Mendoza (ricmm)]

Thanks.

review: Approve

[lp:~unity-team/platform-api/devel-for-qtmircompositor]

234. By Gerry Boland on 2014-07-24

Merge trunk

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-20 14:54:35 +0000
+++ CMakeLists.txt	2014-07-24 12:27:07 +0000
@@ -3,7 +3,7 @@
 project(ubuntu-platform-api)
 
 set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
-set(UBUNTU_PLATFORM_API_VERSION_MINOR 1)
+set(UBUNTU_PLATFORM_API_VERSION_MINOR 2)
 set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

=== modified file 'android/default/default_ubuntu_application_ui.cpp'
--- android/default/default_ubuntu_application_ui.cpp	2013-12-11 06:11:34 +0000
+++ android/default/default_ubuntu_application_ui.cpp	2014-07-24 12:27:07 +0000
@@ -229,6 +229,11 @@
 }
 
 void
+ua_ui_window_properties_set_event_cb_and_ctx(UAUiWindowProperties*, UAUiWindowEventCb, void *)
+{
+}
+
+void
 ua_ui_window_properties_set_dimensions(
     UAUiWindowProperties *properties,
     uint32_t width,

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-21 08:47:18 +0000
+++ debian/changelog	2014-07-24 12:27:07 +0000
@@ -1,3 +1,10 @@
+platform-api (2.2.0) UNRELEASED; urgency=medium
+
+  *  Add window resize support
+  *  Add window focus event
+
+ -- Gerry Boland <[e-mail]>  Wed, 02 Jul 2014 14:07:05 +0100
+
 platform-api (2.1.0+14.10.20140721-0ubuntu1) utopic; urgency=low
 
   [ thomas-voss ]

=== modified file 'debian/libubuntu-application-api2.symbols'
--- debian/libubuntu-application-api2.symbols	2014-06-30 08:54:25 +0000
+++ debian/libubuntu-application-api2.symbols	2014-07-24 12:27:07 +0000
@@ -117,6 +117,7 @@
  ua_ui_window_get_native_type@Base 0.18.1daily13.06.21
  ua_ui_window_get_size@Base 2.0.0+14.10.20140612
  ua_ui_window_hide@Base 0.18.1daily13.06.21
+ ua_ui_window_is_focused@Base 0replaceme
  ua_ui_window_move@Base 0.18.1daily13.06.21
  ua_ui_window_new_for_application_with_properties@Base 0.18.1daily13.06.21
  ua_ui_window_properties_destroy@Base 0.18.1daily13.06.21
@@ -124,6 +125,7 @@
  ua_ui_window_properties_new_for_normal_window@Base 0.18.1daily13.06.21
  ua_ui_window_properties_set_dimensions@Base 2.0.0+14.10.20140612
  ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.1daily13.06.21
+ ua_ui_window_properties_set_event_cb_and_ctx@Base 0replaceme
  ua_ui_window_properties_set_role@Base 0.18.1daily13.06.21
  ua_ui_window_properties_set_titlen@Base 0.18.1daily13.06.21
  ua_ui_window_request_fullscreen@Base 0.18.1daily13.06.21

=== modified file 'examples/test_c_api.cpp'
--- examples/test_c_api.cpp	2014-06-11 12:19:37 +0000
+++ examples/test_c_api.cpp	2014-07-24 12:27:07 +0000
@@ -83,7 +83,7 @@
     const GLfloat * color_data;
 };
 
-void on_new_event(void* ctx, const Event* ev)
+void on_new_event(void* ctx, const WindowEvent* ev)
 {
 }
 
@@ -110,7 +110,7 @@
     UAUiWindowProperties* wprops = ua_ui_window_properties_new_for_normal_window();
     ua_ui_window_properties_set_titlen(wprops, "Window 1", 8);
     ua_ui_window_properties_set_role(wprops, U_MAIN_ROLE);
-    ua_ui_window_properties_set_input_cb_and_ctx(wprops, on_new_event, NULL);
+    ua_ui_window_properties_set_event_cb_and_ctx(wprops, on_new_event, NULL);
    
     UAUiWindow* surface = ua_ui_window_new_for_application_with_properties(instance, wprops);
     

=== modified file 'examples/test_multiple_surfaces_event_delivery.cpp'
--- examples/test_multiple_surfaces_event_delivery.cpp	2014-06-11 12:19:37 +0000
+++ examples/test_multiple_surfaces_event_delivery.cpp	2014-07-24 12:27:07 +0000
@@ -83,7 +83,7 @@
     const GLfloat * color_data;
 };
 
-void on_new_event(void* ctx, const Event* ev)
+void on_new_event(void* ctx, const WindowEvent* ev)
 {
     int* surface = (int*) ctx;
 
@@ -115,14 +115,14 @@
     UAUiWindowProperties* wprops1 = ua_ui_window_properties_new_for_normal_window();
     ua_ui_window_properties_set_titlen(wprops1, "Window 1", 8);
     ua_ui_window_properties_set_role(wprops1, U_MAIN_ROLE);
-    ua_ui_window_properties_set_input_cb_and_ctx(wprops1, on_new_event, &i);
+    ua_ui_window_properties_set_event_cb_and_ctx(wprops1, on_new_event, &i);
    
     UAUiWindow* surface1 = ua_ui_window_new_for_application_with_properties(instance, wprops1);
  
     UAUiWindowProperties* wprops2 = ua_ui_window_properties_new_for_normal_window();
     ua_ui_window_properties_set_titlen(wprops2, "Window 2", 8);
     ua_ui_window_properties_set_role(wprops2, U_MAIN_ROLE);
-    ua_ui_window_properties_set_input_cb_and_ctx(wprops2, on_new_event, &j);
+    ua_ui_window_properties_set_event_cb_and_ctx(wprops2, on_new_event, &j);
    
     UAUiWindow* surface2 = ua_ui_window_new_for_application_with_properties(instance, wprops2);
 

=== modified file 'include/ubuntu/application/ui/input/CMakeLists.txt'
--- include/ubuntu/application/ui/input/CMakeLists.txt	2013-07-18 09:08:17 +0000
+++ include/ubuntu/application/ui/input/CMakeLists.txt	2014-07-24 12:27:07 +0000
@@ -1,9 +1,5 @@
-set(
-  UBUNTU_APPLICATION_UI_INPUT_HEADERS
-  event.h
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DESTINATION include/ubuntu/application/ui
+  FILES_MATCHING PATTERN "*.h"
 )
-
-install(
-  FILES ${UBUNTU_APPLICATION_UI_INPUT_HEADERS}
-  DESTINATION include/ubuntu/application/ui/input
-)
\ No newline at end of file

=== modified file 'include/ubuntu/application/ui/input/event.h'
--- include/ubuntu/application/ui/input/event.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/ui/input/event.h	2014-07-24 12:27:07 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voß <[e-mail]>
+ *              Daniel d'Andrada <[e-mail]>
  */
 #ifndef UBUNTU_APPLICATION_UI_INPUT_EVENT_H_
 #define UBUNTU_APPLICATION_UI_INPUT_EVENT_H_
@@ -102,82 +103,111 @@
 } UMotionButtonMask;
 
 
-    /** Maximum number of pointers reported within one input event. */
+    /** Maximum number of pointers reported within one event. */
 #define UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT (16)
 
-    /** Reference timebase, nanoseconds as measured by CLOCK_MONOTONIC. */
-    typedef int64_t nsecs_t;
-
-    /** Describes the different event types. */
-    typedef enum
-    {
-        KEY_EVENT_TYPE, ///< Event originates from a keyboard.
-        MOTION_EVENT_TYPE, ///< Event originates from something moving, e.g., a wheel, a mouse, a finger on a touchpad.
-        HW_SWITCH_EVENT_TYPE ///< Event originates from an additional button attached to the device's HW, e.g., power button.
-    } EventType;
-
-    /** Models an input event. */
-    typedef struct
-    {
-        EventType type; ///< Type of the event.
-        int32_t device_id; ///< Device that this event originated from.
-        int32_t source_id; ///< Source that this event originated from.
-        int32_t action; ///< Action signalled by this event.
-        int32_t flags; ///< Flags associated with this event.
-        int32_t meta_state; ///< State of the meta modifiers (ALT, CTRL, SHIFT).
-        /** Information specific to key/motion event types. */
-        union
-        {
-            /** Information describing an event originating from a HW switch. */
-            struct HardwareSwitchEvent
-            {
-                nsecs_t event_time; ///< Timestamp when the event happened.
-                uint32_t policy_flags; ///< Policy flags.
-                int32_t switch_code; ///< The scan code of the switch.
-                int32_t switch_value; ///< The value reported by the switch.
-            } hw_switch;
-            /** Information describing an event originating from a keyboard key. */
-            struct KeyEvent
-            {
-                int32_t key_code; 
-                int32_t scan_code;
-                int32_t repeat_count;
-                nsecs_t down_time;
-                nsecs_t event_time;
-                int is_system_key;  ///< \deprecated Do not use.
-            } key;
-            /** Information describing an event originating from a
-             * "moving" device, e.g., a mouse, a mouse-wheel, a finger
-             * on a touchpad. 
-             */
-            struct MotionEvent
-            {
-                int32_t edge_flags; ///< Set for touches intersecting a touchscreen's edges, requires HW support.
-                int32_t button_state; ///< State of buttons of the device
-                float x_offset; ///< Movement in x direction since down event
-                float y_offset; ///< Movement in y direction since down event
-                float x_precision; ///< Sampling precision in x direction
-                float y_precision; ///< Sampling precision in y direction
-                nsecs_t down_time; ///< Timestamp that marks the down event
-                nsecs_t event_time; ///< Timestamp that marks when this event happened
-                size_t pointer_count; ///< Number of pointers reported in this event
-                struct PointerCoordinate
-                {
-                    int id; ///< Unique id of the pointer
-                    float x, raw_x; ///< Processed and raw x coordinates
-                    float y, raw_y; ///< Processed and raw y coordinates
-                    float touch_major; ///< Touch major coordinate
-                    float touch_minor; ///< Touch minor coordinate
-                    float size; ///< Size of the pointer/touch
-                    float pressure; ///< Pressure of the touch
-                    float orientation; ///< Orientation
-                } pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
-            } motion;
-        } details;
-    } Event;
+/** Reference timebase, nanoseconds as measured by CLOCK_MONOTONIC. */
+typedef int64_t nsecs_t;
+
+typedef enum
+{
+    SURFACE_ATTRIBUTE_FOCUS
+} SurfaceAttributeType;
+
+/** Describes the different event types. */
+typedef enum
+{
+    KEY_WEVENT_TYPE, ///< Event originates from a keyboard.
+    MOTION_WEVENT_TYPE, ///< Event originates from something moving, e.g., a wheel, a mouse, a finger on a touchpad.
+    RESIZE_WEVENT_TYPE, ///< Surface has been resized
+    SURFACE_WEVENT_TYPE //< A surface attribute has changed its value
+} WindowEventType;
+
+/** Information describing an event originating from a keyboard key. */
+typedef struct
+{
+    WindowEventType type;
+
+    int32_t device_id; ///< Device that this event originated from.
+    int32_t source_id; ///< Source that this event originated from.
+    int32_t action; ///< Action signalled by this event.
+    int32_t flags; ///< Flags associated with this event.
+    int32_t meta_state; ///< State of the meta modifiers (ALT, CTRL, SHIFT).
+
+    int32_t key_code;
+    int32_t scan_code;
+    int32_t repeat_count;
+    nsecs_t down_time;
+    nsecs_t event_time;
+    int is_system_key;  ///< \deprecated Do not use.
+} KeyEvent;
+
+/** Information describing an event originating from a
+ * "moving" device, e.g., a mouse, a mouse-wheel, a finger
+ * on a touchpad. 
+ */
+typedef struct
+{
+    WindowEventType type;
+
+    int32_t device_id; ///< Device that this event originated from.
+    int32_t source_id; ///< Source that this event originated from.
+    int32_t action; ///< Action signalled by this event.
+    int32_t flags; ///< Flags associated with this event.
+    int32_t meta_state; ///< State of the meta modifiers (ALT, CTRL, SHIFT).
+
+    int32_t edge_flags; ///< Set for touches intersecting a touchscreen's edges, requires HW support.
+    int32_t button_state; ///< State of buttons of the device
+    float x_offset; ///< Movement in x direction since down event
+    float y_offset; ///< Movement in y direction since down event
+    float x_precision; ///< Sampling precision in x direction
+    float y_precision; ///< Sampling precision in y direction
+    nsecs_t down_time; ///< Timestamp that marks the down event
+    nsecs_t event_time; ///< Timestamp that marks when this event happened
+    size_t pointer_count; ///< Number of pointers reported in this event
+    struct PointerCoordinate
+    {
+        int id; ///< Unique id of the pointer
+        float x, raw_x; ///< Processed and raw x coordinates
+        float y, raw_y; ///< Processed and raw y coordinates
+        float touch_major; ///< Touch major coordinate
+        float touch_minor; ///< Touch minor coordinate
+        float size; ///< Size of the pointer/touch
+        float pressure; ///< Pressure of the touch
+        float orientation; ///< Orientation
+    } pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
+} MotionEvent;
+
+typedef struct
+{
+    WindowEventType type;
+
+    SurfaceAttributeType attribute; ///< The surface attribute that has changed
+    int32_t value; ///< The new value of that surface attribute.
+} SurfaceEvent;
+
+/** Information describing a surface resize event. */
+typedef struct
+{
+    WindowEventType type;
+
+    int32_t width; ///< The new surface width
+    int32_t height; ///< The new surface height.
+} ResizeEvent;
+
+typedef union
+{
+    WindowEventType type;
+    KeyEvent key;
+    MotionEvent motion;
+    SurfaceEvent surface;
+    ResizeEvent resize;
+} WindowEvent;
 
 #ifdef __cplusplus
 }
 #endif
 
+#include "event_deprecated.h"
+
 #endif // UBUNTU_APPLICATION_UI_INPUT_EVENT_H_

=== added file 'include/ubuntu/application/ui/input/event_deprecated.h'
--- include/ubuntu/application/ui/input/event_deprecated.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/ui/input/event_deprecated.h	2014-07-24 12:27:07 +0000
@@ -0,0 +1,98 @@
+/*
+ * 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: Thomas Voß <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_UI__EVENT_DEPRECATED_H_
+#define UBUNTU_APPLICATION_UI__EVENT_DEPRECATED_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /** Describes the different event types. */
+    typedef enum
+    {
+        KEY_EVENT_TYPE, ///< Event originates from a keyboard.
+        MOTION_EVENT_TYPE, ///< Event originates from something moving, e.g., a wheel, a mouse, a finger on a touchpad.
+        HW_SWITCH_EVENT_TYPE ///< Event originates from an additional button attached to the device's HW, e.g., power button.
+    } EventType;
+
+    /** Models an input event. */
+    typedef struct
+    {
+        EventType type; ///< Type of the event.
+        int32_t device_id; ///< Device that this event originated from.
+        int32_t source_id; ///< Source that this event originated from.
+        int32_t action; ///< Action signalled by this event.
+        int32_t flags; ///< Flags associated with this event.
+        int32_t meta_state; ///< State of the meta modifiers (ALT, CTRL, SHIFT).
+        /** Information specific to key/motion event types. */
+        union
+        {
+            /** Information describing an event originating from a HW switch. */
+            struct HardwareSwitchEvent
+            {
+                nsecs_t event_time; ///< Timestamp when the event happened.
+                uint32_t policy_flags; ///< Policy flags.
+                int32_t switch_code; ///< The scan code of the switch.
+                int32_t switch_value; ///< The value reported by the switch.
+            } hw_switch;
+            /** Information describing an event originating from a keyboard key. */
+            struct KeyEvent
+            {
+                int32_t key_code; 
+                int32_t scan_code;
+                int32_t repeat_count;
+                nsecs_t down_time;
+                nsecs_t event_time;
+                int is_system_key;  ///< \deprecated Do not use.
+            } key;
+            /** Information describing an event originating from a
+             * "moving" device, e.g., a mouse, a mouse-wheel, a finger
+             * on a touchpad. 
+             */
+            struct MotionEvent
+            {
+                int32_t edge_flags; ///< Set for touches intersecting a touchscreen's edges, requires HW support.
+                int32_t button_state; ///< State of buttons of the device
+                float x_offset; ///< Movement in x direction since down event
+                float y_offset; ///< Movement in y direction since down event
+                float x_precision; ///< Sampling precision in x direction
+                float y_precision; ///< Sampling precision in y direction
+                nsecs_t down_time; ///< Timestamp that marks the down event
+                nsecs_t event_time; ///< Timestamp that marks when this event happened
+                size_t pointer_count; ///< Number of pointers reported in this event
+                struct PointerCoordinate
+                {
+                    int id; ///< Unique id of the pointer
+                    float x, raw_x; ///< Processed and raw x coordinates
+                    float y, raw_y; ///< Processed and raw y coordinates
+                    float touch_major; ///< Touch major coordinate
+                    float touch_minor; ///< Touch minor coordinate
+                    float size; ///< Size of the pointer/touch
+                    float pressure; ///< Pressure of the touch
+                    float orientation; ///< Orientation
+                } pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
+            } motion;
+        } details;
+    } Event;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_UI__EVENT_DEPRECATED_H_

=== modified file 'include/ubuntu/application/ui/window.h'
--- include/ubuntu/application/ui/window.h	2014-05-07 12:21:22 +0000
+++ include/ubuntu/application/ui/window.h	2014-07-24 12:27:07 +0000
@@ -34,7 +34,10 @@
 
     typedef void UAUiWindow;
     typedef int32_t UAUiWindowId;
-    
+
+    /*
+        Ownership of properties is given to the returned UAUiWindow
+    */
     UBUNTU_DLL_PUBLIC UAUiWindow*
     ua_ui_window_new_for_application_with_properties(
     	UApplicationInstance *instance,
@@ -82,6 +85,10 @@
     ua_ui_window_get_native_type(
         UAUiWindow *window);
 
+    UBUNTU_DLL_PUBLIC int
+    ua_ui_window_is_focused(
+        UAUiWindow *window);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'include/ubuntu/application/ui/window_properties.h'
--- include/ubuntu/application/ui/window_properties.h	2013-12-11 04:56:15 +0000
+++ include/ubuntu/application/ui/window_properties.h	2014-07-24 12:27:07 +0000
@@ -39,10 +39,13 @@
         U_SHUTDOWN_DIALOG_ROLE,
     } UAUiWindowRole;
 
-
+    // Deprecated! Use UAUiWindowEventCb instead
     typedef void (*input_event_cb)(void* ctx, const Event* ev);
     typedef input_event_cb UAUiWindowInputEventCb;
 
+    typedef void (*event_cb)(void* ctx, const WindowEvent* ev);
+    typedef event_cb UAUiWindowEventCb;
+
     typedef void UAUiWindowProperties;
     
     UBUNTU_DLL_PUBLIC UAUiWindowProperties*
@@ -70,7 +73,8 @@
     UBUNTU_DLL_PUBLIC UAUiWindowRole
     ua_ui_window_properties_get_role(
         UAUiWindowProperties *properties);
-   
+
+    // Deprecated! Use ua_ui_window_properties_set_event_cb_and_ctx instead.
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_properties_set_input_cb_and_ctx(
         UAUiWindowProperties *properties,
@@ -78,6 +82,12 @@
         void *ctx);
 
     UBUNTU_DLL_PUBLIC void
+    ua_ui_window_properties_set_event_cb_and_ctx(
+        UAUiWindowProperties *properties,
+        UAUiWindowEventCb cb,
+        void *ctx);
+
+    UBUNTU_DLL_PUBLIC void
     ua_ui_window_properties_set_dimensions(
         UAUiWindowProperties *properties,
         uint32_t width,

=== modified file 'src/ubuntu/application/base_module.h'
--- src/ubuntu/application/base_module.h	2014-06-20 14:54:35 +0000
+++ src/ubuntu/application/base_module.h	2014-07-24 12:27:07 +0000
@@ -28,7 +28,7 @@
  */
 
 #define API_VERSION_MAJOR   "2"
-#define API_VERSION_MINOR   "1"
+#define API_VERSION_MINOR   "2"
 #define API_VERSION_PATCH   "0"
 #define SO_SUFFIX ".so." API_VERSION_MAJOR "." API_VERSION_MINOR "." API_VERSION_PATCH
 

=== modified file 'src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp	2014-05-20 09:29:12 +0000
+++ src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp	2014-07-24 12:27:07 +0000
@@ -299,6 +299,12 @@
     properties->set_input_cb_and_ctx(cb, ctx);
 }
 
+void ua_ui_window_properties_set_event_cb_and_ctx(UAUiWindowProperties* u_properties, UAUiWindowEventCb cb, void* ctx)
+{
+    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
+    properties->set_event_cb_and_ctx(cb, ctx);
+}
+
 void ua_ui_window_properties_set_dimensions(UAUiWindowProperties *u_properties, uint32_t width, uint32_t height)
 {
     auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
@@ -347,21 +353,21 @@
 UStatus ua_ui_window_hide(UAUiWindow* u_window)
 {
     auto window = uamc::Window::from_u_window(u_window);
-    window->set_state(U_MINIMIZED_STATE);
+    window->hide();
     return (UStatus) 0;
 }
 
 UStatus ua_ui_window_show(UAUiWindow* u_window)
 {
     auto window = uamc::Window::from_u_window(u_window);
-    window->set_state(U_MAXIMIZED_STATE);
+    window->show();
     return (UStatus) 0;
 }
 
 void ua_ui_window_request_fullscreen(UAUiWindow* u_window)
 {
     auto window = uamc::Window::from_u_window(u_window);
-    window->set_state(U_FULLSCREEN_STATE);
+    window->request_fullscreen();
 }
 
 EGLNativeWindowType ua_ui_window_get_native_type(UAUiWindow* u_window)
@@ -370,5 +376,11 @@
     return window->get_native_type();
 }
 
+int ua_ui_window_is_focused(UAUiWindow *u_window)
+{
+    auto window = uamc::Window::from_u_window(u_window);
+    return window->is_focused();
+}
+
 // TODO: Sensors
 }

=== modified file 'src/ubuntu/application/common/mirclient/window_mirclient.cpp'
--- src/ubuntu/application/common/mirclient/window_mirclient.cpp	2014-05-20 09:29:12 +0000
+++ src/ubuntu/application/common/mirclient/window_mirclient.cpp	2014-07-24 12:27:07 +0000
@@ -35,27 +35,38 @@
 namespace client
 {
 
-struct InputContext
-{
-    UAUiWindowInputEventCb cb;
-    void *ctx;
-};
-
 static void
 ua_ui_window_mir_handle_event(MirSurface* surface, MirEvent const* mir_ev, void* ctx)
 {
     // TODO<mir>: Perhaps this indicates that mirclient library should not pass a surface argument here.
     (void) surface;
 
-    Event ubuntu_ev;
-    auto translated_event = uaum::event_to_ubuntu_event(mir_ev, ubuntu_ev);
-    
-    // Mir sends some events such as focus gained/lost which the platform API does not represent as input events.
-    if (translated_event)
-    {
-        auto mir_ctx = static_cast<uamc::InputContext*>(ctx);
-        mir_ctx->cb(mir_ctx->ctx, &ubuntu_ev);
+    WindowEvent ubuntu_ev;
+
+    bool translated_event = uaum::event_to_ubuntu_event(mir_ev, ubuntu_ev);
+
+    // Mir sends some events which platform API does not represent as platform-api events.
+    if (!translated_event)
+        return;
+
+    auto window = static_cast<uamc::Window*>(ctx);
+    window->process_event(ubuntu_ev);
+
+    UAUiWindowEventCb user_callback = window->get_user_callback();
+    if (user_callback != nullptr) {
+        user_callback(window->get_user_callback_context(), &ubuntu_ev);
+    } else {
+        // Fallback to the old, deprecated, API for handling events
+        Event ubuntu_deprecated_ev;
+
+        bool ok = uaum::event_to_ubuntu_deprecated_event(mir_ev, ubuntu_deprecated_ev);
+
+        if (ok) {
+            UAUiWindowInputEventCb user_input_callback = window->get_user_input_callback();
+            user_input_callback(window->get_user_callback_context(), &ubuntu_deprecated_ev);
+        }
     }
+
 }
 
 }
@@ -84,8 +95,13 @@
 
 uamc::Window::Window(uamc::Instance& instance,
                      uamc::WindowProperties* properties)
-    : instance(instance)
+    : instance(instance),
+      focused(0)
 {
+    user_event_callback = properties->event_cb();
+    user_event_callback_context = properties->event_cb_context();
+    user_input_callback = properties->input_cb();
+
     window_properties = WindowPropertiesPtr(properties,
         [](uamc::WindowProperties *p)
         {
@@ -98,11 +114,6 @@
 
     auto mir_surface = mir_connection_create_surface_sync(connection, &parameters);
     // TODO: create_surface_sync is unsafe as there is a race between setting the event handler and receiving surfaces
-    input_ctx = InputContextPtr(new uamc::InputContext{properties->input_cb(), properties->input_context()},
-        [](InputContext *c)
-        {
-            delete c;
-        });
 
     if (properties->surface_type()) {
         // TODO: Should I bother checking the result?
@@ -112,7 +123,7 @@
     MirEventDelegate delegate = 
         { 
             uamc::ua_ui_window_mir_handle_event,
-            input_ctx.get()
+            this
         };
     mir_surface_set_event_handler(mir_surface, &delegate);
     surface = SurfacePtr(mir_surface, 
@@ -120,6 +131,9 @@
         {
             mir_surface_release_sync(s);
         });
+
+    // FIXME: this only really applicable for phone & tablet case
+    state_before_hiding = U_MAXIMIZED_STATE;
 }
 
 UAUiWindow* uamc::Window::as_u_window()
@@ -154,3 +168,28 @@
     *width = parameters.width;
     *height = parameters.height;
 }
+
+void uamc::Window::hide()
+{
+    state_before_hiding = state();
+    set_state(U_MINIMIZED_STATE);
+}
+
+void uamc::Window::show()
+{
+    if (state() == U_MINIMIZED_STATE) {
+        set_state(state_before_hiding);
+    }
+}
+
+void uamc::Window::request_fullscreen()
+{
+    set_state(U_FULLSCREEN_STATE);
+}
+
+void uamc::Window::process_event(const WindowEvent &ev)
+{
+    if (ev.type == SURFACE_WEVENT_TYPE && ev.surface.attribute == SURFACE_ATTRIBUTE_FOCUS) {
+        focused = ev.surface.value;
+    }
+}

=== modified file 'src/ubuntu/application/common/mirclient/window_mirclient_priv.h'
--- src/ubuntu/application/common/mirclient/window_mirclient_priv.h	2014-05-20 09:29:12 +0000
+++ src/ubuntu/application/common/mirclient/window_mirclient_priv.h	2014-07-24 12:27:07 +0000
@@ -41,7 +41,6 @@
 {
 class Instance;
 class WindowProperties;
-struct InputContext;
 
 class Window
 {
@@ -55,24 +54,47 @@
     EGLNativeWindowType get_native_type();
 
     UApplicationUiWindowState state() const;
-    void set_state(const UApplicationUiWindowState);
+
+    void hide();
+    void show();
+    void request_fullscreen();
 
     void get_size(uint32_t *width, uint32_t *height);
 
+    void process_event(const WindowEvent &ev);
+    int is_focused() const { return focused; }
+
+    // user as in "platform-api user"
+    UAUiWindowEventCb get_user_callback() { return user_event_callback;}
+    void *get_user_callback_context() { return user_event_callback_context; }
+
+    // Deprecated! Use get_user_callback() instead
+    UAUiWindowInputEventCb get_user_input_callback() { return user_input_callback;}
+
 protected:
     Window(Window const&) = delete;
     Window& operator=(Window const&) = delete;
 
 private:
+    void set_state(const UApplicationUiWindowState);
+
     Instance& instance;
 
     typedef std::unique_ptr<WindowProperties, std::function<void(WindowProperties*)>> WindowPropertiesPtr;
     typedef std::unique_ptr<MirSurface, std::function<void(MirSurface*)>> SurfacePtr;
-    typedef std::unique_ptr<InputContext, std::function<void(InputContext*)>> InputContextPtr;
 
     WindowPropertiesPtr window_properties;
-    InputContextPtr input_ctx;
     SurfacePtr surface;
+
+    UAUiWindowEventCb user_event_callback;
+    void *user_event_callback_context;
+
+    // Deprecated! Replaced by user_event_callback
+    UAUiWindowInputEventCb user_input_callback;
+
+    UApplicationUiWindowState state_before_hiding;
+
+    int focused;
 };
     
 }

=== modified file 'src/ubuntu/application/common/mirclient/window_properties_mirclient.cpp'
--- src/ubuntu/application/common/mirclient/window_properties_mirclient.cpp	2013-12-11 04:36:18 +0000
+++ src/ubuntu/application/common/mirclient/window_properties_mirclient.cpp	2014-07-24 12:27:07 +0000
@@ -23,8 +23,9 @@
 uamc::WindowProperties::WindowProperties()
     : parameters(),
       type(mir_surface_type_normal),
-      cb(nullptr),
-      input_ctx(nullptr)
+      _input_cb(nullptr),
+      _event_cb(nullptr),
+      _event_cb_ctx(nullptr)
 {
     parameters.name = nullptr;
     parameters.width = 0;
@@ -50,8 +51,14 @@
 
 void uamc::WindowProperties::set_input_cb_and_ctx(UAUiWindowInputEventCb callback, void* ctx)
 {
-    cb = callback;
-    input_ctx = ctx;
+    _input_cb = callback;
+    _event_cb_ctx = ctx;
+}
+
+void uamc::WindowProperties::set_event_cb_and_ctx(UAUiWindowEventCb callback, void* ctx)
+{
+    _event_cb = callback;
+    _event_cb_ctx = ctx;
 }
 
 void uamc::WindowProperties::set_dimensions(uint32_t width, uint32_t height)
@@ -80,10 +87,15 @@
 
 UAUiWindowInputEventCb uamc::WindowProperties::input_cb() const
 {
-    return cb;
-}
-
-void* uamc::WindowProperties::input_context() const
-{
-    return input_ctx;
+    return _input_cb;
+}
+
+UAUiWindowEventCb uamc::WindowProperties::event_cb() const
+{
+    return _event_cb;
+}
+
+void* uamc::WindowProperties::event_cb_context() const
+{
+    return _event_cb_ctx;
 }

=== modified file 'src/ubuntu/application/common/mirclient/window_properties_mirclient_priv.h'
--- src/ubuntu/application/common/mirclient/window_properties_mirclient_priv.h	2013-12-11 02:20:26 +0000
+++ src/ubuntu/application/common/mirclient/window_properties_mirclient_priv.h	2014-07-24 12:27:07 +0000
@@ -46,14 +46,24 @@
     static WindowProperties* from_u_window_properties(UAUiWindowProperties* u_properties);
     
     void set_title(char const* title, size_t length);
+
+    // Deprecated! Use set_event_cb_and_ctx()
     void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
+
+    // sets event callback and callback context
+    void set_event_cb_and_ctx(UAUiWindowEventCb cb, void* ctx);
+
     void set_dimensions(uint32_t width, uint32_t height);
     void set_role(UAUiWindowRole role);    
     
     MirSurfaceParameters const& surface_parameters() const;
     MirSurfaceType surface_type() const;
+
+    // Deprecated! Use event_cb()
     UAUiWindowInputEventCb input_cb() const;
-    void* input_context() const;
+
+    UAUiWindowEventCb event_cb() const;
+    void* event_cb_context() const;
     
 protected:
     WindowProperties(WindowProperties const&) = delete;
@@ -65,8 +75,9 @@
 
     std::string title;
 
-    UAUiWindowInputEventCb cb;
-    void *input_ctx;
+    UAUiWindowInputEventCb _input_cb; // Deprecated! Replaced by _event_cb
+    UAUiWindowEventCb _event_cb;
+    void *_event_cb_ctx;
 };
     
 }

=== modified file 'src/ubuntu/application/common/mircommon/event_helpers_mir.cpp'
--- src/ubuntu/application/common/mircommon/event_helpers_mir.cpp	2013-10-14 21:22:49 +0000
+++ src/ubuntu/application/common/mircommon/event_helpers_mir.cpp	2014-07-24 12:27:07 +0000
@@ -20,10 +20,78 @@
 
 namespace uaum = ubuntu::application::ui::mir;
 
-// TODO<mir>: This begs the question: Why does MirEvent exist? It's difficult to ensure this function is kept in sync 
+// TODO<mir>: This begs the question: Why does MirEvent exist? It's difficult to ensure this function is kept in sync
 // at the unit test level.
 bool
-uaum::event_to_ubuntu_event(MirEvent const* mir_event, Event& ubuntu_ev)
+uaum::event_to_ubuntu_event(MirEvent const* mir_event, WindowEvent& ubuntu_ev)
+{
+    switch (mir_event->type)
+    {
+    case mir_event_type_key:
+        ubuntu_ev.key.type = KEY_WEVENT_TYPE;
+        ubuntu_ev.key.device_id = mir_event->key.device_id;
+        ubuntu_ev.key.source_id = mir_event->key.source_id;
+        ubuntu_ev.key.action = mir_event->key.action;
+        ubuntu_ev.key.flags = mir_event->key.flags;
+        ubuntu_ev.key.meta_state = mir_event->key.modifiers;
+        ubuntu_ev.key.key_code = mir_event->key.key_code;
+        ubuntu_ev.key.scan_code = mir_event->key.scan_code;
+        ubuntu_ev.key.repeat_count = mir_event->key.repeat_count;
+        ubuntu_ev.key.down_time = mir_event->key.down_time;
+        ubuntu_ev.key.event_time = mir_event->key.event_time;
+        ubuntu_ev.key.is_system_key = mir_event->key.is_system_key;
+        return true;
+    case mir_event_type_motion:
+        ubuntu_ev.motion.type = MOTION_WEVENT_TYPE;
+        ubuntu_ev.motion.device_id = mir_event->motion.device_id;
+        ubuntu_ev.motion.source_id = mir_event->motion.source_id;
+        ubuntu_ev.motion.action = mir_event->motion.action;
+        ubuntu_ev.motion.flags = mir_event->motion.flags;
+        ubuntu_ev.motion.meta_state = mir_event->motion.modifiers;
+        ubuntu_ev.motion.edge_flags = mir_event->motion.edge_flags;
+        ubuntu_ev.motion.button_state = mir_event->motion.button_state;
+        ubuntu_ev.motion.x_offset = mir_event->motion.x_offset;
+        ubuntu_ev.motion.y_offset = mir_event->motion.y_offset;
+        ubuntu_ev.motion.x_precision = mir_event->motion.x_precision;
+        ubuntu_ev.motion.y_precision = mir_event->motion.y_precision;
+        ubuntu_ev.motion.down_time = mir_event->motion.down_time;
+        ubuntu_ev.motion.event_time = mir_event->motion.event_time;
+        ubuntu_ev.motion.pointer_count = mir_event->motion.pointer_count;
+        for (int i = 0; i < mir_event->motion.pointer_count; i++)
+        {
+            ubuntu_ev.motion.pointer_coordinates[i].id = mir_event->motion.pointer_coordinates[i].id;
+            ubuntu_ev.motion.pointer_coordinates[i].x = mir_event->motion.pointer_coordinates[i].x;
+            ubuntu_ev.motion.pointer_coordinates[i].raw_x = mir_event->motion.pointer_coordinates[i].raw_x;
+            ubuntu_ev.motion.pointer_coordinates[i].y = mir_event->motion.pointer_coordinates[i].y;
+            ubuntu_ev.motion.pointer_coordinates[i].raw_y = mir_event->motion.pointer_coordinates[i].raw_y;
+            ubuntu_ev.motion.pointer_coordinates[i].touch_major = mir_event->motion.pointer_coordinates[i].touch_major;
+            ubuntu_ev.motion.pointer_coordinates[i].touch_minor = mir_event->motion.pointer_coordinates[i].touch_minor;
+            ubuntu_ev.motion.pointer_coordinates[i].size = mir_event->motion.pointer_coordinates[i].size;
+            ubuntu_ev.motion.pointer_coordinates[i].pressure = mir_event->motion.pointer_coordinates[i].pressure;
+            ubuntu_ev.motion.pointer_coordinates[i].orientation = mir_event->motion.pointer_coordinates[i].orientation;
+        }
+        return true;
+    case mir_event_type_resize:
+        ubuntu_ev.resize.type = RESIZE_WEVENT_TYPE;
+        ubuntu_ev.resize.width = mir_event->resize.width;
+        ubuntu_ev.resize.height = mir_event->resize.height;
+        return true;
+    case mir_event_type_surface:
+        ubuntu_ev.surface.type = SURFACE_WEVENT_TYPE;
+        if (mir_event->surface.attrib == mir_surface_attrib_focus) {
+            ubuntu_ev.surface.attribute = SURFACE_ATTRIBUTE_FOCUS;
+            ubuntu_ev.surface.value = mir_event->surface.value == mir_surface_focused;
+            return true;
+        } else {
+            return false;
+        }
+    default:
+        return false;
+    }
+}
+
+bool
+uaum::event_to_ubuntu_deprecated_event(MirEvent const* mir_event, Event& ubuntu_ev)
 {
     switch (mir_event->type)
     {

=== modified file 'src/ubuntu/application/common/mircommon/event_helpers_mir.h'
--- src/ubuntu/application/common/mircommon/event_helpers_mir.h	2013-10-14 21:22:49 +0000
+++ src/ubuntu/application/common/mircommon/event_helpers_mir.h	2014-07-24 12:27:07 +0000
@@ -30,7 +30,8 @@
 {
 namespace mir
 {
-bool event_to_ubuntu_event(MirEvent const* mir_event, Event& ubuntu_ev);
+bool event_to_ubuntu_event(MirEvent const* mir_event, WindowEvent& ubuntu_ev);
+bool event_to_ubuntu_deprecated_event(MirEvent const* mir_event, Event& ubuntu_ev);
 }
 }
 }

=== modified file 'src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp	2014-05-20 09:26:33 +0000
+++ src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp	2014-07-24 12:27:07 +0000
@@ -255,6 +255,10 @@
     (void) role;
 }
 
+void ua_ui_window_properties_set_event_cb_and_ctx(UAUiWindowProperties*, UAUiWindowEventCb, void*)
+{
+}
+
 void ua_ui_window_properties_set_input_cb_and_ctx(UAUiWindowProperties* u_properties, UAUiWindowInputEventCb cb, void* ctx)
 {
     auto properties = uams::WindowProperties::from_u_window_properties(u_properties);

=== modified file 'src/ubuntu/application/common/mirserver/window_mirserver.cpp'
--- src/ubuntu/application/common/mirserver/window_mirserver.cpp	2014-04-04 10:38:36 +0000
+++ src/ubuntu/application/common/mirserver/window_mirserver.cpp	2014-07-24 12:27:07 +0000
@@ -43,7 +43,7 @@
 static void ua_ui_window_handle_event(UAUiWindowInputEventCb cb, void* ctx, MirEvent* mir_event)
 {
     Event ubuntu_ev;
-    auto translated_event = uaum::event_to_ubuntu_event(mir_event, ubuntu_ev);
+    auto translated_event = uaum::event_to_ubuntu_deprecated_event(mir_event, ubuntu_ev);
     if (translated_event)
         cb(ctx, &ubuntu_ev);
 }

=== modified file 'src/ubuntu/application/desktop/module_version.h'
--- src/ubuntu/application/desktop/module_version.h	2014-06-20 14:54:35 +0000
+++ src/ubuntu/application/desktop/module_version.h	2014-07-24 12:27:07 +0000
@@ -1,3 +1,3 @@
 #define MODULE_VERSION_MAJOR  2
-#define MODULE_VERSION_MINOR  1
+#define MODULE_VERSION_MINOR  2
 #define MODULE_VERSION_PATCH  0

=== modified file 'src/ubuntu/application/testbackend/module_version.h'
--- src/ubuntu/application/testbackend/module_version.h	2014-06-20 14:54:35 +0000
+++ src/ubuntu/application/testbackend/module_version.h	2014-07-24 12:27:07 +0000
@@ -1,3 +1,3 @@
 #define MODULE_VERSION_MAJOR  2
-#define MODULE_VERSION_MINOR  1
+#define MODULE_VERSION_MINOR  2
 #define MODULE_VERSION_PATCH  0

=== modified file 'src/ubuntu/application/testbackend/test_stubs.cpp'
--- src/ubuntu/application/testbackend/test_stubs.cpp	2014-05-29 14:14:31 +0000
+++ src/ubuntu/application/testbackend/test_stubs.cpp	2014-07-24 12:27:07 +0000
@@ -210,6 +210,10 @@
 {
 }
 
+void ua_ui_window_properties_set_event_cb_and_ctx(UAUiWindowProperties*, UAUiWindowEventCb, void*)
+{
+}
+
 void ua_ui_window_properties_set_dimensions(UAUiWindowProperties*, uint32_t, uint32_t)
 {
 }
@@ -243,6 +247,11 @@
     return U_STATUS_ERROR;
 }
 
+int ua_ui_window_is_focused(UAUiWindow *window)
+{
+    return 0;
+}
+
 UStatus ua_ui_window_show(UAUiWindow*)
 {
     return U_STATUS_ERROR;

=== modified file 'src/ubuntu/application/touch/hybris/ubuntu_application_api_hybris.cpp'
--- src/ubuntu/application/touch/hybris/ubuntu_application_api_hybris.cpp	2014-05-20 12:45:42 +0000
+++ src/ubuntu/application/touch/hybris/ubuntu_application_api_hybris.cpp	2014-07-24 12:27:07 +0000
@@ -92,11 +92,14 @@
 IMPLEMENT_FUNCTION1(const char*, ua_ui_window_properties_get_title, UAUiWindowProperties*);
 IMPLEMENT_VOID_FUNCTION2(ua_ui_window_properties_set_role, UAUiWindowProperties*, UAUiWindowRole);
 IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_input_cb_and_ctx, UAUiWindowProperties*, UAUiWindowInputEventCb, void*);
+IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_event_cb_and_ctx, UAUiWindowProperties*, UAUiWindowEventCb, void*);
 IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_dimensions, UAUiWindowProperties*, uint32_t, uint32_t);
 
 // UAUiWindow
 IMPLEMENT_FUNCTION2(UAUiWindow*, ua_ui_window_new_for_application_with_properties, UApplicationInstance*, UAUiWindowProperties*);
 IMPLEMENT_VOID_FUNCTION1(ua_ui_window_destroy, UAUiWindow*);
+IMPLEMENT_VOID_FUNCTION3(ua_ui_window_get_size, UAUiWindow*, uint32_t*, uint32_t*);
+IMPLEMENT_FUNCTION1(int, ua_ui_window_is_focused, UAUiWindow*);
 IMPLEMENT_FUNCTION3(UStatus, ua_ui_window_move, UAUiWindow*, uint32_t, uint32_t);
 IMPLEMENT_FUNCTION3(UStatus, ua_ui_window_resize, UAUiWindow*, uint32_t, uint32_t);
 IMPLEMENT_FUNCTION1(UStatus, ua_ui_window_hide, UAUiWindow*);

=== modified file 'src/ubuntu/application/touch/module_version.h'
--- src/ubuntu/application/touch/module_version.h	2014-06-20 14:54:35 +0000
+++ src/ubuntu/application/touch/module_version.h	2014-07-24 12:27:07 +0000
@@ -1,3 +1,3 @@
 #define MODULE_VERSION_MAJOR  2
-#define MODULE_VERSION_MINOR  1
+#define MODULE_VERSION_MINOR  2
 #define MODULE_VERSION_PATCH  0

=== modified file 'src/ubuntu/application/ubuntu_application_api.cpp'
--- src/ubuntu/application/ubuntu_application_api.cpp	2014-06-24 11:09:30 +0000
+++ src/ubuntu/application/ubuntu_application_api.cpp	2014-07-24 12:27:07 +0000
@@ -107,12 +107,14 @@
 IMPLEMENT_FUNCTION1(const char*, ua_ui_window_properties_get_title, UAUiWindowProperties*);
 IMPLEMENT_VOID_FUNCTION2(ua_ui_window_properties_set_role, UAUiWindowProperties*, UAUiWindowRole);
 IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_input_cb_and_ctx, UAUiWindowProperties*, UAUiWindowInputEventCb, void*);
+IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_event_cb_and_ctx, UAUiWindowProperties*, UAUiWindowEventCb, void*);
 IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_dimensions, UAUiWindowProperties*, uint32_t, uint32_t);
 
 // UAUiWindow
 IMPLEMENT_FUNCTION2(UAUiWindow*, ua_ui_window_new_for_application_with_properties, UApplicationInstance*, UAUiWindowProperties*);
 IMPLEMENT_VOID_FUNCTION1(ua_ui_window_destroy, UAUiWindow*);
 IMPLEMENT_VOID_FUNCTION3(ua_ui_window_get_size, UAUiWindow*, uint32_t*, uint32_t*);
+IMPLEMENT_FUNCTION1(int, ua_ui_window_is_focused, UAUiWindow*);
 IMPLEMENT_FUNCTION3(UStatus, ua_ui_window_move, UAUiWindow*, uint32_t, uint32_t);
 IMPLEMENT_FUNCTION3(UStatus, ua_ui_window_resize, UAUiWindow*, uint32_t, uint32_t);
 IMPLEMENT_FUNCTION1(UStatus, ua_ui_window_hide, UAUiWindow*);