Mir

Merge lp:~alan-griffiths/mir/reboot-0.26.3-release into lp:~mir-team/mir/0.26-old

Proposed by Alan Griffiths on 2017-05-26
Status: Merged
Approved by: Gerry Boland on 2017-05-26
Approved revision: 4069
Merged at revision: 4066
Proposed branch: lp:~alan-griffiths/mir/reboot-0.26.3-release
Merge into: lp:~mir-team/mir/0.26-old
Diff against target: 398 lines (+72/-44)
11 files modified
debian/control (+2/-2)
debian/rules (+1/-1)
include/client/mir/event_printer.h (+5/-5)
include/client/mir/events/event_builders.h (+10/-10)
include/client/mir_toolkit/client_types.h (+2/-6)
include/client/mir_toolkit/events/keymap_event.h (+1/-1)
include/client/mir_toolkit/events/surface_event.h (+1/-1)
include/client/mir_toolkit/rs/mir_render_surface.h (+46/-11)
include/core/mir_toolkit/deprecations.h (+2/-2)
src/common/events/input_configuration_event.cpp (+1/-3)
src/include/common/mir/events/input_configuration_event.h (+1/-2)
To merge this branch: bzr merge lp:~alan-griffiths/mir/reboot-0.26.3-release
Reviewer Review Type Date Requested Status
Gerry Boland (community) 2017-05-26 Approve on 2017-05-26
Review via email: mp+324662@code.launchpad.net

This proposal supersedes a proposal from 2017-05-26.

Commit message

Restore platforms that are unsupported in xenial, add support for building downstreams on, and re-sync deprecation macros with current development.

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2017-05-08 11:05:10 +0000
+++ debian/control 2017-05-26 09:20:39 +0000
@@ -24,8 +24,8 @@
24 libprotobuf-dev,24 libprotobuf-dev,
25 pkg-config,25 pkg-config,
26 android-headers-23,26 android-headers-23,
27 libhardware-dev [i386 amd64 armhf],27 libhardware-dev [i386 amd64 armhf arm64],
28 libandroid-properties-dev [i386 amd64 armhf],28 libandroid-properties-dev [i386 amd64 armhf arm64],
29 libgoogle-glog-dev,29 libgoogle-glog-dev,
30 liblttng-ust-dev,30 liblttng-ust-dev,
31 libxkbcommon-dev (>= 0.5),31 libxkbcommon-dev (>= 0.5),
3232
=== modified file 'debian/rules'
--- debian/rules 2017-05-08 09:48:26 +0000
+++ debian/rules 2017-05-26 09:20:39 +0000
@@ -34,7 +34,7 @@
34endif34endif
3535
36override_dh_auto_configure:36override_dh_auto_configure:
37ifneq ($(filter armhf,$(DEB_HOST_ARCH)),)37ifneq ($(filter armhf arm64,$(DEB_HOST_ARCH)),)
38 dh_auto_configure -- \38 dh_auto_configure -- \
39 $(COMMON_CONFIGURE_OPTIONS) \39 $(COMMON_CONFIGURE_OPTIONS) \
40 -DMIR_RUN_ACCEPTANCE_TESTS=OFF \40 -DMIR_RUN_ACCEPTANCE_TESTS=OFF \
4141
=== modified file 'include/client/mir/event_printer.h'
--- include/client/mir/event_printer.h 2017-01-19 05:30:03 +0000
+++ include/client/mir/event_printer.h 2017-05-26 09:20:39 +0000
@@ -35,19 +35,19 @@
35std::ostream& operator<<(std::ostream& out, MirOrientation orientation);35std::ostream& operator<<(std::ostream& out, MirOrientation orientation);
3636
37std::ostream& operator<<(std::ostream& out, MirSurfaceAttrib attribute)37std::ostream& operator<<(std::ostream& out, MirSurfaceAttrib attribute)
38__attribute__ ((deprecated("use << with MirWindowAttrib instead")));38MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowAttrib instead");
39std::ostream& operator<<(std::ostream& out, MirWindowAttrib attribute);39std::ostream& operator<<(std::ostream& out, MirWindowAttrib attribute);
40std::ostream& operator<<(std::ostream& out, MirSurfaceFocusState state)40std::ostream& operator<<(std::ostream& out, MirSurfaceFocusState state)
41__attribute__ ((deprecated("use << with MirWindowFocusState instead")));41MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowFocusState instead");
42std::ostream& operator<<(std::ostream& out, MirWindowFocusState state);42std::ostream& operator<<(std::ostream& out, MirWindowFocusState state);
43std::ostream& operator<<(std::ostream& out, MirSurfaceVisibility state)43std::ostream& operator<<(std::ostream& out, MirSurfaceVisibility state)
44__attribute__ ((deprecated("use << with MirWindowVisibility instead")));44MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowVisibility instead");
45std::ostream& operator<<(std::ostream& out, MirWindowVisibility state);45std::ostream& operator<<(std::ostream& out, MirWindowVisibility state);
46std::ostream& operator<<(std::ostream& out, MirSurfaceType type)46std::ostream& operator<<(std::ostream& out, MirSurfaceType type)
47__attribute__ ((deprecated("use << with MirWindowType instead")));47MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowType instead");
48std::ostream& operator<<(std::ostream& out, MirWindowType type);48std::ostream& operator<<(std::ostream& out, MirWindowType type);
49std::ostream& operator<<(std::ostream& out, MirSurfaceState state)49std::ostream& operator<<(std::ostream& out, MirSurfaceState state)
50__attribute__ ((deprecated("use << with MirWindowState instead")));50MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowState instead");
51std::ostream& operator<<(std::ostream& out, MirWindowState state);51std::ostream& operator<<(std::ostream& out, MirWindowState state);
5252
53std::ostream& operator<<(std::ostream& out, MirPromptSessionEvent const& event);53std::ostream& operator<<(std::ostream& out, MirPromptSessionEvent const& event);
5454
=== modified file 'include/client/mir/events/event_builders.h'
--- include/client/mir/events/event_builders.h 2017-01-19 05:30:03 +0000
+++ include/client/mir/events/event_builders.h 2017-05-26 09:20:39 +0000
@@ -48,7 +48,7 @@
48EventUPtr make_event(frontend::SurfaceId const& surface_id, geometry::Size const& size);48EventUPtr make_event(frontend::SurfaceId const& surface_id, geometry::Size const& size);
49// Surface configure event49// Surface configure event
50EventUPtr make_event(frontend::SurfaceId const& surface_id, MirSurfaceAttrib attribute, int value)50EventUPtr make_event(frontend::SurfaceId const& surface_id, MirSurfaceAttrib attribute, int value)
51__attribute__ ((deprecated("use make_event with MirWindowAttribute instead")));51MIR_FOR_REMOVAL_IN_VERSION_1("use make_event with MirWindowAttribute instead");
52// Window configure event52// Window configure event
53EventUPtr make_event(frontend::SurfaceId const& surface_id, MirWindowAttrib attribute, int value);53EventUPtr make_event(frontend::SurfaceId const& surface_id, MirWindowAttrib attribute, int value);
54// Close surface event54// Close surface event
@@ -81,12 +81,12 @@
81// Deprecated version with uint64_t mac81// Deprecated version with uint64_t mac
82EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,82EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
83 uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,83 uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
84 int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));84 int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
8585
86// Deprecated version without mac86// Deprecated version without mac
87EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,87EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
88 MirKeyboardAction action, xkb_keysym_t key_code,88 MirKeyboardAction action, xkb_keysym_t key_code,
89 int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));89 int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
9090
91// Touch event91// Touch event
92EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,92EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
@@ -94,11 +94,11 @@
9494
95// Deprecated version with uint64_t mac95// Deprecated version with uint64_t mac
96EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,96EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
97 uint64_t mac, MirInputEventModifiers modifiers) __attribute__ ((deprecated));97 uint64_t mac, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
9898
99// Deprecated version without mac99// Deprecated version without mac
100EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,100EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
101 MirInputEventModifiers modifiers) __attribute__ ((deprecated));101 MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
102102
103void add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,103void add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
104 MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,104 MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,
@@ -110,14 +110,14 @@
110 uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,110 uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
111 MirPointerButtons buttons_pressed,111 MirPointerButtons buttons_pressed,
112 float x_axis_value, float y_axis_value,112 float x_axis_value, float y_axis_value,
113 float hscroll_value, float vscroll_value) __attribute__ ((deprecated));113 float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
114114
115// Deprecated version without relative axis and mac115// Deprecated version without relative axis and mac
116EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,116EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
117 MirInputEventModifiers modifiers, MirPointerAction action,117 MirInputEventModifiers modifiers, MirPointerAction action,
118 MirPointerButtons buttons_pressed,118 MirPointerButtons buttons_pressed,
119 float x_axis_value, float y_axis_value,119 float x_axis_value, float y_axis_value,
120 float hscroll_value, float vscroll_value) __attribute__ ((deprecated));120 float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
121121
122EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,122EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
123 std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers, MirPointerAction action,123 std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers, MirPointerAction action,
@@ -132,7 +132,7 @@
132 MirPointerButtons buttons_pressed,132 MirPointerButtons buttons_pressed,
133 float x_axis_value, float y_axis_value,133 float x_axis_value, float y_axis_value,
134 float hscroll_value, float vscroll_value,134 float hscroll_value, float vscroll_value,
135 float relative_x_value, float relative_y_value) __attribute__ ((deprecated));135 float relative_x_value, float relative_y_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
136136
137// Deprecated version without mac137// Deprecated version without mac
138EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,138EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
@@ -140,11 +140,11 @@
140 MirPointerButtons buttons_pressed,140 MirPointerButtons buttons_pressed,
141 float x_axis_value, float y_axis_value,141 float x_axis_value, float y_axis_value,
142 float hscroll_value, float vscroll_value,142 float hscroll_value, float vscroll_value,
143 float relative_x_value, float relative_y_value) __attribute__ ((deprecated));143 float relative_x_value, float relative_y_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
144144
145// Input configuration event145// Input configuration event
146EventUPtr make_event(MirInputConfigurationAction action,146EventUPtr make_event(MirInputConfigurationAction action,
147 MirInputDeviceId id, std::chrono::nanoseconds time) __attribute__((deprecated));147 MirInputDeviceId id, std::chrono::nanoseconds time) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
148148
149EventUPtr make_event(std::chrono::nanoseconds timestamp,149EventUPtr make_event(std::chrono::nanoseconds timestamp,
150 MirPointerButtons pointer_buttons,150 MirPointerButtons pointer_buttons,
151151
=== modified file 'include/client/mir_toolkit/client_types.h'
--- include/client/mir_toolkit/client_types.h 2017-04-24 13:11:01 +0000
+++ include/client/mir_toolkit/client_types.h 2017-05-26 09:20:39 +0000
@@ -54,8 +54,7 @@
54typedef struct MirError MirError;54typedef struct MirError MirError;
55typedef struct MirPresentationChain MirPresentationChain;55typedef struct MirPresentationChain MirPresentationChain;
56typedef struct MirBuffer MirBuffer;56typedef struct MirBuffer MirBuffer;
57typedef struct MirRenderSurface MirRenderSurface57typedef struct MirRenderSurface MirRenderSurface;
58MIR_FOR_REMOVAL_IN_VERSION_1("This type is slated for rename due to MirRenderSurface-->MirSurface transition");
5958
60/**59/**
61 * Descriptor for an output connection.60 * Descriptor for an output connection.
@@ -202,7 +201,7 @@
202 * use the value mir_display_output_id_invalid.201 * use the value mir_display_output_id_invalid.
203 */202 */
204 uint32_t output_id;203 uint32_t output_id;
205} MirSurfaceParameters MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowParameters instead");204} MirSurfaceParameters MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_get apis or listen for attribute events instead");
206205
207enum { mir_platform_package_max = 32 };206enum { mir_platform_package_max = 32 };
208207
@@ -556,9 +555,6 @@
556 MirSurface* surface, MirPersistentId* id, void* context)555 MirSurface* surface, MirPersistentId* id, void* context)
557MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowIdCallback instead");556MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowIdCallback instead");
558557
559typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
560MIR_FOR_REMOVAL_IN_VERSION_1("This type is slated for rename due to MirRenderSurface-->MirSurface transition");
561
562typedef MirSurfaceParameters MirWindowParameters;558typedef MirSurfaceParameters MirWindowParameters;
563559
564#pragma GCC diagnostic pop560#pragma GCC diagnostic pop
565561
=== modified file 'include/client/mir_toolkit/events/keymap_event.h'
--- include/client/mir_toolkit/events/keymap_event.h 2017-01-18 02:29:37 +0000
+++ include/client/mir_toolkit/events/keymap_event.h 2017-05-26 09:20:39 +0000
@@ -42,7 +42,7 @@
42 */42 */
43void mir_keymap_event_get_rules(MirKeymapEvent const* ev,43void mir_keymap_event_get_rules(MirKeymapEvent const* ev,
44 struct xkb_rule_names* rules)44 struct xkb_rule_names* rules)
45 __attribute__ ((deprecated));45MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_keymap_event_get_keymap_buffer() instead");
4646
47/**47/**
48 * Retrieve the new keymap reported by this MirKeymapEvent48 * Retrieve the new keymap reported by this MirKeymapEvent
4949
=== modified file 'include/client/mir_toolkit/events/surface_event.h'
--- include/client/mir_toolkit/events/surface_event.h 2017-04-24 12:52:42 +0000
+++ include/client/mir_toolkit/events/surface_event.h 2017-05-26 09:20:39 +0000
@@ -49,7 +49,7 @@
49 * \return The associated attribute value49 * \return The associated attribute value
50 */50 */
51int mir_surface_event_get_attribute_value(MirSurfaceEvent const* event)51int mir_surface_event_get_attribute_value(MirSurfaceEvent const* event)
52MIR_FOR_REMOVAL_IN_VERSION_1("use make_event with mir_window_event_get_attribute_value instead");52MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_event_get_attribute_value with MirWindowEvent instead");
53#pragma GCC diagnostic pop53#pragma GCC diagnostic pop
5454
55#ifdef __cplusplus55#ifdef __cplusplus
5656
=== modified file 'include/client/mir_toolkit/rs/mir_render_surface.h'
--- include/client/mir_toolkit/rs/mir_render_surface.h 2017-04-24 12:52:42 +0000
+++ include/client/mir_toolkit/rs/mir_render_surface.h 2017-05-26 09:20:39 +0000
@@ -23,6 +23,17 @@
23#include <mir_toolkit/client_types.h>23#include <mir_toolkit/client_types.h>
24#include <mir_toolkit/deprecations.h>24#include <mir_toolkit/deprecations.h>
2525
26#ifndef MIR_DEPRECATE_RENDERSURFACES
27 #define MIR_DEPRECATE_RENDERSURFACES 0
28#endif
29
30#if MIR_ENABLE_DEPRECATIONS > 0 && MIR_DEPRECATE_RENDERSURFACES > 0
31 #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME\
32 __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")))
33#else
34 #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME
35#endif
36
26#ifdef __cplusplus37#ifdef __cplusplus
27/**38/**
28 * \addtogroup mir_toolkit39 * \addtogroup mir_toolkit
@@ -31,6 +42,9 @@
31extern "C" {42extern "C" {
32#endif43#endif
3344
45typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
46MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
47
34#pragma GCC diagnostic push48#pragma GCC diagnostic push
35#pragma GCC diagnostic ignored "-Wdeprecated-declarations"49#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
36/**50/**
@@ -50,7 +64,7 @@
50 int width, int height,64 int width, int height,
51 MirRenderSurfaceCallback callback,65 MirRenderSurfaceCallback callback,
52 void* context)66 void* context)
53MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");67MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
5468
55/**69/**
56 * Create a render surface and wait for the result70 * Create a render surface and wait for the result
@@ -65,7 +79,7 @@
65MirRenderSurface* mir_connection_create_render_surface_sync(79MirRenderSurface* mir_connection_create_render_surface_sync(
66 MirConnection* connection,80 MirConnection* connection,
67 int width, int height)81 int width, int height)
68MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");82MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
6983
70/**84/**
71 * Get the size of the MirRenderSurface85 * Get the size of the MirRenderSurface
@@ -77,7 +91,7 @@
77void mir_render_surface_get_size(91void mir_render_surface_get_size(
78 MirRenderSurface* render_surface,92 MirRenderSurface* render_surface,
79 int* width, int* height)93 int* width, int* height)
80MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");94MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
8195
82/**96/**
83 * Set the size of the MirRenderSurface97 * Set the size of the MirRenderSurface
@@ -89,7 +103,7 @@
89void mir_render_surface_set_size(103void mir_render_surface_set_size(
90 MirRenderSurface* render_surface,104 MirRenderSurface* render_surface,
91 int width, int height)105 int width, int height)
92MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");106MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
93107
94/**108/**
95 * Test for a valid render surface109 * Test for a valid render surface
@@ -101,8 +115,7 @@
101 */115 */
102bool mir_render_surface_is_valid(116bool mir_render_surface_is_valid(
103 MirRenderSurface* render_surface)117 MirRenderSurface* render_surface)
104MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");118MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
105
106/**119/**
107 * Retrieve a text description of the error. The returned string is owned by120 * Retrieve a text description of the error. The returned string is owned by
108 * the library and remains valid until the render surface or the associated121 * the library and remains valid until the render surface or the associated
@@ -114,7 +127,7 @@
114 */127 */
115char const *mir_render_surface_get_error_message(128char const *mir_render_surface_get_error_message(
116 MirRenderSurface* render_surface)129 MirRenderSurface* render_surface)
117MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");130MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
118131
119/**132/**
120 * Release the specified render surface133 * Release the specified render surface
@@ -123,7 +136,7 @@
123 */136 */
124void mir_render_surface_release(137void mir_render_surface_release(
125 MirRenderSurface* render_surface)138 MirRenderSurface* render_surface)
126MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");139MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
127140
128/**141/**
129 * Obtain the buffer stream backing a given render surface.142 * Obtain the buffer stream backing a given render surface.
@@ -143,7 +156,7 @@
143 MirRenderSurface* render_surface,156 MirRenderSurface* render_surface,
144 int width, int height,157 int width, int height,
145 MirPixelFormat format)158 MirPixelFormat format)
146MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");159MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
147160
148/**161/**
149 * Obtain the presentation chain backing a given render surface.162 * Obtain the presentation chain backing a given render surface.
@@ -156,7 +169,7 @@
156 */169 */
157MirPresentationChain* mir_render_surface_get_presentation_chain(170MirPresentationChain* mir_render_surface_get_presentation_chain(
158 MirRenderSurface* render_surface)171 MirRenderSurface* render_surface)
159MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");172MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
160173
161/** Query whether the server supports a given presentation mode.174/** Query whether the server supports a given presentation mode.
162 *175 *
@@ -190,7 +203,29 @@
190 MirWindowSpec* spec,203 MirWindowSpec* spec,
191 MirRenderSurface* render_surface,204 MirRenderSurface* render_surface,
192 int hotspot_x, int hotspot_y)205 int hotspot_x, int hotspot_y)
193MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");206MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
207
208/**
209 * Set the MirWindowSpec to display content contained in a render surface
210 *
211 * \warning: The initial call to mir_window_spec_add_render_surface will set
212 * the bottom-most content, and subsequent calls will stack the
213 * content on top.
214 *
215 * \param spec The window_spec to be updated
216 * \param render_surface The render surface containing the content to be displayed
217 * \param logical_width The width that the content will be displayed at
218 * (Ignored for buffer streams)
219 * \param logical_height The height that the content will be displayed at
220 * (Ignored for buffer streams)
221 * \param displacement_x The x displacement from the top-left corner of the MirWindow
222 * \param displacement_y The y displacement from the top-left corner of the MirWindow
223 */
224void mir_window_spec_add_render_surface(MirWindowSpec* spec,
225 MirRenderSurface* render_surface,
226 int logical_width, int logical_height,
227 int displacement_x, int displacement_y)
228MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
194229
195#pragma GCC diagnostic pop230#pragma GCC diagnostic pop
196231
197232
=== modified file 'include/core/mir_toolkit/deprecations.h'
--- include/core/mir_toolkit/deprecations.h 2017-04-25 09:32:01 +0000
+++ include/core/mir_toolkit/deprecations.h 2017-05-26 09:20:39 +0000
@@ -18,8 +18,8 @@
18#define MIR_DEPRECATIONS_H_18#define MIR_DEPRECATIONS_H_
1919
20#ifndef MIR_ENABLE_DEPRECATIONS20#ifndef MIR_ENABLE_DEPRECATIONS
21 // use __GNUC__ < 6 as a proxy for building on Ubunutu 16.04LTS ("Xenial")21 // use g++ version < 6.2 as a proxy for building on Ubunutu 16.04LTS ("Xenial") or 16.10 (Yakkety)
22 #if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ >= 6)22 #if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ > 6) || ((__GNUC__ == 6) && (__GNUC_MINOR__ >= 2))
23 #define MIR_ENABLE_DEPRECATIONS 123 #define MIR_ENABLE_DEPRECATIONS 1
24 #else24 #else
25 #define MIR_ENABLE_DEPRECATIONS 025 #define MIR_ENABLE_DEPRECATIONS 0
2626
=== modified file 'src/common/events/input_configuration_event.cpp'
--- src/common/events/input_configuration_event.cpp 2017-01-20 16:27:50 +0000
+++ src/common/events/input_configuration_event.cpp 2017-05-26 09:20:39 +0000
@@ -18,13 +18,12 @@
1818
19#include "mir/events/input_configuration_event.h"19#include "mir/events/input_configuration_event.h"
2020
21#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
21MirInputConfigurationEvent::MirInputConfigurationEvent()22MirInputConfigurationEvent::MirInputConfigurationEvent()
22{23{
23 event.initInputConfiguration();24 event.initInputConfiguration();
24}25}
2526
26#pragma GCC diagnostic push
27#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
28MirInputConfigurationAction MirInputConfigurationEvent::action() const27MirInputConfigurationAction MirInputConfigurationEvent::action() const
29{28{
30 return static_cast<MirInputConfigurationAction>(event.asReader().getInputConfiguration().getAction());29 return static_cast<MirInputConfigurationAction>(event.asReader().getInputConfiguration().getAction());
@@ -34,7 +33,6 @@
34{33{
35 event.getInputConfiguration().setAction(static_cast<mir::capnp::InputConfigurationEvent::Action>(action));34 event.getInputConfiguration().setAction(static_cast<mir::capnp::InputConfigurationEvent::Action>(action));
36}35}
37#pragma GCC diagnostic pop
3836
39std::chrono::nanoseconds MirInputConfigurationEvent::when() const37std::chrono::nanoseconds MirInputConfigurationEvent::when() const
40{38{
4139
=== modified file 'src/include/common/mir/events/input_configuration_event.h'
--- src/include/common/mir/events/input_configuration_event.h 2017-01-20 16:27:50 +0000
+++ src/include/common/mir/events/input_configuration_event.h 2017-05-26 09:20:39 +0000
@@ -37,8 +37,7 @@
3737
38 MirInputDeviceId id() const;38 MirInputDeviceId id() const;
39 void set_id(MirInputDeviceId id);39 void set_id(MirInputDeviceId id);
40}40};
41 __attribute__((deprecated));
42#pragma GCC diagnostic pop41#pragma GCC diagnostic pop
4342
44#endif /* MIR_COMMON_INPUT_CONFIGURATION_EVENT_H_ */43#endif /* MIR_COMMON_INPUT_CONFIGURATION_EVENT_H_ */

Subscribers

People subscribed via source and target branches