1
=== modified file 'include/client/mir/event_printer.h'
2
--- include/client/mir/event_printer.h	2017-05-08 03:04:26 +0000
3
+++ include/client/mir/event_printer.h	2017-05-18 11:24:43 +0000
4
@@ -35,19 +35,19 @@
5
35
std::ostream& operator<<(std::ostream& out, MirOrientation orientation);
35
std::ostream& operator<<(std::ostream& out, MirOrientation orientation);
6
36
36
7
37
std::ostream& operator<<(std::ostream& out, MirSurfaceAttrib attribute)
37
std::ostream& operator<<(std::ostream& out, MirSurfaceAttrib attribute)
9
38
__attribute__ ((deprecated("use << with MirWindowAttrib instead")));
38
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowAttrib instead");
10
39
std::ostream& operator<<(std::ostream& out, MirWindowAttrib attribute);
39
std::ostream& operator<<(std::ostream& out, MirWindowAttrib attribute);
11
40
std::ostream& operator<<(std::ostream& out, MirSurfaceFocusState state)
40
std::ostream& operator<<(std::ostream& out, MirSurfaceFocusState state)
13
41
__attribute__ ((deprecated("use << with MirWindowFocusState instead")));
41
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowFocusState instead");
14
42
std::ostream& operator<<(std::ostream& out, MirWindowFocusState state);
42
std::ostream& operator<<(std::ostream& out, MirWindowFocusState state);
15
43
std::ostream& operator<<(std::ostream& out, MirSurfaceVisibility state)
43
std::ostream& operator<<(std::ostream& out, MirSurfaceVisibility state)
17
44
__attribute__ ((deprecated("use << with MirWindowVisibility instead")));
44
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowVisibility instead");
18
45
std::ostream& operator<<(std::ostream& out, MirWindowVisibility state);
45
std::ostream& operator<<(std::ostream& out, MirWindowVisibility state);
19
46
std::ostream& operator<<(std::ostream& out, MirSurfaceType type)
46
std::ostream& operator<<(std::ostream& out, MirSurfaceType type)
21
47
__attribute__ ((deprecated("use << with MirWindowType instead")));
47
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowType instead");
22
48
std::ostream& operator<<(std::ostream& out, MirWindowType type);
48
std::ostream& operator<<(std::ostream& out, MirWindowType type);
23
49
std::ostream& operator<<(std::ostream& out, MirSurfaceState state)
49
std::ostream& operator<<(std::ostream& out, MirSurfaceState state)
25
50
__attribute__ ((deprecated("use << with MirWindowState instead")));
50
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowState instead");
26
51
std::ostream& operator<<(std::ostream& out, MirWindowState state);
51
std::ostream& operator<<(std::ostream& out, MirWindowState state);
27
52
52
28
53
std::ostream& operator<<(std::ostream& out, MirPromptSessionEvent const& event);
53
std::ostream& operator<<(std::ostream& out, MirPromptSessionEvent const& event);
29
54
54
30
=== modified file 'include/client/mir/events/event_builders.h'
31
--- include/client/mir/events/event_builders.h	2017-05-08 03:04:26 +0000
32
+++ include/client/mir/events/event_builders.h	2017-05-18 11:24:43 +0000
33
@@ -48,7 +48,7 @@
34
48
EventUPtr make_event(frontend::SurfaceId const& surface_id, geometry::Size const& size);
48
EventUPtr make_event(frontend::SurfaceId const& surface_id, geometry::Size const& size);
35
49
// Surface configure event
49
// Surface configure event
36
50
EventUPtr make_event(frontend::SurfaceId const& surface_id, MirSurfaceAttrib attribute, int value)
50
EventUPtr make_event(frontend::SurfaceId const& surface_id, MirSurfaceAttrib attribute, int value)
38
51
__attribute__ ((deprecated("use make_event with MirWindowAttribute instead")));
51
MIR_FOR_REMOVAL_IN_VERSION_1("use make_event with MirWindowAttribute instead");
39
52
// Window configure event
52
// Window configure event
40
53
EventUPtr make_event(frontend::SurfaceId const& surface_id, MirWindowAttrib attribute, int value);
53
EventUPtr make_event(frontend::SurfaceId const& surface_id, MirWindowAttrib attribute, int value);
41
54
// Close surface event
54
// Close surface event
42
@@ -81,12 +81,12 @@
43
81
// Deprecated version with uint64_t mac
81
// Deprecated version with uint64_t mac
44
82
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
82
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
45
83
    uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
83
    uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
47
84
    int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
84
    int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
48
85
85
49
86
// Deprecated version without mac
86
// Deprecated version without mac
50
87
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
87
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
51
88
    MirKeyboardAction action, xkb_keysym_t key_code,
88
    MirKeyboardAction action, xkb_keysym_t key_code,
53
89
    int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
89
    int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
54
90
90
55
91
// Touch event
91
// Touch event
56
92
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
92
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
57
@@ -94,11 +94,11 @@
58
94
94
59
95
// Deprecated version with uint64_t mac
95
// Deprecated version with uint64_t mac
60
96
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
96
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
62
97
    uint64_t mac, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
97
    uint64_t mac, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
63
98
98
64
99
// Deprecated version without mac
99
// Deprecated version without mac
65
100
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
100
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
67
101
    MirInputEventModifiers modifiers) __attribute__ ((deprecated));
101
    MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
68
102
102
69
103
void add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
103
void add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
70
104
    MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,
104
    MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,
71
@@ -110,14 +110,14 @@
72
110
    uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
110
    uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
73
111
    MirPointerButtons buttons_pressed,
111
    MirPointerButtons buttons_pressed,
74
112
    float x_axis_value, float y_axis_value,
112
    float x_axis_value, float y_axis_value,
76
113
    float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
113
    float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
77
114
114
78
115
// Deprecated version without relative axis and mac
115
// Deprecated version without relative axis and mac
79
116
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
116
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
80
117
    MirInputEventModifiers modifiers, MirPointerAction action,
117
    MirInputEventModifiers modifiers, MirPointerAction action,
81
118
    MirPointerButtons buttons_pressed,
118
    MirPointerButtons buttons_pressed,
82
119
    float x_axis_value, float y_axis_value,
119
    float x_axis_value, float y_axis_value,
84
120
    float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
120
    float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
85
121
121
86
122
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
122
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
87
123
    std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers, MirPointerAction action,
123
    std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers, MirPointerAction action,
88
@@ -132,7 +132,7 @@
89
132
    MirPointerButtons buttons_pressed,
132
    MirPointerButtons buttons_pressed,
90
133
    float x_axis_value, float y_axis_value,
133
    float x_axis_value, float y_axis_value,
91
134
    float hscroll_value, float vscroll_value,
134
    float hscroll_value, float vscroll_value,
93
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");
94
136
136
95
137
// Deprecated version without mac
137
// Deprecated version without mac
96
138
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
138
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
97
@@ -140,11 +140,11 @@
98
140
    MirPointerButtons buttons_pressed,
140
    MirPointerButtons buttons_pressed,
99
141
    float x_axis_value, float y_axis_value,
141
    float x_axis_value, float y_axis_value,
100
142
    float hscroll_value, float vscroll_value,
142
    float hscroll_value, float vscroll_value,
102
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");
103
144
144
104
145
// Input configuration event
145
// Input configuration event
105
146
EventUPtr make_event(MirInputConfigurationAction action,
146
EventUPtr make_event(MirInputConfigurationAction action,
107
147
    MirInputDeviceId id, std::chrono::nanoseconds time) __attribute__((deprecated));
147
    MirInputDeviceId id, std::chrono::nanoseconds time) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
108
148
148
109
149
EventUPtr make_event(std::chrono::nanoseconds timestamp,
149
EventUPtr make_event(std::chrono::nanoseconds timestamp,
110
150
                     MirPointerButtons pointer_buttons,
150
                     MirPointerButtons pointer_buttons,
111
151
151
112
=== modified file 'include/client/mir_toolkit/client_types.h'
113
--- include/client/mir_toolkit/client_types.h	2017-05-08 03:04:26 +0000
114
+++ include/client/mir_toolkit/client_types.h	2017-05-18 11:24:43 +0000
115
@@ -23,6 +23,7 @@
116
23
23
117
24
#include <mir_toolkit/events/event.h>
24
#include <mir_toolkit/events/event.h>
118
25
#include <mir_toolkit/common.h>
25
#include <mir_toolkit/common.h>
119
26
#include <mir_toolkit/deprecations.h>
120
26
27
121
27
#include <stddef.h>
28
#include <stddef.h>
122
28
29
123
@@ -38,30 +39,29 @@
124
38
typedef void* MirEGLNativeWindowType;
39
typedef void* MirEGLNativeWindowType;
125
39
typedef void* MirEGLNativeDisplayType;
40
typedef void* MirEGLNativeDisplayType;
126
40
typedef struct MirConnection MirConnection;
41
typedef struct MirConnection MirConnection;
128
41
typedef struct MirSurface MirSurface __attribute__((deprecated("Use MirWindow instead")));
42
typedef struct MirSurface MirSurface MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindow instead");
129
42
typedef struct MirSurface MirWindow;
43
typedef struct MirSurface MirWindow;
131
43
typedef struct MirSurfaceSpec MirSurfaceSpec __attribute__((deprecated("Use MirWindowSpec instead")));
44
typedef struct MirSurfaceSpec MirSurfaceSpec MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowSpec instead");
132
44
typedef struct MirSurfaceSpec MirWindowSpec;
45
typedef struct MirSurfaceSpec MirWindowSpec;
133
45
typedef struct MirScreencast MirScreencast;
46
typedef struct MirScreencast MirScreencast;
134
46
typedef struct MirScreencastSpec MirScreencastSpec;
47
typedef struct MirScreencastSpec MirScreencastSpec;
135
47
typedef struct MirPromptSession MirPromptSession;
48
typedef struct MirPromptSession MirPromptSession;
136
48
typedef struct MirBufferStream MirBufferStream;
49
typedef struct MirBufferStream MirBufferStream;
138
49
typedef struct MirPersistentId MirPersistentId __attribute((deprecated("Use MirWindowId instead")));
50
typedef struct MirPersistentId MirPersistentId MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowId instead");
139
50
typedef struct MirPersistentId MirWindowId;
51
typedef struct MirPersistentId MirWindowId;
140
51
typedef struct MirBlob MirBlob;
52
typedef struct MirBlob MirBlob;
141
52
typedef struct MirDisplayConfig MirDisplayConfig;
53
typedef struct MirDisplayConfig MirDisplayConfig;
142
53
typedef struct MirError MirError;
54
typedef struct MirError MirError;
143
54
typedef struct MirPresentationChain MirPresentationChain;
55
typedef struct MirPresentationChain MirPresentationChain;
144
55
typedef struct MirBuffer MirBuffer;
56
typedef struct MirBuffer MirBuffer;
147
56
typedef struct MirRenderSurface MirRenderSurface
57
typedef struct MirRenderSurface MirRenderSurface;
146
57
__attribute__((deprecated("This type is slated for rename due to MirRenderSurface-->MirSurface transition")));
148
58
58
149
59
/**
59
/**
150
60
 * Opaque structure containing cursor parameterization. Create with mir_cursor* family.
60
 * Opaque structure containing cursor parameterization. Create with mir_cursor* family.
151
61
 * Used with mir_window_configure_cursor.
61
 * Used with mir_window_configure_cursor.
152
62
 */
62
 */
153
63
typedef struct MirCursorConfiguration MirCursorConfiguration
63
typedef struct MirCursorConfiguration MirCursorConfiguration
155
64
    __attribute__((deprecated("Use mir_window_spec_set_cursor_name/mir_window_spec_set_cursor_render_surface instead")));
64
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_set_cursor_name/mir_window_spec_set_cursor_render_surface instead");
156
65
65
157
66
/**
66
/**
158
67
 * Descriptor for an output connection.
67
 * Descriptor for an output connection.
159
@@ -89,7 +89,7 @@
160
89
typedef void (*MirConnectedCallback)(
89
typedef void (*MirConnectedCallback)(
161
90
    MirConnection *connection, void *client_context);
90
    MirConnection *connection, void *client_context);
162
91
typedef MirConnectedCallback mir_connected_callback
91
typedef MirConnectedCallback mir_connected_callback
164
92
    __attribute__((deprecated("Use MirConnectedCallback instead")));
92
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirConnectedCallback instead");
165
93
93
166
94
/**
94
/**
167
95
 * Callback to be passed when calling window functions :
95
 * Callback to be passed when calling window functions :
168
@@ -109,7 +109,7 @@
169
109
typedef void (*MirBufferStreamCallback)(
109
typedef void (*MirBufferStreamCallback)(
170
110
    MirBufferStream *stream, void *client_context);
110
    MirBufferStream *stream, void *client_context);
171
111
typedef MirBufferStreamCallback mir_buffer_stream_callback
111
typedef MirBufferStreamCallback mir_buffer_stream_callback
173
112
    __attribute__((deprecated("Use MirBufferStreamCallback instead")));
112
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirBufferStreamCallback instead");
174
113
113
175
114
/**
114
/**
176
115
 * Callback for handling of window events.
115
 * Callback for handling of window events.
177
@@ -131,7 +131,7 @@
178
131
typedef void (*MirLifecycleEventCallback)(
131
typedef void (*MirLifecycleEventCallback)(
179
132
    MirConnection* connection, MirLifecycleState state, void* context);
132
    MirConnection* connection, MirLifecycleState state, void* context);
180
133
typedef MirLifecycleEventCallback mir_lifecycle_event_callback
133
typedef MirLifecycleEventCallback mir_lifecycle_event_callback
182
134
    __attribute__((deprecated("Use MirLifecycleEventCallback instead")));
134
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirLifecycleEventCallback instead");
183
135
135
184
136
/**
136
/**
185
137
 * Callback called when the server pings for responsiveness testing.
137
 * Callback called when the server pings for responsiveness testing.
186
@@ -143,7 +143,7 @@
187
143
typedef void (*MirPingEventCallback)(
143
typedef void (*MirPingEventCallback)(
188
144
    MirConnection* connection, int32_t serial, void* context);
144
    MirConnection* connection, int32_t serial, void* context);
189
145
typedef MirPingEventCallback mir_ping_event_callback
145
typedef MirPingEventCallback mir_ping_event_callback
191
146
    __attribute__((deprecated("Use MirPingEventCallback instead")));
146
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirPingEventCallback instead");
192
147
147
193
148
/**
148
/**
194
149
 * Callback called when a display config change has occurred
149
 * Callback called when a display config change has occurred
195
@@ -154,7 +154,7 @@
196
154
typedef void (*MirDisplayConfigCallback)(
154
typedef void (*MirDisplayConfigCallback)(
197
155
    MirConnection* connection, void* context);
155
    MirConnection* connection, void* context);
198
156
typedef MirDisplayConfigCallback mir_display_config_callback
156
typedef MirDisplayConfigCallback mir_display_config_callback
200
157
    __attribute__((deprecated("Use MirDisplayConfigCallback instead")));
157
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirDisplayConfigCallback instead");
201
158
158
202
159
/**
159
/**
203
160
 * Callback called when a request for client file descriptors completes
160
 * Callback called when a request for client file descriptors completes
204
@@ -169,7 +169,7 @@
205
169
typedef void (*MirClientFdCallback)(
169
typedef void (*MirClientFdCallback)(
206
170
    MirPromptSession *prompt_session, size_t count, int const* fds, void* context);
170
    MirPromptSession *prompt_session, size_t count, int const* fds, void* context);
207
171
typedef MirClientFdCallback mir_client_fd_callback
171
typedef MirClientFdCallback mir_client_fd_callback
209
172
    __attribute__((deprecated("Use MirClientFdCallback instead")));
172
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirClientFdCallback instead");
210
173
173
211
174
#pragma GCC diagnostic push
174
#pragma GCC diagnostic push
212
175
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
175
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
213
@@ -186,7 +186,7 @@
214
186
{
186
{
215
187
    mir_buffer_usage_hardware = 1,
187
    mir_buffer_usage_hardware = 1,
216
188
    mir_buffer_usage_software
188
    mir_buffer_usage_software
218
189
} MirBufferUsage __attribute__((deprecated("No longer applicable when using MirRenderSurface")));
189
} MirBufferUsage MIR_FOR_REMOVAL_IN_VERSION_1("No longer applicable when using MirRenderSurface");
219
190
190
220
191
/**
191
/**
221
192
 * MirWindowParameters is the structure of minimum required information that
192
 * MirWindowParameters is the structure of minimum required information that
222
@@ -212,7 +212,7 @@
223
212
     * use the value mir_display_output_id_invalid.
212
     * use the value mir_display_output_id_invalid.
224
213
     */
213
     */
225
214
    uint32_t output_id;
214
    uint32_t output_id;
227
215
} MirSurfaceParameters __attribute__((deprecated("Use mir_window_get apis or listen for attribute events instead")));
215
} MirSurfaceParameters MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_get apis or listen for attribute events instead");
228
216
216
229
217
enum { mir_platform_package_max = 32 };
217
enum { mir_platform_package_max = 32 };
230
218
218
231
@@ -225,7 +225,7 @@
232
225
 * \todo This should be removed from the public API at the next API break.
225
 * \todo This should be removed from the public API at the next API break.
233
226
 */
226
 */
234
227
#ifndef __cplusplus
227
#ifndef __cplusplus
236
228
__attribute__ ((deprecated))
228
MIR_FOR_REMOVAL_IN_VERSION_1("Use of this type is inherently non-portable")
237
229
#endif
229
#endif
238
230
typedef enum MirPlatformType
230
typedef enum MirPlatformType
239
231
{
231
{
240
@@ -442,7 +442,7 @@
241
442
typedef void (*MirScreencastCallback)(
442
typedef void (*MirScreencastCallback)(
242
443
    MirScreencast *screencast, void *client_context);
443
    MirScreencast *screencast, void *client_context);
243
444
typedef MirScreencastCallback mir_screencast_callback
444
typedef MirScreencastCallback mir_screencast_callback
245
445
    __attribute__((deprecated("Use MirScreencastCallback instead")));
445
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirScreencastCallback instead");
246
446
446
247
447
/**
447
/**
248
448
 * Callback member of MirPromptSession for handling of prompt sessions.
448
 * Callback member of MirPromptSession for handling of prompt sessions.
249
@@ -452,7 +452,7 @@
250
452
typedef void (*MirPromptSessionCallback)(
452
typedef void (*MirPromptSessionCallback)(
251
453
    MirPromptSession* prompt_provider, void* context);
453
    MirPromptSession* prompt_provider, void* context);
252
454
typedef MirPromptSessionCallback mir_prompt_session_callback
454
typedef MirPromptSessionCallback mir_prompt_session_callback
254
455
    __attribute__((deprecated("Use MirPromptSessionCallback instead")));
455
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirPromptSessionCallback instead");
255
456
456
256
457
/**
457
/**
257
458
 * Callback member of MirPromptSession for handling of prompt sessions events.
458
 * Callback member of MirPromptSession for handling of prompt sessions events.
258
@@ -465,7 +465,7 @@
259
465
    void* context);
465
    void* context);
260
466
typedef MirPromptSessionStateChangeCallback
466
typedef MirPromptSessionStateChangeCallback
261
467
        mir_prompt_session_state_change_callback
467
        mir_prompt_session_state_change_callback
263
468
    __attribute__((deprecated("Use MirPromptSessionStateChangeCallback instead")));
468
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirPromptSessionStateChangeCallback instead");
264
469
469
265
470
/**
470
/**
266
471
 * Callback called when a platform operation completes.
471
 * Callback called when a platform operation completes.
267
@@ -480,7 +480,7 @@
268
480
typedef void (*MirPlatformOperationCallback)(
480
typedef void (*MirPlatformOperationCallback)(
269
481
    MirConnection* connection, MirPlatformMessage* reply, void* context);
481
    MirConnection* connection, MirPlatformMessage* reply, void* context);
270
482
typedef MirPlatformOperationCallback mir_platform_operation_callback
482
typedef MirPlatformOperationCallback mir_platform_operation_callback
272
483
    __attribute__((deprecated("Use MirPlatformOperationCallback instead")));
483
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirPlatformOperationCallback instead");
273
484
484
274
485
/**
485
/**
275
486
 * Callback called when a change of input devices has occurred
486
 * Callback called when a change of input devices has occurred
276
@@ -492,7 +492,7 @@
277
492
typedef void (*MirInputConfigCallback)(
492
typedef void (*MirInputConfigCallback)(
278
493
    MirConnection* connection, void* context);
493
    MirConnection* connection, void* context);
279
494
typedef MirInputConfigCallback mir_input_config_callback
494
typedef MirInputConfigCallback mir_input_config_callback
281
495
    __attribute__((deprecated("Use MirInputConfigCallback instead")));
495
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirInputConfigCallback instead");
282
496
496
283
497
typedef void (*MirBufferCallback)(MirBuffer*, void* context);
497
typedef void (*MirBufferCallback)(MirBuffer*, void* context);
284
498
498
285
@@ -562,27 +562,24 @@
286
562
typedef void (*MirErrorCallback)(
562
typedef void (*MirErrorCallback)(
287
563
    MirConnection* connection, MirError const* error, void* context);
563
    MirConnection* connection, MirError const* error, void* context);
288
564
typedef MirErrorCallback mir_error_callback
564
typedef MirErrorCallback mir_error_callback
290
565
    __attribute__((deprecated("Use MirErrorCallback instead")));
565
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirErrorCallback instead");
291
566
566
292
567
#pragma GCC diagnostic push
567
#pragma GCC diagnostic push
293
568
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
568
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
294
569
569
295
570
typedef void (*mir_surface_callback)(MirSurface *surface, void *client_context)
570
typedef void (*mir_surface_callback)(MirSurface *surface, void *client_context)
297
571
__attribute__((deprecated("Use MirWindowCallback instead")));
571
MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowCallback instead");
298
572
572
299
573
typedef void (*mir_surface_event_callback)(
573
typedef void (*mir_surface_event_callback)(
300
574
    MirSurface* surface, MirEvent const* event, void* context)
574
    MirSurface* surface, MirEvent const* event, void* context)
302
575
__attribute__((deprecated("Use MirWindowEventCallback instead")));
575
MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowEventCallback instead");
303
576
576
304
577
typedef void (*mir_surface_id_callback)(
577
typedef void (*mir_surface_id_callback)(
305
578
    MirSurface* surface, MirPersistentId* id, void* context)
578
    MirSurface* surface, MirPersistentId* id, void* context)
310
579
__attribute__((deprecated("Use MirWindowIdCallback instead")));
579
MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowIdCallback instead");
307
580
308
581
typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
309
582
__attribute__((deprecated("This type is slated for rename due to MirRenderSurface-->MirSurface transition")));
311
583
580
312
584
typedef MirSurfaceParameters MirWindowParameters
581
typedef MirSurfaceParameters MirWindowParameters
314
585
__attribute__((deprecated("Use mir_window_get_xxx apis or listen for attribute events instead")));
582
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_get_xxx apis or listen for attribute events instead");
315
586
583
316
587
#pragma GCC diagnostic pop
584
#pragma GCC diagnostic pop
317
588
585
318
589
586
319
=== modified file 'include/client/mir_toolkit/debug/surface.h'
320
--- include/client/mir_toolkit/debug/surface.h	2017-05-08 03:04:26 +0000
321
+++ include/client/mir_toolkit/debug/surface.h	2017-05-18 11:24:43 +0000
322
@@ -19,6 +19,7 @@
323
19
#define MIR_CLIENT_LIBRARY_DEBUG_H
19
#define MIR_CLIENT_LIBRARY_DEBUG_H
324
20
20
325
21
#include <mir_toolkit/mir_client_library.h>
21
#include <mir_toolkit/mir_client_library.h>
326
22
#include <mir_toolkit/deprecations.h>
327
22
23
328
23
/* This header defines debug interfaces that aren't expected to be generally useful
24
/* This header defines debug interfaces that aren't expected to be generally useful
329
24
 * and do not have the same API-stability guarantees that the main API has */
25
 * and do not have the same API-stability guarantees that the main API has */
330
@@ -65,13 +66,13 @@
331
65
bool mir_debug_surface_coords_to_screen(MirSurface *surface,
66
bool mir_debug_surface_coords_to_screen(MirSurface *surface,
332
66
                                       int x, int y,
67
                                       int x, int y,
333
67
                                       int* screen_x, int* screen_y)
68
                                       int* screen_x, int* screen_y)
335
68
__attribute__((deprecated("Use mir_extension_window_coordinate_translation instead")));
69
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_extension_window_coordinate_translation instead");
336
69
70
337
70
int mir_debug_surface_id(MirSurface *surface)
71
int mir_debug_surface_id(MirSurface *surface)
339
71
__attribute__((deprecated("Use mir_debug_window_id() instead")));
72
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_debug_window_id() instead");
340
72
73
341
73
uint32_t mir_debug_surface_current_buffer_id(MirSurface *surface)
74
uint32_t mir_debug_surface_current_buffer_id(MirSurface *surface)
343
74
__attribute__((deprecated("Use mir_debug_window_current_buffer_id() instead")));
75
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_debug_window_current_buffer_id() instead");
344
75
76
345
76
#pragma GCC diagnostic pop
77
#pragma GCC diagnostic pop
346
77
78
347
78
79
348
=== modified file 'include/client/mir_toolkit/events/event.h'
349
--- include/client/mir_toolkit/events/event.h	2017-05-08 03:04:26 +0000
350
+++ include/client/mir_toolkit/events/event.h	2017-05-18 11:24:43 +0000
351
@@ -22,6 +22,7 @@
352
22
#include <stddef.h>
22
#include <stddef.h>
353
23
#include <stdint.h>
23
#include <stdint.h>
354
24
#include "mir_toolkit/common.h"
24
#include "mir_toolkit/common.h"
355
25
#include <mir_toolkit/deprecations.h>
356
25
26
357
26
#ifdef __cplusplus
27
#ifdef __cplusplus
358
27
/**
28
/**
359
@@ -58,24 +59,24 @@
360
58
#pragma GCC diagnostic pop
59
#pragma GCC diagnostic pop
361
59
60
362
60
typedef struct MirSurfaceEvent MirSurfaceEvent
61
typedef struct MirSurfaceEvent MirSurfaceEvent
364
61
    __attribute__ ((deprecated("use MirWindowEvent instead")));
62
    MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowEvent instead");
365
62
typedef struct MirSurfaceEvent MirWindowEvent;
63
typedef struct MirSurfaceEvent MirWindowEvent;
366
63
typedef struct MirResizeEvent MirResizeEvent;
64
typedef struct MirResizeEvent MirResizeEvent;
367
64
typedef struct MirPromptSessionEvent MirPromptSessionEvent;
65
typedef struct MirPromptSessionEvent MirPromptSessionEvent;
368
65
typedef struct MirOrientationEvent MirOrientationEvent;
66
typedef struct MirOrientationEvent MirOrientationEvent;
369
66
typedef struct MirCloseSurfaceEvent MirCloseSurfaceEvent
67
typedef struct MirCloseSurfaceEvent MirCloseSurfaceEvent
371
67
    __attribute__ ((deprecated("use MirCloseWindowEvent instead")));
68
    MIR_FOR_REMOVAL_IN_VERSION_1("use MirCloseWindowEvent instead");
372
68
typedef struct MirCloseSurfaceEvent MirCloseWindowEvent;
69
typedef struct MirCloseSurfaceEvent MirCloseWindowEvent;
373
69
typedef struct MirInputEvent MirInputEvent;
70
typedef struct MirInputEvent MirInputEvent;
374
70
typedef struct MirKeymapEvent MirKeymapEvent;
71
typedef struct MirKeymapEvent MirKeymapEvent;
375
71
typedef struct MirInputConfigurationEvent MirInputConfigurationEvent 
72
typedef struct MirInputConfigurationEvent MirInputConfigurationEvent 
377
72
    __attribute__ ((deprecated("Use MirInputDeviceStateEvent and the MirInputConfig callback instead")));
73
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirInputDeviceStateEvent and the MirInputConfig callback instead");
378
73
typedef struct MirSurfaceOutputEvent MirSurfaceOutputEvent
74
typedef struct MirSurfaceOutputEvent MirSurfaceOutputEvent
380
74
    __attribute__ ((deprecated("use MirWindowOutputEvent instead")));
75
    MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowOutputEvent instead");
381
75
typedef struct MirSurfaceOutputEvent MirWindowOutputEvent;
76
typedef struct MirSurfaceOutputEvent MirWindowOutputEvent;
382
76
typedef struct MirInputDeviceStateEvent MirInputDeviceStateEvent;
77
typedef struct MirInputDeviceStateEvent MirInputDeviceStateEvent;
383
77
typedef struct MirSurfacePlacementEvent MirSurfacePlacementEvent
78
typedef struct MirSurfacePlacementEvent MirSurfacePlacementEvent
385
78
    __attribute__ ((deprecated("use MirWindowPlacementEvent instead")));
79
    MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowPlacementEvent instead");
386
79
typedef struct MirSurfacePlacementEvent MirWindowPlacementEvent;
80
typedef struct MirSurfacePlacementEvent MirWindowPlacementEvent;
387
80
81
388
81
typedef struct MirCookie MirCookie;
82
typedef struct MirCookie MirCookie;
389
@@ -136,7 +137,7 @@
390
136
 * \return           The associated MirSurfaceEvent
137
 * \return           The associated MirSurfaceEvent
391
137
 */
138
 */
392
138
MirSurfaceEvent const* mir_event_get_surface_event(MirEvent const* event)
139
MirSurfaceEvent const* mir_event_get_surface_event(MirEvent const* event)
394
139
__attribute__ ((deprecated("use mir_event_get_window_event instead")));
140
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_event_get_window_event instead");
395
140
141
396
141
/**
142
/**
397
142
 * Retrieve the MirWindowEvent associated with a MirEvent of
143
 * Retrieve the MirWindowEvent associated with a MirEvent of
398
@@ -195,7 +196,7 @@
399
195
 * \return           The associated MirCloseSurfaceEvent
196
 * \return           The associated MirCloseSurfaceEvent
400
196
 */
197
 */
401
197
/// @cond
198
/// @cond
403
198
__attribute__ ((deprecated))
199
MIR_FOR_REMOVAL_IN_VERSION_1("Use of this function is pointless as there is no way to use the return value")
404
199
/// @endcond
200
/// @endcond
405
200
MirCloseSurfaceEvent const* mir_event_get_close_surface_event(MirEvent const* event);
201
MirCloseSurfaceEvent const* mir_event_get_close_surface_event(MirEvent const* event);
406
201
#pragma GCC diagnostic pop
202
#pragma GCC diagnostic pop
407
@@ -223,7 +224,7 @@
408
223
 * \return           The associated MirInputConfigurationEvent
224
 * \return           The associated MirInputConfigurationEvent
409
224
 */
225
 */
410
225
/// @cond
226
/// @cond
412
226
__attribute__((deprecated))
227
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback")
413
227
/// @endcond
228
/// @endcond
414
228
MirInputConfigurationEvent const* mir_event_get_input_configuration_event(MirEvent const* event);
229
MirInputConfigurationEvent const* mir_event_get_input_configuration_event(MirEvent const* event);
415
229
#pragma GCC diagnostic pop
230
#pragma GCC diagnostic pop
416
@@ -242,7 +243,7 @@
417
242
 * \return           The associated MirSurfaceOutputEvent
243
 * \return           The associated MirSurfaceOutputEvent
418
243
 */
244
 */
419
244
MirSurfaceOutputEvent const* mir_event_get_surface_output_event(MirEvent const* event)
245
MirSurfaceOutputEvent const* mir_event_get_surface_output_event(MirEvent const* event)
421
245
__attribute__((deprecated("use mir_event_get_window_output_event")));
246
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_event_get_window_output_event");
422
246
247
423
247
/**
248
/**
424
248
 * Retrieve the MirWindowOutputEvent associated with a MirEvent of type
249
 * Retrieve the MirWindowOutputEvent associated with a MirEvent of type
425
@@ -279,7 +280,7 @@
426
279
 * \return           The associated MirSurfacePlacementEvent
280
 * \return           The associated MirSurfacePlacementEvent
427
280
 */
281
 */
428
281
MirSurfacePlacementEvent const* mir_event_get_surface_placement_event(MirEvent const* event)
282
MirSurfacePlacementEvent const* mir_event_get_surface_placement_event(MirEvent const* event)
430
282
__attribute__((deprecated("use mir_event_get_window_placement_event")));
283
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_event_get_window_placement_event");
431
283
284
432
284
/**
285
/**
433
285
 * Retrieve the MirWindowPlacementEvent associated with a MirEvent of
286
 * Retrieve the MirWindowPlacementEvent associated with a MirEvent of
434
286
287
435
=== modified file 'include/client/mir_toolkit/events/input_configuration_event.h'
436
--- include/client/mir_toolkit/events/input_configuration_event.h	2017-05-08 03:04:26 +0000
437
+++ include/client/mir_toolkit/events/input_configuration_event.h	2017-05-18 11:24:43 +0000
438
@@ -20,6 +20,7 @@
439
20
#define MIR_TOOLKIT_EVENTS_INPUT_CONFIGURATION_EVENT_H_
20
#define MIR_TOOLKIT_EVENTS_INPUT_CONFIGURATION_EVENT_H_
440
21
21
441
22
#include <mir_toolkit/events/event.h>
22
#include <mir_toolkit/events/event.h>
442
23
#include <mir_toolkit/deprecations.h>
443
23
24
444
24
#ifdef __cplusplus
25
#ifdef __cplusplus
445
25
/**
26
/**
446
@@ -45,7 +46,7 @@
447
45
    mir_input_configuration_action_configuration_changed,
46
    mir_input_configuration_action_configuration_changed,
448
46
    mir_input_configuration_action_device_reset
47
    mir_input_configuration_action_device_reset
449
47
} MirInputConfigurationAction
48
} MirInputConfigurationAction
451
48
__attribute__((deprecated));
49
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback");
452
49
50
453
50
#pragma GCC diagnostic push
51
#pragma GCC diagnostic push
454
51
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
52
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
455
@@ -55,7 +56,8 @@
456
55
 * \param[in] ev The input configuration event
56
 * \param[in] ev The input configuration event
457
56
 * \return       The action
57
 * \return       The action
458
57
 */
58
 */
460
58
MirInputConfigurationAction mir_input_configuration_event_get_action(MirInputConfigurationEvent const* ev) __attribute__((deprecated));
59
MirInputConfigurationAction mir_input_configuration_event_get_action(MirInputConfigurationEvent const* ev)
461
60
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback");
462
59
61
463
60
/**
62
/**
464
61
 * Retreive the time associated with a MirInputConfiguration event
63
 * Retreive the time associated with a MirInputConfiguration event
465
@@ -63,7 +65,8 @@
466
63
 * \param[in] ev The input configuration event
65
 * \param[in] ev The input configuration event
467
64
 * \return       The time in nanoseconds since epoch
66
 * \return       The time in nanoseconds since epoch
468
65
 */
67
 */
470
66
int64_t mir_input_configuration_event_get_time(MirInputConfigurationEvent const* ev) __attribute__((deprecated));
68
int64_t mir_input_configuration_event_get_time(MirInputConfigurationEvent const* ev)
471
69
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback");
472
67
70
473
68
/**
71
/**
474
69
 * Retreive the device id associated with a MirInputConfiguration event
72
 * Retreive the device id associated with a MirInputConfiguration event
475
@@ -71,7 +74,8 @@
476
71
 * \param[in] ev The input configuration event
74
 * \param[in] ev The input configuration event
477
72
 * \return       The device id or -1 if not applicable to events of this action
75
 * \return       The device id or -1 if not applicable to events of this action
478
73
 */
76
 */
480
74
MirInputDeviceId mir_input_configuration_event_get_device_id(MirInputConfigurationEvent const* ev) __attribute__((deprecated));
77
MirInputDeviceId mir_input_configuration_event_get_device_id(MirInputConfigurationEvent const* ev)
481
78
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback");
482
75
#pragma GCC diagnostic pop
79
#pragma GCC diagnostic pop
483
76
80
484
77
#ifdef __cplusplus
81
#ifdef __cplusplus
485
78
82
486
=== modified file 'include/client/mir_toolkit/events/keymap_event.h'
487
--- include/client/mir_toolkit/events/keymap_event.h	2017-05-08 03:04:26 +0000
488
+++ include/client/mir_toolkit/events/keymap_event.h	2017-05-18 11:24:43 +0000
489
@@ -42,7 +42,7 @@
490
42
 */
42
 */
491
43
void mir_keymap_event_get_rules(MirKeymapEvent const* ev,
43
void mir_keymap_event_get_rules(MirKeymapEvent const* ev,
492
44
                                struct xkb_rule_names* rules)
44
                                struct xkb_rule_names* rules)
494
45
    __attribute__ ((deprecated));
45
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_keymap_event_get_keymap_buffer() instead");
495
46
46
496
47
/**
47
/**
497
48
 * Retrieve the new keymap reported by this MirKeymapEvent
48
 * Retrieve the new keymap reported by this MirKeymapEvent
498
49
49
499
=== modified file 'include/client/mir_toolkit/events/surface_event.h'
500
--- include/client/mir_toolkit/events/surface_event.h	2017-05-08 03:04:26 +0000
501
+++ include/client/mir_toolkit/events/surface_event.h	2017-05-18 11:24:43 +0000
502
@@ -20,6 +20,7 @@
503
20
#define MIR_TOOLKIT_EVENTS_SURFACE_EVENT_H_
20
#define MIR_TOOLKIT_EVENTS_SURFACE_EVENT_H_
504
21
21
505
22
#include <mir_toolkit/events/event.h>
22
#include <mir_toolkit/events/event.h>
506
23
#include <mir_toolkit/deprecations.h>
507
23
24
508
24
#ifdef __cplusplus
25
#ifdef __cplusplus
509
25
/**
26
/**
510
@@ -39,7 +40,7 @@
511
39
 * \return           The associated attribute
40
 * \return           The associated attribute
512
40
 */
41
 */
513
41
MirSurfaceAttrib mir_surface_event_get_attribute(MirSurfaceEvent const* event)
42
MirSurfaceAttrib mir_surface_event_get_attribute(MirSurfaceEvent const* event)
515
42
__attribute__ ((deprecated("use mir_window_event_get_attribute instead")));
43
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_event_get_attribute instead");
516
43
44
517
44
/**
45
/**
518
45
 * Retrieve the new value of the associated attribute for a given MirSurfaceEvent
46
 * Retrieve the new value of the associated attribute for a given MirSurfaceEvent
519
@@ -48,7 +49,7 @@
520
48
 * \return           The associated attribute value
49
 * \return           The associated attribute value
521
49
 */
50
 */
522
50
int mir_surface_event_get_attribute_value(MirSurfaceEvent const* event)
51
int mir_surface_event_get_attribute_value(MirSurfaceEvent const* event)
524
51
__attribute__ ((deprecated("use make_event with mir_window_event_get_attribute_value instead")));
52
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_event_get_attribute_value with MirWindowEvent instead");
525
52
#pragma GCC diagnostic pop
53
#pragma GCC diagnostic pop
526
53
54
527
54
#ifdef __cplusplus
55
#ifdef __cplusplus
528
55
56
529
=== modified file 'include/client/mir_toolkit/events/surface_output_event.h'
530
--- include/client/mir_toolkit/events/surface_output_event.h	2017-05-08 03:04:26 +0000
531
+++ include/client/mir_toolkit/events/surface_output_event.h	2017-05-18 11:24:43 +0000
532
@@ -20,6 +20,7 @@
533
20
#define MIR_TOOLKIT_SURFACE_OUTPUT_EVENT_H_
20
#define MIR_TOOLKIT_SURFACE_OUTPUT_EVENT_H_
534
21
21
535
22
#include <mir_toolkit/events/event.h>
22
#include <mir_toolkit/events/event.h>
536
23
#include <mir_toolkit/deprecations.h>
537
23
24
538
24
#ifdef __cplusplus
25
#ifdef __cplusplus
539
25
/**
26
/**
540
@@ -39,7 +40,7 @@
541
39
 * \return          The new DPI value for the surface is primarily on.
40
 * \return          The new DPI value for the surface is primarily on.
542
40
 */
41
 */
543
41
int mir_surface_output_event_get_dpi(MirSurfaceOutputEvent const* ev)
42
int mir_surface_output_event_get_dpi(MirSurfaceOutputEvent const* ev)
545
42
__attribute__ ((deprecated("use mir_window_output_event_get_dpi instead")));
43
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_output_event_get_dpi instead");
546
43
44
547
44
/**
45
/**
548
45
 * Retrieve the form factor of the new output configuration of a MirSurfaceOutputEvent
46
 * Retrieve the form factor of the new output configuration of a MirSurfaceOutputEvent
549
@@ -48,7 +49,7 @@
550
48
 * \return          The new form factor of the output the surface is primarily on.
49
 * \return          The new form factor of the output the surface is primarily on.
551
49
 */
50
 */
552
50
MirFormFactor mir_surface_output_event_get_form_factor(MirSurfaceOutputEvent const* ev)
51
MirFormFactor mir_surface_output_event_get_form_factor(MirSurfaceOutputEvent const* ev)
554
51
__attribute__ ((deprecated("use mir_window_output_event_get_form_factor instead")));
52
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_output_event_get_form_factor instead");
555
52
53
556
53
/**
54
/**
557
54
 * Retrieve the suggested scaling factor of the new output configuration of a
55
 * Retrieve the suggested scaling factor of the new output configuration of a
558
@@ -58,7 +59,7 @@
559
58
 * \return          The new scaling factor of the output the surface is primarily on.
59
 * \return          The new scaling factor of the output the surface is primarily on.
560
59
 */
60
 */
561
60
float mir_surface_output_event_get_scale(MirSurfaceOutputEvent const* ev)
61
float mir_surface_output_event_get_scale(MirSurfaceOutputEvent const* ev)
563
61
__attribute__ ((deprecated("use mir_window_output_event_get_scale instead")));
62
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_output_event_get_scale instead");
564
62
63
565
63
/**
64
/**
566
64
 * Retrieve the maximum refresh rate of the output(s) associated with a
65
 * Retrieve the maximum refresh rate of the output(s) associated with a
567
@@ -70,7 +71,7 @@
568
70
 * \return          The refresh rate in Hz
71
 * \return          The refresh rate in Hz
569
71
 */
72
 */
570
72
double mir_surface_output_event_get_refresh_rate(MirSurfaceOutputEvent const* ev)
73
double mir_surface_output_event_get_refresh_rate(MirSurfaceOutputEvent const* ev)
572
73
__attribute__ ((deprecated("use mir_window_output_event_get_refresh_rate instead")));
74
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_output_event_get_refresh_rate instead");
573
74
75
574
75
/**
76
/**
575
76
 * Retrieve the ID of the output this surface is on from a MirSurfaceOutputEvent
77
 * Retrieve the ID of the output this surface is on from a MirSurfaceOutputEvent
576
@@ -80,7 +81,7 @@
577
80
 *                  (From MirDisplayOutput::output_id)
81
 *                  (From MirDisplayOutput::output_id)
578
81
 */
82
 */
579
82
uint32_t mir_surface_output_event_get_output_id(MirSurfaceOutputEvent const *ev)
83
uint32_t mir_surface_output_event_get_output_id(MirSurfaceOutputEvent const *ev)
581
83
__attribute__ ((deprecated("use mir_window_output_event_get_output_id instead")));
84
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_output_event_get_output_id instead");
582
84
85
583
85
#pragma GCC diagnostic pop
86
#pragma GCC diagnostic pop
584
86
87
585
87
88
586
=== modified file 'include/client/mir_toolkit/events/surface_placement.h'
587
--- include/client/mir_toolkit/events/surface_placement.h	2017-05-08 03:04:26 +0000
588
+++ include/client/mir_toolkit/events/surface_placement.h	2017-05-18 11:24:43 +0000
589
@@ -20,6 +20,7 @@
590
20
#define MIR_TOOLKIT_SURFACE_PLACEMENT_H_
20
#define MIR_TOOLKIT_SURFACE_PLACEMENT_H_
591
21
21
592
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
593
23
#include <mir_toolkit/deprecations.h>
594
23
24
595
24
#ifdef __cplusplus
25
#ifdef __cplusplus
596
25
/**
26
/**
597
@@ -38,7 +39,7 @@
598
38
 * \return            The position relative to the parent surface
39
 * \return            The position relative to the parent surface
599
39
 */
40
 */
600
40
MirRectangle mir_surface_placement_get_relative_position(MirSurfacePlacementEvent const* event)
41
MirRectangle mir_surface_placement_get_relative_position(MirSurfacePlacementEvent const* event)
602
41
__attribute__ ((deprecated("use mir_window_placement_get_relative_position instead")));
42
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_placement_get_relative_position instead");
603
42
43
604
43
#ifdef __cplusplus
44
#ifdef __cplusplus
605
44
}
45
}
606
45
46
607
=== modified file 'include/client/mir_toolkit/mir_blob.h'
608
--- include/client/mir_toolkit/mir_blob.h	2017-05-08 03:04:26 +0000
609
+++ include/client/mir_toolkit/mir_blob.h	2017-05-18 11:24:43 +0000
610
@@ -19,6 +19,7 @@
611
19
#define MIR_TOOLKIT_MIR_BLOB_H_
19
#define MIR_TOOLKIT_MIR_BLOB_H_
612
20
20
613
21
#include <mir_toolkit/client_types.h>
21
#include <mir_toolkit/client_types.h>
614
22
#include <mir_toolkit/deprecations.h>
615
22
23
616
23
#ifdef __cplusplus
24
#ifdef __cplusplus
617
24
/**
25
/**
618
@@ -35,7 +36,7 @@
619
35
 * \return                 A blob
36
 * \return                 A blob
620
36
 */
37
 */
621
37
MirBlob* mir_blob_from_display_configuration(MirDisplayConfiguration* configuration)
38
MirBlob* mir_blob_from_display_configuration(MirDisplayConfiguration* configuration)
623
38
__attribute__ ((deprecated("use mir_blob_from_display_config instead")));
39
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_blob_from_display_config instead");
624
39
40
625
40
/**
41
/**
626
41
 * Create a blob from a display config
42
 * Create a blob from a display config
627
@@ -65,7 +66,7 @@
628
65
 * \return                 A display configuration
66
 * \return                 A display configuration
629
66
 */
67
 */
630
67
MirDisplayConfiguration* mir_blob_to_display_configuration(MirBlob* blob)
68
MirDisplayConfiguration* mir_blob_to_display_configuration(MirBlob* blob)
632
68
__attribute__ ((deprecated("use mir_blob_to_display_config instead")));
69
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_blob_to_display_config instead");
633
69
70
634
70
/**
71
/**
635
71
 * Create a blob from a display config
72
 * Create a blob from a display config
636
72
73
637
=== modified file 'include/client/mir_toolkit/mir_buffer_stream.h'
638
--- include/client/mir_toolkit/mir_buffer_stream.h	2017-05-17 04:48:46 +0000
639
+++ include/client/mir_toolkit/mir_buffer_stream.h	2017-05-18 11:24:43 +0000
640
@@ -20,6 +20,7 @@
641
20
20
642
21
#include <mir_toolkit/mir_native_buffer.h>
21
#include <mir_toolkit/mir_native_buffer.h>
643
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
644
23
#include <mir_toolkit/deprecations.h>
645
23
24
646
24
#ifdef __cplusplus
25
#ifdef __cplusplus
647
25
/**
26
/**
648
@@ -79,7 +80,7 @@
649
79
    MirBufferUsage buffer_usage,
80
    MirBufferUsage buffer_usage,
650
80
    MirBufferStreamCallback callback,
81
    MirBufferStreamCallback callback,
651
81
    void* context)
82
    void* context)
653
82
__attribute__ ((deprecated("Use mir_render_surface_get_buffer_stream instead")));
83
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_render_surface_get_buffer_stream instead");
654
83
#pragma GCC diagnostic pop
84
#pragma GCC diagnostic pop
655
84
85
656
85
/**
86
/**
657
@@ -105,7 +106,7 @@
658
105
    int width, int height,
106
    int width, int height,
659
106
    MirPixelFormat format,
107
    MirPixelFormat format,
660
107
    MirBufferUsage buffer_usage)
108
    MirBufferUsage buffer_usage)
662
108
__attribute__ ((deprecated("Use mir_render_surface_get_buffer_stream instead")));
109
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_render_surface_get_buffer_stream instead");
663
109
#pragma GCC diagnostic pop
110
#pragma GCC diagnostic pop
664
110
/**
111
/**
665
111
 * Release the supplied stream and any associated buffer. The returned wait
112
 * Release the supplied stream and any associated buffer. The returned wait
666
@@ -125,7 +126,7 @@
667
125
    MirBufferStream * buffer_stream,
126
    MirBufferStream * buffer_stream,
668
126
    MirBufferStreamCallback callback,
127
    MirBufferStreamCallback callback,
669
127
    void *context)
128
    void *context)
671
128
__attribute__ ((deprecated));
129
MIR_FOR_REMOVAL_IN_VERSION_1("A stream obtained through mir_render_surface_get_buffer_stream() does not need to be released.");
672
129
130
673
130
/**
131
/**
674
131
 * Release the specified buffer stream like in mir,_buffer_stream_release(), 
132
 * Release the specified buffer stream like in mir,_buffer_stream_release(), 
675
@@ -134,7 +135,7 @@
676
134
 *   \param [in] buffer_stream  The buffer stream to be released
135
 *   \param [in] buffer_stream  The buffer stream to be released
677
135
 */
136
 */
678
136
void mir_buffer_stream_release_sync(MirBufferStream *buffer_stream)
137
void mir_buffer_stream_release_sync(MirBufferStream *buffer_stream)
680
137
__attribute__ ((deprecated));
138
MIR_FOR_REMOVAL_IN_VERSION_1("A stream obtained through mir_render_surface_get_buffer_stream() does not need to be released.");
681
138
139
682
139
/**
140
/**
683
140
 * Get the underlying platform type so the buffer obtained in "raw"
141
 * Get the underlying platform type so the buffer obtained in "raw"
684
@@ -155,7 +156,8 @@
685
155
 *                            mir_platform_type_gbm
156
 *                            mir_platform_type_gbm
686
156
 */
157
 */
687
157
MirPlatformType mir_buffer_stream_get_platform_type(MirBufferStream *stream)
158
MirPlatformType mir_buffer_stream_get_platform_type(MirBufferStream *stream)
689
158
    __attribute__ ((deprecated));
159
MIR_FOR_REMOVAL_IN_VERSION_1("To identify the graphics platform use mir_connection_get_graphics_module(). \n"
690
160
                             "To safely interpret the buffer contents use mir_buffer_stream_get_graphics_region()");
691
159
161
692
160
/**
162
/**
693
161
 * Retrieve the current buffer in "raw" representation.
163
 * Retrieve the current buffer in "raw" representation.
694
@@ -166,7 +168,7 @@
695
166
 */
168
 */
696
167
void mir_buffer_stream_get_current_buffer(MirBufferStream *buffer_stream,
169
void mir_buffer_stream_get_current_buffer(MirBufferStream *buffer_stream,
697
168
    MirNativeBuffer **buffer_package)
170
    MirNativeBuffer **buffer_package)
699
169
__attribute__ ((deprecated("Use platform specific buffer extensions instead")));
171
MIR_FOR_REMOVAL_IN_VERSION_1("Use platform specific buffer extensions instead");
700
170
172
701
171
/**
173
/**
702
172
 * Advance a buffer stream's buffer. The returned handle remains valid until the
174
 * Advance a buffer stream's buffer. The returned handle remains valid until the
703
@@ -185,7 +187,8 @@
704
185
    MirBufferStream *buffer_stream,
187
    MirBufferStream *buffer_stream,
705
186
    MirBufferStreamCallback callback,
188
    MirBufferStreamCallback callback,
706
187
    void *context)
189
    void *context)
708
188
__attribute__ ((deprecated("For non-blocking swaps use mir_buffer_stream_swap_buffers_sync with an interval of zero. And a client API for manual vsync will soon be available.")));
190
MIR_FOR_REMOVAL_IN_VERSION_1("For non-blocking swaps use mir_buffer_stream_swap_buffers_sync with an interval of zero."
709
191
                             " And a client API for manual vsync will soon be available.");
710
189
192
711
190
/**
193
/**
712
191
 * Advance a buffer stream's buffer as in mir_buffer stream_swap_buffers(), 
194
 * Advance a buffer stream's buffer as in mir_buffer stream_swap_buffers(), 
713
@@ -215,7 +218,7 @@
714
215
 *   \return                   An EGLNativeWindowType that the client can use
218
 *   \return                   An EGLNativeWindowType that the client can use
715
216
 */
219
 */
716
217
MirEGLNativeWindowType mir_buffer_stream_get_egl_native_window(MirBufferStream *buffer_stream)
220
MirEGLNativeWindowType mir_buffer_stream_get_egl_native_window(MirBufferStream *buffer_stream)
718
218
__attribute__ ((deprecated("Use MirRenderSurface *as the window type")));
221
MIR_FOR_REMOVAL_IN_VERSION_1("Use MirRenderSurface *as the window type");
719
219
222
720
220
/**
223
/**
721
221
 * Set the scale associated with all buffers in the stream
224
 * Set the scale associated with all buffers in the stream
722
@@ -225,7 +228,7 @@
723
225
 * \return                  A handle that can be passed to mir_wait_for
228
 * \return                  A handle that can be passed to mir_wait_for
724
226
 */
229
 */
725
227
MirWaitHandle *mir_buffer_stream_set_scale(MirBufferStream* buffer_stream, float scale)
230
MirWaitHandle *mir_buffer_stream_set_scale(MirBufferStream* buffer_stream, float scale)
727
228
__attribute__ ((deprecated));
231
MIR_FOR_REMOVAL_IN_VERSION_1("Functionality replaced by the introduction of MirRenderSurface");
728
229
232
729
230
/**
233
/**
730
231
 * Set the scale as in mir_buffer_stream_set_scale(), but also wait for the
234
 * Set the scale as in mir_buffer_stream_set_scale(), but also wait for the
731
@@ -234,7 +237,7 @@
732
234
 * \param [in] scale         The scale
237
 * \param [in] scale         The scale
733
235
 */
238
 */
734
236
void mir_buffer_stream_set_scale_sync(MirBufferStream* buffer_stream, float scale)
239
void mir_buffer_stream_set_scale_sync(MirBufferStream* buffer_stream, float scale)
736
237
__attribute__ ((deprecated));
240
MIR_FOR_REMOVAL_IN_VERSION_1("Functionality replaced by the introduction of MirRenderSurface");
737
238
241
738
239
/**
242
/**
739
240
 * Set the swapinterval for the stream.
243
 * Set the swapinterval for the stream.
740
241
244
741
=== modified file 'include/client/mir_toolkit/mir_connection.h'
742
--- include/client/mir_toolkit/mir_connection.h	2017-05-08 03:04:26 +0000
743
+++ include/client/mir_toolkit/mir_connection.h	2017-05-18 11:24:43 +0000
744
@@ -20,6 +20,7 @@
745
20
20
746
21
#include <mir_toolkit/client_types.h>
21
#include <mir_toolkit/client_types.h>
747
22
#include <mir_toolkit/common.h>
22
#include <mir_toolkit/common.h>
748
23
#include <mir_toolkit/deprecations.h>
749
23
24
750
24
#include <stdbool.h>
25
#include <stdbool.h>
751
25
26
752
@@ -93,7 +94,7 @@
753
93
 *   \param [out] platform_package  Structure to be populated
94
 *   \param [out] platform_package  Structure to be populated
754
94
 */
95
 */
755
95
void mir_connection_get_platform(MirConnection *connection, MirPlatformPackage *platform_package)
96
void mir_connection_get_platform(MirConnection *connection, MirPlatformPackage *platform_package)
757
96
__attribute__((deprecated("use platform extensions instead")));
97
MIR_FOR_REMOVAL_IN_VERSION_1("use platform extensions instead");
758
97
98
759
98
/**
99
/**
760
99
 * Query graphics platform module.
100
 * Query graphics platform module.
761
@@ -105,7 +106,7 @@
762
105
 *   \param [out] properties    Structure to be populated
106
 *   \param [out] properties    Structure to be populated
763
106
 */
107
 */
764
107
void mir_connection_get_graphics_module(MirConnection *connection, MirModuleProperties *properties)
108
void mir_connection_get_graphics_module(MirConnection *connection, MirModuleProperties *properties)
766
108
__attribute__((deprecated("use graphics module extension instead")));
109
MIR_FOR_REMOVAL_IN_VERSION_1("use graphics module extension instead");
767
109
110
768
110
/**
111
/**
769
111
 * Register a callback to be called when a Lifecycle state change occurs.
112
 * Register a callback to be called when a Lifecycle state change occurs.
770
@@ -156,7 +157,7 @@
771
156
 *   \return                        structure that describes the display configuration
157
 *   \return                        structure that describes the display configuration
772
157
 */
158
 */
773
158
MirDisplayConfiguration* mir_connection_create_display_config(MirConnection *connection)
159
MirDisplayConfiguration* mir_connection_create_display_config(MirConnection *connection)
775
159
__attribute__ ((deprecated("use mir_connection_create_display_configuration instead")));
160
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_connection_create_display_configuration instead");
776
160
161
777
161
/**
162
/**
778
162
 * Query the display
163
 * Query the display
779
@@ -188,7 +189,7 @@
780
188
 *   \param [in] display_configuration  The display_configuration information resource to be destroyed
189
 *   \param [in] display_configuration  The display_configuration information resource to be destroyed
781
189
 */
190
 */
782
190
void mir_display_config_destroy(MirDisplayConfiguration* display_configuration)
191
void mir_display_config_destroy(MirDisplayConfiguration* display_configuration)
784
191
__attribute__ ((deprecated("use mir_display_config_release instead")));
192
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_display_config_release instead");
785
192
193
786
193
/**
194
/**
787
194
 * Apply the display configuration
195
 * Apply the display configuration
788
@@ -204,7 +205,7 @@
789
204
 *   \return                            A handle that can be passed to mir_wait_for
205
 *   \return                            A handle that can be passed to mir_wait_for
790
205
 */
206
 */
791
206
MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration)
207
MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration)
793
207
__attribute__ ((deprecated("use mir_connection_apply_session_display_config instead")));
208
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_connection_apply_session_display_config instead");
794
208
209
795
209
/**
210
/**
796
210
 * Apply the display config for the connection
211
 * Apply the display config for the connection
797
@@ -254,7 +255,7 @@
798
254
MirWaitHandle* mir_connection_set_base_display_config(
255
MirWaitHandle* mir_connection_set_base_display_config(
799
255
    MirConnection* connection,
256
    MirConnection* connection,
800
256
    MirDisplayConfiguration const* display_configuration)
257
    MirDisplayConfiguration const* display_configuration)
802
257
__attribute__ ((deprecated("use mir_connection_preview_base_display_configuration/mir_connection_confirm_base_display_configuration")));
258
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_connection_preview_base_display_configuration/mir_connection_confirm_base_display_configuration");
803
258
259
804
259
260
805
260
/**
261
/**
806
@@ -333,7 +334,7 @@
807
333
 *   \return                 An EGLNativeDisplayType that the client can use
334
 *   \return                 An EGLNativeDisplayType that the client can use
808
334
 */
335
 */
809
335
MirEGLNativeDisplayType mir_connection_get_egl_native_display(MirConnection *connection)
336
MirEGLNativeDisplayType mir_connection_get_egl_native_display(MirConnection *connection)
811
336
__attribute__((deprecated("Use MirConnection * as the native display instead")));
337
MIR_FOR_REMOVAL_IN_VERSION_1("Use MirConnection * as the native display instead");
812
337
338
813
338
/**
339
/**
814
339
 * Get the exact MirPixelFormat to use in creating a surface for a chosen
340
 * Get the exact MirPixelFormat to use in creating a surface for a chosen
815
@@ -346,7 +347,7 @@
816
346
 */
347
 */
817
347
MirPixelFormat mir_connection_get_egl_pixel_format(
348
MirPixelFormat mir_connection_get_egl_pixel_format(
818
348
    MirConnection *connection, void *egldisplay, void *eglconfig)
349
    MirConnection *connection, void *egldisplay, void *eglconfig)
820
349
__attribute__((deprecated("Use EGL directly, the EGL implementation will now set correct pixel format")));
350
MIR_FOR_REMOVAL_IN_VERSION_1("Use EGL directly, the EGL implementation will now set correct pixel format");
821
350
351
822
351
/**
352
/**
823
352
 * Get the list of possible formats that a surface can be created with.
353
 * Get the list of possible formats that a surface can be created with.
824
@@ -383,7 +384,7 @@
825
383
    MirConnection* connection,
384
    MirConnection* connection,
826
384
    MirPlatformMessage const* request,
385
    MirPlatformMessage const* request,
827
385
    MirPlatformOperationCallback callback, void* context)
386
    MirPlatformOperationCallback callback, void* context)
829
386
__attribute__ ((deprecated("use platform specific extensions instead")));
387
MIR_FOR_REMOVAL_IN_VERSION_1("use platform specific extensions instead");
830
387
388
831
388
/**
389
/**
832
389
 * Create a snapshot of the attached input devices and device configurations.
390
 * Create a snapshot of the attached input devices and device configurations.
833
@@ -441,7 +442,7 @@
834
441
 * \param [in] config  The input configuration
442
 * \param [in] config  The input configuration
835
442
 */
443
 */
836
443
void mir_input_config_destroy(MirInputConfig const* config)
444
void mir_input_config_destroy(MirInputConfig const* config)
838
444
__attribute__ ((deprecated("use mir_input_config_release instead")));
445
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_input_config_release instead");
839
445
446
840
446
/**
447
/**
841
447
 * Release this snapshot of the input configuration.
448
 * Release this snapshot of the input configuration.
842
448
449
843
=== modified file 'include/client/mir_toolkit/mir_cursor_configuration.h'
844
--- include/client/mir_toolkit/mir_cursor_configuration.h	2017-05-08 03:04:26 +0000
845
+++ include/client/mir_toolkit/mir_cursor_configuration.h	2017-05-18 11:24:43 +0000
846
@@ -20,6 +20,7 @@
847
20
20
848
21
#include <mir_toolkit/common.h>
21
#include <mir_toolkit/common.h>
849
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
850
23
#include <mir_toolkit/deprecations.h>
851
23
24
852
24
#ifdef __cplusplus
25
#ifdef __cplusplus
853
25
/**
26
/**
854
@@ -37,7 +38,7 @@
855
37
 *     \param [in] parameters The operand
38
 *     \param [in] parameters The operand
856
38
 */
39
 */
857
39
void mir_cursor_configuration_destroy(MirCursorConfiguration *parameters)
40
void mir_cursor_configuration_destroy(MirCursorConfiguration *parameters)
859
40
__attribute__((deprecated("MirCursorConfiguration is deprecated")));
41
MIR_FOR_REMOVAL_IN_VERSION_1("MirCursorConfiguration is deprecated");
860
41
42
861
42
/**
43
/**
862
43
 * Returns a new MirCursorConfiguration representing a named cursor
44
 * Returns a new MirCursorConfiguration representing a named cursor
863
@@ -51,7 +52,7 @@
864
51
 *            to_mir_cursor_configuration_destroy
52
 *            to_mir_cursor_configuration_destroy
865
52
 */
53
 */
866
53
MirCursorConfiguration *mir_cursor_configuration_from_name(char const* name)
54
MirCursorConfiguration *mir_cursor_configuration_from_name(char const* name)
868
54
__attribute__((deprecated("Use mir_window_spec_set_cursor_name instead")));
55
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_set_cursor_name() instead");
869
55
56
870
56
/**
57
/**
871
57
 * Returns a new cursor configuration tied to a given buffer stream.
58
 * Returns a new cursor configuration tied to a given buffer stream.
872
@@ -66,7 +67,7 @@
873
66
 */
67
 */
874
67
MirCursorConfiguration *mir_cursor_configuration_from_buffer_stream(MirBufferStream const* stream, int hotspot_x,
68
MirCursorConfiguration *mir_cursor_configuration_from_buffer_stream(MirBufferStream const* stream, int hotspot_x,
875
68
    int hotspot_y)
69
    int hotspot_y)
877
69
__attribute__((deprecated("Use mir_window_spec_set_cursor_render_surface instead")));
70
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_set_cursor_render_surface instead");
878
70
71
879
71
#pragma GCC diagnostic pop
72
#pragma GCC diagnostic pop
880
72
#ifdef __cplusplus
73
#ifdef __cplusplus
881
73
74
882
=== modified file 'include/client/mir_toolkit/mir_display_configuration.h'
883
--- include/client/mir_toolkit/mir_display_configuration.h	2017-05-08 03:04:26 +0000
884
+++ include/client/mir_toolkit/mir_display_configuration.h	2017-05-18 11:24:43 +0000
885
@@ -20,6 +20,7 @@
886
20
#define MIR_TOOLKIT_MIR_DISPLAY_CONFIGURATION_H_
20
#define MIR_TOOLKIT_MIR_DISPLAY_CONFIGURATION_H_
887
21
21
888
22
#include "client_types.h"
22
#include "client_types.h"
889
23
#include <mir_toolkit/deprecations.h>
890
23
24
891
24
#ifdef __cplusplus
25
#ifdef __cplusplus
892
25
extern "C" {
26
extern "C" {
893
@@ -60,7 +61,7 @@
894
60
 */
61
 */
895
61
int mir_display_config_get_max_simultaneous_outputs(
62
int mir_display_config_get_max_simultaneous_outputs(
896
62
    MirDisplayConfig const* config)
63
    MirDisplayConfig const* config)
898
63
    __attribute__((deprecated("Not accurate in Mir 0.26 and later. May be removed in future.")));
64
    MIR_FOR_REMOVAL_IN_VERSION_1("Not accurate in Mir 0.26 and later. May be removed in future.");
899
64
65
900
65
/**
66
/**
901
66
 * Get the number of outputs available in this display configuration.
67
 * Get the number of outputs available in this display configuration.
902
@@ -268,7 +269,7 @@
903
268
 * \returns           The name of the output type.
269
 * \returns           The name of the output type.
904
269
 */
270
 */
905
270
char const* mir_display_output_type_name(MirDisplayOutputType type)
271
char const* mir_display_output_type_name(MirDisplayOutputType type)
907
271
__attribute__((deprecated("use mir_output_type_name instead")));
272
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_output_type_name instead");
908
272
273
909
273
/**
274
/**
910
274
 * Get the textual name of an output type.
275
 * Get the textual name of an output type.
911
275
276
912
=== modified file 'include/client/mir_toolkit/mir_persistent_id.h'
913
--- include/client/mir_toolkit/mir_persistent_id.h	2017-03-16 09:12:12 +0000
914
+++ include/client/mir_toolkit/mir_persistent_id.h	2017-05-18 11:24:43 +0000
915
@@ -19,6 +19,7 @@
916
19
#define MIR_TOOLKIT_MIR_PERSISTENT_ID_H_
19
#define MIR_TOOLKIT_MIR_PERSISTENT_ID_H_
917
20
20
918
21
#include <mir_toolkit/client_types.h>
21
#include <mir_toolkit/client_types.h>
919
22
#include <mir_toolkit/deprecations.h>
920
22
23
921
23
#include <stdbool.h>
24
#include <stdbool.h>
922
24
25
923
@@ -39,7 +40,7 @@
924
39
 * \note This does not guarantee that the ID refers to a currently valid object.
40
 * \note This does not guarantee that the ID refers to a currently valid object.
925
40
 */
41
 */
926
41
bool mir_persistent_id_is_valid(MirPersistentId* id)
42
bool mir_persistent_id_is_valid(MirPersistentId* id)
928
42
__attribute__((deprecated("Use mir_window_id_is_valid() instead")));
43
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_id_is_valid() instead");
929
43
44
930
44
/**
45
/**
931
45
 * \brief Free a MirPersistentId
46
 * \brief Free a MirPersistentId
932
@@ -48,7 +49,7 @@
933
48
 *       object referred to by \arg id.
49
 *       object referred to by \arg id.
934
49
 */
50
 */
935
50
void mir_persistent_id_release(MirPersistentId* id)
51
void mir_persistent_id_release(MirPersistentId* id)
937
51
__attribute__((deprecated("Use mir_window_id_release() instead")));
52
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_id_release() instead");
938
52
53
939
53
/**
54
/**
940
54
 * \brief Get a string representation of a MirSurfaceId
55
 * \brief Get a string representation of a MirSurfaceId
941
@@ -59,7 +60,7 @@
942
59
 * \see mir_surface_id_from_string
60
 * \see mir_surface_id_from_string
943
60
 */
61
 */
944
61
char const* mir_persistent_id_as_string(MirPersistentId* id)
62
char const* mir_persistent_id_as_string(MirPersistentId* id)
946
62
__attribute__((deprecated("Use mir_window_id_as_string() instead")));
63
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_id_as_string() instead");
947
63
64
948
64
/**
65
/**
949
65
 * \brief Deserialise a string representation of a MirSurfaceId
66
 * \brief Deserialise a string representation of a MirSurfaceId
950
@@ -67,7 +68,7 @@
951
67
 * \return The deserialised MirSurfaceId
68
 * \return The deserialised MirSurfaceId
952
68
 */
69
 */
953
69
MirPersistentId* mir_persistent_id_from_string(char const* string_representation)
70
MirPersistentId* mir_persistent_id_from_string(char const* string_representation)
955
70
__attribute__((deprecated("Use mir_window_id_from_string() instead")));
71
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_id_from_string() instead");
956
71
72
957
72
#pragma GCC diagnostic pop
73
#pragma GCC diagnostic pop
958
73
74
959
74
75
960
=== modified file 'include/client/mir_toolkit/mir_platform_message.h'
961
--- include/client/mir_toolkit/mir_platform_message.h	2017-05-08 03:04:26 +0000
962
+++ include/client/mir_toolkit/mir_platform_message.h	2017-05-18 11:24:43 +0000
963
@@ -19,6 +19,7 @@
964
19
#define MIR_TOOLKIT_MIR_PLATFORM_MESSAGE_H_
19
#define MIR_TOOLKIT_MIR_PLATFORM_MESSAGE_H_
965
20
20
966
21
#include <sys/types.h>
21
#include <sys/types.h>
967
22
#include <mir_toolkit/deprecations.h>
968
22
23
969
23
#ifdef __cplusplus
24
#ifdef __cplusplus
970
24
/**
25
/**
971
@@ -51,7 +52,7 @@
972
51
 *   \param [in] opcode    The platform message opcode
52
 *   \param [in] opcode    The platform message opcode
973
52
 *   \return               The created MirPlatformMessage
53
 *   \return               The created MirPlatformMessage
974
53
 */
54
 */
976
54
__attribute__((deprecated("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")))
55
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")
977
55
MirPlatformMessage* mir_platform_message_create(unsigned int opcode);
56
MirPlatformMessage* mir_platform_message_create(unsigned int opcode);
978
56
57
979
57
/**
58
/**
980
@@ -59,7 +60,7 @@
981
59
 *
60
 *
982
60
 *   \param [in] message   The MirPlatformMessage
61
 *   \param [in] message   The MirPlatformMessage
983
61
 */
62
 */
985
62
__attribute__((deprecated("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")))
63
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")
986
63
void mir_platform_message_release(MirPlatformMessage const* message);
64
void mir_platform_message_release(MirPlatformMessage const* message);
987
64
65
988
65
/**
66
/**
989
@@ -71,7 +72,7 @@
990
71
 *   \param [in] data       Pointer to the data
72
 *   \param [in] data       Pointer to the data
991
72
 *   \param [in] data_size  The size of the data in bytes
73
 *   \param [in] data_size  The size of the data in bytes
992
73
 */
74
 */
994
74
__attribute__((deprecated("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")))
75
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")
995
75
void mir_platform_message_set_data(MirPlatformMessage* message, void const* data, size_t data_size);
76
void mir_platform_message_set_data(MirPlatformMessage* message, void const* data, size_t data_size);
996
76
77
997
77
/**
78
/**
998
@@ -89,7 +90,7 @@
999
89
 *   \param [in] fds       Pointer to the array of fds
90
 *   \param [in] fds       Pointer to the array of fds
1000
90
 *   \param [in] num_fds   The number of fds
91
 *   \param [in] num_fds   The number of fds
1001
91
 */
92
 */
1003
92
__attribute__((deprecated("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")))
93
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")
1004
93
void mir_platform_message_set_fds(MirPlatformMessage* message, int const* fds, size_t num_fds);
94
void mir_platform_message_set_fds(MirPlatformMessage* message, int const* fds, size_t num_fds);
1005
94
95
1006
95
/**
96
/**
1007
@@ -98,7 +99,7 @@
1008
98
 *   \param [in] message   The MirPlatformMessage
99
 *   \param [in] message   The MirPlatformMessage
1009
99
 *   \return               The opcode
100
 *   \return               The opcode
1010
100
 */
101
 */
1012
101
__attribute__((deprecated("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")))
102
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")
1013
102
unsigned int mir_platform_message_get_opcode(MirPlatformMessage const* message);
103
unsigned int mir_platform_message_get_opcode(MirPlatformMessage const* message);
1014
103
104
1015
104
/**
105
/**
1016
@@ -111,7 +112,7 @@
1017
111
 *   \param [in] message   The MirPlatformMessage
112
 *   \param [in] message   The MirPlatformMessage
1018
112
 *   \return               The data
113
 *   \return               The data
1019
113
 */
114
 */
1021
114
__attribute__((deprecated("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")))
115
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")
1022
115
MirPlatformMessageData mir_platform_message_get_data(MirPlatformMessage const* message);
116
MirPlatformMessageData mir_platform_message_get_data(MirPlatformMessage const* message);
1023
116
117
1024
117
/**
118
/**
1025
@@ -128,7 +129,7 @@
1026
128
 *   \param [in] message   The MirPlatformMessage
129
 *   \param [in] message   The MirPlatformMessage
1027
129
 *   \return               The fds
130
 *   \return               The fds
1028
130
 */
131
 */
1030
131
__attribute__((deprecated("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")))
132
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_extension_mesa_drm_auth or mir_extension_set_gbm_device")
1031
132
MirPlatformMessageFds mir_platform_message_get_fds(MirPlatformMessage const* message);
133
MirPlatformMessageFds mir_platform_message_get_fds(MirPlatformMessage const* message);
1032
133
134
1033
134
#ifdef __cplusplus
135
#ifdef __cplusplus
1034
135
136
1035
=== modified file 'include/client/mir_toolkit/mir_screencast.h'
1036
--- include/client/mir_toolkit/mir_screencast.h	2017-05-08 03:04:26 +0000
1037
+++ include/client/mir_toolkit/mir_screencast.h	2017-05-18 11:24:43 +0000
1038
@@ -18,6 +18,7 @@
1039
18
#define MIR_TOOLKIT_MIR_SCREENCAST_H_
18
#define MIR_TOOLKIT_MIR_SCREENCAST_H_
1040
19
19
1041
20
#include <mir_toolkit/client_types.h>
20
#include <mir_toolkit/client_types.h>
1042
21
#include <mir_toolkit/deprecations.h>
1043
21
22
1044
22
#ifdef __cplusplus
23
#ifdef __cplusplus
1045
23
/**
24
/**
1046
@@ -143,7 +144,7 @@
1047
143
MirScreencast* mir_connection_create_screencast_sync(
144
MirScreencast* mir_connection_create_screencast_sync(
1048
144
    MirConnection* connection,
145
    MirConnection* connection,
1049
145
    MirScreencastParameters* parameters)
146
    MirScreencastParameters* parameters)
1051
146
__attribute__ ((deprecated("use mir_screencast_create_sync instead")));
147
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_screencast_create_sync instead");
1052
147
148
1053
148
/**
149
/**
1054
149
 * Release the specified screencast.
150
 * Release the specified screencast.
1055
150
151
1056
=== modified file 'include/client/mir_toolkit/mir_surface.h'
1057
--- include/client/mir_toolkit/mir_surface.h	2017-05-08 03:04:26 +0000
1058
+++ include/client/mir_toolkit/mir_surface.h	2017-05-18 11:24:43 +0000
1059
@@ -22,6 +22,7 @@
1060
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
1061
23
#include <mir_toolkit/common.h>
23
#include <mir_toolkit/common.h>
1062
24
#include <mir_toolkit/mir_cursor_configuration.h>
24
#include <mir_toolkit/mir_cursor_configuration.h>
1063
25
#include <mir_toolkit/deprecations.h>
1064
25
26
1065
26
#include <stdbool.h>
27
#include <stdbool.h>
1066
27
28
1067
@@ -40,7 +41,7 @@
1068
40
MirSurfaceSpec* mir_connection_create_spec_for_normal_surface(MirConnection* connection,
41
MirSurfaceSpec* mir_connection_create_spec_for_normal_surface(MirConnection* connection,
1069
41
                                                              int width, int height,
42
                                                              int width, int height,
1070
42
                                                              MirPixelFormat format)
43
                                                              MirPixelFormat format)
1072
43
__attribute__((deprecated("Use mir_create_normal_window_spec() instead")));
44
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_normal_window_spec() instead");
1073
44
45
1074
45
MirSurfaceSpec*
46
MirSurfaceSpec*
1075
46
mir_connection_create_spec_for_menu(MirConnection* connection,
47
mir_connection_create_spec_for_menu(MirConnection* connection,
1076
@@ -50,7 +51,7 @@
1077
50
                                    MirSurface* parent,
51
                                    MirSurface* parent,
1078
51
                                    MirRectangle* rect,
52
                                    MirRectangle* rect,
1079
52
                                    MirEdgeAttachment edge)
53
                                    MirEdgeAttachment edge)
1081
53
__attribute__((deprecated("Use mir_specify_menu() instead")));
54
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_specify_menu() instead");
1082
54
55
1083
55
MirSurfaceSpec*
56
MirSurfaceSpec*
1084
56
mir_connection_create_spec_for_tooltip(MirConnection* connection,
57
mir_connection_create_spec_for_tooltip(MirConnection* connection,
1085
@@ -58,7 +59,7 @@
1086
58
                                       MirPixelFormat format,
59
                                       MirPixelFormat format,
1087
59
                                       MirSurface* parent,
60
                                       MirSurface* parent,
1088
60
                                       MirRectangle* zone)
61
                                       MirRectangle* zone)
1090
61
__attribute__((deprecated("Use mir_create_tip_window_spec() instead")));
62
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_tip_window_spec() instead");
1091
62
63
1092
63
MirSurfaceSpec*
64
MirSurfaceSpec*
1093
64
mir_connection_create_spec_for_tip(MirConnection* connection,
65
mir_connection_create_spec_for_tip(MirConnection* connection,
1094
@@ -67,30 +68,30 @@
1095
67
                                   MirSurface* parent,
68
                                   MirSurface* parent,
1096
68
                                   MirRectangle* rect,
69
                                   MirRectangle* rect,
1097
69
                                   MirEdgeAttachment edge)
70
                                   MirEdgeAttachment edge)
1099
70
__attribute__((deprecated("Use mir_create_tip_window_spec() instead")));
71
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_tip_window_spec() instead");
1100
71
72
1101
72
MirSurfaceSpec*
73
MirSurfaceSpec*
1102
73
mir_connection_create_spec_for_modal_dialog(MirConnection* connection,
74
mir_connection_create_spec_for_modal_dialog(MirConnection* connection,
1103
74
                                            int width, int height,
75
                                            int width, int height,
1104
75
                                            MirPixelFormat format,
76
                                            MirPixelFormat format,
1105
76
                                            MirSurface* parent)
77
                                            MirSurface* parent)
1107
77
__attribute__((deprecated("Use mir_create_modal_dialog_window_spec() instead")));
78
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_modal_dialog_window_spec() instead");
1108
78
79
1109
79
MirSurfaceSpec*
80
MirSurfaceSpec*
1110
80
mir_connection_create_spec_for_dialog(MirConnection* connection,
81
mir_connection_create_spec_for_dialog(MirConnection* connection,
1111
81
                                      int width, int height,
82
                                      int width, int height,
1112
82
                                      MirPixelFormat format)
83
                                      MirPixelFormat format)
1114
83
__attribute__((deprecated("Use mir_create_dialog_window_spec() instead")));
84
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_dialog_window_spec() instead");
1115
84
85
1116
85
MirSurfaceSpec* mir_create_surface_spec(MirConnection* connection)
86
MirSurfaceSpec* mir_create_surface_spec(MirConnection* connection)
1118
86
__attribute__((deprecated("Use mir_create_window_spec() instead")));
87
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_window_spec() instead");
1119
87
88
1120
88
MirSurfaceSpec*
89
MirSurfaceSpec*
1121
89
mir_connection_create_spec_for_changes(MirConnection* connection)
90
mir_connection_create_spec_for_changes(MirConnection* connection)
1123
90
__attribute__((deprecated("Use mir_create_window_spec() instead")));
91
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_window_spec() instead");
1124
91
92
1125
92
void mir_surface_spec_set_parent(MirSurfaceSpec* spec, MirSurface* parent)
93
void mir_surface_spec_set_parent(MirSurfaceSpec* spec, MirSurface* parent)
1127
93
__attribute__((deprecated("Use mir_window_spec_set_parent() instead")));
94
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_set_parent() instead");
1128
94
95
1129
95
/**
96
/**
1130
96
 *\deprecated This will soon be a property of the backing content.
97
 *\deprecated This will soon be a property of the backing content.
1131
@@ -103,77 +104,77 @@
1132
103
 *                        was removed by use of mir_window_spec_set_streams().
104
 *                        was removed by use of mir_window_spec_set_streams().
1133
104
 */
105
 */
1134
105
int mir_surface_get_swapinterval(MirSurface* surface)
106
int mir_surface_get_swapinterval(MirSurface* surface)
1136
106
__attribute__((deprecated("This will soon be a property of the backing content")));
107
MIR_FOR_REMOVAL_IN_VERSION_1("This will soon be a property of the backing content");
1137
107
108
1138
108
void mir_surface_spec_set_type(MirSurfaceSpec* spec, MirSurfaceType type)
109
void mir_surface_spec_set_type(MirSurfaceSpec* spec, MirSurfaceType type)
1140
109
__attribute__((deprecated("use mir_window_spec_set_type() instead")));
110
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_type() instead");
1141
110
111
1142
111
void mir_surface_spec_set_name(MirSurfaceSpec* spec, char const* name)
112
void mir_surface_spec_set_name(MirSurfaceSpec* spec, char const* name)
1144
112
__attribute__((deprecated("use mir_window_spec_set_name() instead")));
113
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_name() instead");
1145
113
114
1146
114
void mir_surface_spec_set_width(MirSurfaceSpec* spec, unsigned width)
115
void mir_surface_spec_set_width(MirSurfaceSpec* spec, unsigned width)
1148
115
__attribute__((deprecated("use mir_window_spec_set_width() instead")));
116
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_width() instead");
1149
116
117
1150
117
void mir_surface_spec_set_height(MirSurfaceSpec* spec, unsigned height)
118
void mir_surface_spec_set_height(MirSurfaceSpec* spec, unsigned height)
1152
118
__attribute__((deprecated("use mir_window_spec_set_height() instead")));
119
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_height() instead");
1153
119
120
1154
120
void mir_surface_spec_set_width_increment(MirSurfaceSpec* spec, unsigned width_inc)
121
void mir_surface_spec_set_width_increment(MirSurfaceSpec* spec, unsigned width_inc)
1156
121
__attribute__((deprecated("use mir_window_spec_set_width_increment() instead")));
122
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_width_increment() instead");
1157
122
123
1158
123
void mir_surface_spec_set_height_increment(MirSurfaceSpec* spec, unsigned height_inc)
124
void mir_surface_spec_set_height_increment(MirSurfaceSpec* spec, unsigned height_inc)
1160
124
__attribute__((deprecated("use mir_window_spec_set_height_increment() instead")));
125
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_height_increment() instead");
1161
125
126
1162
126
void mir_surface_spec_set_min_width(MirSurfaceSpec* spec, unsigned min_width)
127
void mir_surface_spec_set_min_width(MirSurfaceSpec* spec, unsigned min_width)
1164
127
__attribute__((deprecated("use mir_window_spec_set_min_width() instead")));
128
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_min_width() instead");
1165
128
129
1166
129
void mir_surface_spec_set_min_height(MirSurfaceSpec* spec, unsigned min_height)
130
void mir_surface_spec_set_min_height(MirSurfaceSpec* spec, unsigned min_height)
1168
130
__attribute__((deprecated("use mir_window_spec_set_min_height() instead")));
131
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_min_height() instead");
1169
131
132
1170
132
void mir_surface_spec_set_max_width(MirSurfaceSpec* spec, unsigned max_width)
133
void mir_surface_spec_set_max_width(MirSurfaceSpec* spec, unsigned max_width)
1172
133
__attribute__((deprecated("use mir_window_spec_set_max_width() instead")));
134
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_max_width() instead");
1173
134
135
1174
135
void mir_surface_spec_set_max_height(MirSurfaceSpec* spec, unsigned max_height)
136
void mir_surface_spec_set_max_height(MirSurfaceSpec* spec, unsigned max_height)
1176
136
__attribute__((deprecated("use mir_window_spec_set_max_height() instead")));
137
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_max_height() instead");
1177
137
138
1178
138
void mir_surface_spec_set_min_aspect_ratio(MirSurfaceSpec* spec, unsigned width, unsigned height)
139
void mir_surface_spec_set_min_aspect_ratio(MirSurfaceSpec* spec, unsigned width, unsigned height)
1180
139
__attribute__((deprecated("use mir_window_spec_set_min_aspect_ratio() instead")));
140
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_min_aspect_ratio() instead");
1181
140
141
1182
141
void mir_surface_spec_set_max_aspect_ratio(MirSurfaceSpec* spec, unsigned width, unsigned height)
142
void mir_surface_spec_set_max_aspect_ratio(MirSurfaceSpec* spec, unsigned width, unsigned height)
1184
142
__attribute__((deprecated("use mir_window_spec_set_max_aspect_ratio() instead")));
143
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_max_aspect_ratio() instead");
1185
143
144
1186
144
void mir_surface_spec_set_fullscreen_on_output(MirSurfaceSpec* spec, uint32_t output_id)
145
void mir_surface_spec_set_fullscreen_on_output(MirSurfaceSpec* spec, uint32_t output_id)
1188
145
__attribute__((deprecated("use mir_window_spec_set_fullscreen_on_output() instead")));
146
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_fullscreen_on_output() instead");
1189
146
147
1190
147
void mir_surface_spec_set_preferred_orientation(MirSurfaceSpec* spec, MirOrientationMode mode)
148
void mir_surface_spec_set_preferred_orientation(MirSurfaceSpec* spec, MirOrientationMode mode)
1192
148
__attribute__((deprecated("use mir_window_spec_set_preferred_orientation() instead")));
149
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_preferred_orientation() instead");
1193
149
150
1194
150
bool mir_surface_spec_attach_to_foreign_parent(MirSurfaceSpec* spec,
151
bool mir_surface_spec_attach_to_foreign_parent(MirSurfaceSpec* spec,
1195
151
                                               MirPersistentId* parent,
152
                                               MirPersistentId* parent,
1196
152
                                               MirRectangle* attachment_rect,
153
                                               MirRectangle* attachment_rect,
1197
153
                                               MirEdgeAttachment edge)
154
                                               MirEdgeAttachment edge)
1199
154
__attribute__((deprecated("use mir_window_spec_attach_to_foreign_parent() instead")));
155
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_attach_to_foreign_parent() instead");
1200
155
156
1201
156
void mir_surface_spec_set_state(MirSurfaceSpec* spec, MirSurfaceState state)
157
void mir_surface_spec_set_state(MirSurfaceSpec* spec, MirSurfaceState state)
1203
157
__attribute__((deprecated("use mir_window_spec_set_state() instead")));
158
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_state() instead");
1204
158
159
1205
159
void mir_surface_spec_release(MirSurfaceSpec* spec)
160
void mir_surface_spec_release(MirSurfaceSpec* spec)
1207
160
__attribute__((deprecated("use mir_window_spec_release() instead")));
161
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_release() instead");
1208
161
162
1209
162
void mir_surface_spec_set_input_shape(MirSurfaceSpec* spec,
163
void mir_surface_spec_set_input_shape(MirSurfaceSpec* spec,
1210
163
                                      MirRectangle const *rectangles,
164
                                      MirRectangle const *rectangles,
1211
164
                                      size_t n_rects)
165
                                      size_t n_rects)
1213
165
__attribute__((deprecated("use mir_window_spec_set_input_shape() instead")));
166
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_input_shape() instead");
1214
166
167
1215
167
void mir_surface_spec_set_event_handler(MirSurfaceSpec* spec,
168
void mir_surface_spec_set_event_handler(MirSurfaceSpec* spec,
1216
168
                                        mir_surface_event_callback callback,
169
                                        mir_surface_event_callback callback,
1217
169
                                        void* context)
170
                                        void* context)
1219
170
__attribute__((deprecated("use mir_window_spec_set_event_handler() instead")));
171
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_event_handler() instead");
1220
171
172
1221
172
void mir_surface_spec_set_shell_chrome(MirSurfaceSpec* spec, MirShellChrome style)
173
void mir_surface_spec_set_shell_chrome(MirSurfaceSpec* spec, MirShellChrome style)
1223
173
__attribute__((deprecated("use mir_window_spec_set_shell_chrome() instead")));
174
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_shell_chrome() instead");
1224
174
175
1225
175
void mir_surface_spec_set_pointer_confinement(MirSurfaceSpec* spec, MirPointerConfinementState state)
176
void mir_surface_spec_set_pointer_confinement(MirSurfaceSpec* spec, MirPointerConfinementState state)
1227
176
__attribute__((deprecated("use mir_window_spec_set_pointer_confinement() instead")));
177
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_pointer_confinement() instead");
1228
177
178
1229
178
void mir_surface_spec_set_placement(MirSurfaceSpec*     spec,
179
void mir_surface_spec_set_placement(MirSurfaceSpec*     spec,
1230
179
                                    const MirRectangle* rect,
180
                                    const MirRectangle* rect,
1231
@@ -182,69 +183,69 @@
1232
182
                                    MirPlacementHints   placement_hints,
183
                                    MirPlacementHints   placement_hints,
1233
183
                                    int                 offset_dx,
184
                                    int                 offset_dx,
1234
184
                                    int                 offset_dy)
185
                                    int                 offset_dy)
1236
185
__attribute__((deprecated("use mir_window_spec_set_placement() instead")));
186
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_placement() instead");
1237
186
187
1238
187
MirSurfaceSpec* mir_connection_create_spec_for_input_method(MirConnection* connection,
188
MirSurfaceSpec* mir_connection_create_spec_for_input_method(MirConnection* connection,
1239
188
                                                            int width, int height,
189
                                                            int width, int height,
1240
189
                                                            MirPixelFormat format)
190
                                                            MirPixelFormat format)
1242
190
__attribute__((deprecated("use mir_create_input_method_window_spec() instead")));
191
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_create_input_method_window_spec() instead");
1243
191
192
1244
192
void mir_surface_spec_set_pixel_format(MirSurfaceSpec* spec, MirPixelFormat format)
193
void mir_surface_spec_set_pixel_format(MirSurfaceSpec* spec, MirPixelFormat format)
1246
193
__attribute__((deprecated("use mir_window_spec_set_pixel_format() instead")));
194
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_pixel_format() instead");
1247
194
195
1248
195
void mir_surface_spec_set_buffer_usage(MirSurfaceSpec* spec, MirBufferUsage usage)
196
void mir_surface_spec_set_buffer_usage(MirSurfaceSpec* spec, MirBufferUsage usage)
1250
196
__attribute__((deprecated("use mir_window_spec_set_buffer_usage() instead")));
197
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_buffer_usage() instead");
1251
197
198
1252
198
void mir_surface_spec_set_streams(MirSurfaceSpec* spec,
199
void mir_surface_spec_set_streams(MirSurfaceSpec* spec,
1253
199
                                  MirBufferStreamInfo* streams,
200
                                  MirBufferStreamInfo* streams,
1254
200
                                  unsigned int num_streams)
201
                                  unsigned int num_streams)
1256
201
__attribute__((deprecated("use mir_window_spec_set_streams() instead")));
202
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_streams() instead");
1257
202
203
1258
203
void mir_surface_apply_spec(MirSurface* surface, MirSurfaceSpec* spec)
204
void mir_surface_apply_spec(MirSurface* surface, MirSurfaceSpec* spec)
1260
204
__attribute__((deprecated("use mir_window_apply_spec() instead")));
205
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_apply_spec() instead");
1261
205
206
1262
206
bool mir_surface_is_valid(MirSurface *surface)
207
bool mir_surface_is_valid(MirSurface *surface)
1264
207
__attribute__((deprecated("use mir_window_is_valid() instead")));
208
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_is_valid() instead");
1265
208
209
1266
209
MirWaitHandle* mir_surface_create(MirSurfaceSpec* requested_specification,
210
MirWaitHandle* mir_surface_create(MirSurfaceSpec* requested_specification,
1267
210
                                  mir_surface_callback callback, void* context)
211
                                  mir_surface_callback callback, void* context)
1269
211
__attribute__((deprecated("use mir_create_window() instead")));
212
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_create_window() instead");
1270
212
213
1271
213
MirSurface* mir_surface_create_sync(MirSurfaceSpec* requested_specification)
214
MirSurface* mir_surface_create_sync(MirSurfaceSpec* requested_specification)
1273
214
__attribute__((deprecated("use mir_create_window_sync() instead")));
215
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_create_window_sync() instead");
1274
215
216
1275
216
MirWaitHandle *mir_surface_release(
217
MirWaitHandle *mir_surface_release(
1276
217
    MirSurface *surface,
218
    MirSurface *surface,
1277
218
    mir_surface_callback callback,
219
    mir_surface_callback callback,
1278
219
    void *context)
220
    void *context)
1280
220
__attribute__((deprecated("use mir_window_release() instead")));
221
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_release() instead");
1281
221
222
1282
222
void mir_surface_release_sync(MirSurface *surface)
223
void mir_surface_release_sync(MirSurface *surface)
1284
223
__attribute__((deprecated("use mir_window_release_sync() instead")));
224
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_release_sync() instead");
1285
224
225
1286
225
void mir_surface_set_event_handler(MirSurface *surface,
226
void mir_surface_set_event_handler(MirSurface *surface,
1287
226
                                   mir_surface_event_callback callback,
227
                                   mir_surface_event_callback callback,
1288
227
                                   void* context)
228
                                   void* context)
1290
228
__attribute__((deprecated("use mir_window_set_event_handler() instead")));
229
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_set_event_handler() instead");
1291
229
230
1292
230
MirBufferStream* mir_surface_get_buffer_stream(MirSurface *surface)
231
MirBufferStream* mir_surface_get_buffer_stream(MirSurface *surface)
1294
231
__attribute__((deprecated("use mir_window_get_buffer_stream() instead")));
232
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_buffer_stream() instead");
1295
232
233
1296
233
char const* mir_surface_get_error_message(MirSurface *surface)
234
char const* mir_surface_get_error_message(MirSurface *surface)
1298
234
__attribute__((deprecated("use mir_window_get_error_message() instead")));
235
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_error_message() instead");
1299
235
236
1300
236
void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters)
237
void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters)
1302
237
__attribute__((deprecated("use mir_window_get_parameters() instead")));
238
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_parameters() instead");
1303
238
239
1304
239
MirSurfaceType mir_surface_get_type(MirSurface* surface)
240
MirSurfaceType mir_surface_get_type(MirSurface* surface)
1306
240
__attribute__((deprecated("use mir_window_get_type() instead")));
241
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_type() instead");
1307
241
242
1308
242
MirWaitHandle* mir_surface_set_state(MirSurface *surface,
243
MirWaitHandle* mir_surface_set_state(MirSurface *surface,
1309
243
                                     MirSurfaceState state)
244
                                     MirSurfaceState state)
1311
244
__attribute__((deprecated("use mir_window_set_state() instead")));
245
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_set_state() instead");
1312
245
246
1313
246
MirSurfaceState mir_surface_get_state(MirSurface *surface)
247
MirSurfaceState mir_surface_get_state(MirSurface *surface)
1315
247
__attribute__((deprecated("use mir_window_get_state() instead")));
248
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_state() instead");
1316
248
249
1317
249
/**
250
/**
1318
250
 * Set the swapinterval for the default stream.
251
 * Set the swapinterval for the default stream.
1319
@@ -260,37 +261,37 @@
1320
260
 *                        or NULL if the interval could not be supported
261
 *                        or NULL if the interval could not be supported
1321
261
 */
262
 */
1322
262
MirWaitHandle* mir_surface_set_swapinterval(MirSurface* surface, int interval)
263
MirWaitHandle* mir_surface_set_swapinterval(MirSurface* surface, int interval)
1324
263
__attribute__((deprecated("Swap interval should be set on the backing content")));
264
MIR_FOR_REMOVAL_IN_VERSION_1("Swap interval should be set on the backing content");
1325
264
265
1326
265
int mir_surface_get_dpi(MirSurface* surface)
266
int mir_surface_get_dpi(MirSurface* surface)
1328
266
__attribute__((deprecated("use mir_window_get_dpi() instead")));
267
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_dpi() instead");
1329
267
268
1330
268
MirSurfaceFocusState mir_surface_get_focus(MirSurface *surface)
269
MirSurfaceFocusState mir_surface_get_focus(MirSurface *surface)
1332
269
__attribute__((deprecated("use mir_window_get_focus_state() instead")));
270
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_focus_state() instead");
1333
270
271
1334
271
MirSurfaceVisibility mir_surface_get_visibility(MirSurface *surface)
272
MirSurfaceVisibility mir_surface_get_visibility(MirSurface *surface)
1336
272
__attribute__((deprecated("use mir_window_get_visibility() instead")));
273
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_visibility() instead");
1337
273
274
1338
274
MirWaitHandle* mir_surface_configure_cursor(MirSurface *surface, MirCursorConfiguration const* parameters)
275
MirWaitHandle* mir_surface_configure_cursor(MirSurface *surface, MirCursorConfiguration const* parameters)
1340
275
__attribute__((deprecated("use mir_window_configure_cursor() instead")));
276
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_configure_cursor() instead");
1341
276
277
1342
277
MirOrientation mir_surface_get_orientation(MirSurface *surface)
278
MirOrientation mir_surface_get_orientation(MirSurface *surface)
1344
278
__attribute__((deprecated("use mir_window_get_orientation() instead")));
279
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_orientation() instead");
1345
279
280
1346
280
MirWaitHandle* mir_surface_set_preferred_orientation(MirSurface *surface, MirOrientationMode orientation)
281
MirWaitHandle* mir_surface_set_preferred_orientation(MirSurface *surface, MirOrientationMode orientation)
1348
281
__attribute__((deprecated("use mir_window_set_preferred_orientation() instead")));
282
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_set_preferred_orientation() instead");
1349
282
283
1350
283
MirOrientationMode mir_surface_get_preferred_orientation(MirSurface *surface)
284
MirOrientationMode mir_surface_get_preferred_orientation(MirSurface *surface)
1352
284
__attribute__((deprecated("use mir_window_get_preferred_orientation() instead")));
285
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_preferred_orientation() instead");
1353
285
286
1354
286
MirWaitHandle* mir_surface_request_persistent_id(MirSurface* surface, mir_surface_id_callback callback, void* context)
287
MirWaitHandle* mir_surface_request_persistent_id(MirSurface* surface, mir_surface_id_callback callback, void* context)
1356
287
__attribute__((deprecated("use mir_window_request_persistent_id() instead")));
288
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_request_persistent_id() instead");
1357
288
289
1358
289
MirPersistentId* mir_surface_request_persistent_id_sync(MirSurface *surface)
290
MirPersistentId* mir_surface_request_persistent_id_sync(MirSurface *surface)
1360
290
__attribute__((deprecated("use mir_window_request_persistent_id_sync() instead")));
291
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_request_persistent_id_sync() instead");
1361
291
292
1362
292
void mir_surface_raise(MirSurface* surface, MirCookie const* cookie)
293
void mir_surface_raise(MirSurface* surface, MirCookie const* cookie)
1364
293
__attribute__((deprecated("use mir_window_raise() instead")));
294
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_raise() instead");
1365
294
295
1366
295
#pragma GCC diagnostic pop
296
#pragma GCC diagnostic pop
1367
296
297
1368
297
298
1369
=== modified file 'include/client/mir_toolkit/mir_wait.h'
1370
--- include/client/mir_toolkit/mir_wait.h	2017-05-08 03:04:26 +0000
1371
+++ include/client/mir_toolkit/mir_wait.h	2017-05-18 11:24:43 +0000
1372
@@ -19,6 +19,7 @@
1373
19
#define MIR_TOOLKIT_MIR_WAIT_H_
19
#define MIR_TOOLKIT_MIR_WAIT_H_
1374
20
20
1375
21
#include <mir_toolkit/client_types.h>
21
#include <mir_toolkit/client_types.h>
1376
22
#include <mir_toolkit/deprecations.h>
1377
22
23
1378
23
#ifdef __cplusplus
24
#ifdef __cplusplus
1379
24
/**
25
/**
1380
@@ -36,7 +37,7 @@
1381
36
 *   \param [in] wait_handle  Handle returned by an asynchronous request
37
 *   \param [in] wait_handle  Handle returned by an asynchronous request
1382
37
 */
38
 */
1383
38
void mir_wait_for(MirWaitHandle *wait_handle)
39
void mir_wait_for(MirWaitHandle *wait_handle)
1385
39
__attribute__ ((deprecated("No longer supported - use callbacks or wait for state changes")));
40
MIR_FOR_REMOVAL_IN_VERSION_1("No longer supported - use callbacks or wait for state changes");
1386
40
41
1387
41
/**
42
/**
1388
42
 * Wait on the supplied handle until one instance of the associated request
43
 * Wait on the supplied handle until one instance of the associated request
1389
@@ -47,7 +48,7 @@
1390
47
 *   \param [in] wait_handle  Handle returned by an asynchronous request
48
 *   \param [in] wait_handle  Handle returned by an asynchronous request
1391
48
 */
49
 */
1392
49
void mir_wait_for_one(MirWaitHandle *wait_handle)
50
void mir_wait_for_one(MirWaitHandle *wait_handle)
1394
50
__attribute__ ((deprecated("No longer supported - use callbacks or wait for state changes")));
51
MIR_FOR_REMOVAL_IN_VERSION_1("No longer supported - use callbacks or wait for state changes");
1395
51
52
1396
52
53
1397
53
#ifdef __cplusplus
54
#ifdef __cplusplus
1398
54
55
1399
=== modified file 'include/client/mir_toolkit/mir_window.h'
1400
--- include/client/mir_toolkit/mir_window.h	2017-05-08 03:04:26 +0000
1401
+++ include/client/mir_toolkit/mir_window.h	2017-05-18 11:24:43 +0000
1402
@@ -22,6 +22,7 @@
1403
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
1404
23
#include <mir_toolkit/common.h>
23
#include <mir_toolkit/common.h>
1405
24
#include <mir_toolkit/mir_cursor_configuration.h>
24
#include <mir_toolkit/mir_cursor_configuration.h>
1406
25
#include <mir_toolkit/deprecations.h>
1407
25
26
1408
26
#include <stdbool.h>
27
#include <stdbool.h>
1409
27
28
1410
@@ -543,7 +544,7 @@
1411
543
 *          the point mir_create_window() is called it will instead return an invalid window.
544
 *          the point mir_create_window() is called it will instead return an invalid window.
1412
544
 */
545
 */
1413
545
void mir_window_spec_set_pixel_format(MirWindowSpec* spec, MirPixelFormat format)
546
void mir_window_spec_set_pixel_format(MirWindowSpec* spec, MirPixelFormat format)
1415
546
    __attribute__((deprecated("Use mir_connection_allocate_buffer/mir_render_surface_get_buffer_stream instead")));
547
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_connection_allocate_buffer/mir_render_surface_get_buffer_stream instead");
1416
547
548
1417
548
/**
549
/**
1418
549
 * \note To be deprecated soon. Only for enabling other deprecations.
550
 * \note To be deprecated soon. Only for enabling other deprecations.
1419
@@ -560,7 +561,7 @@
1420
560
#pragma GCC diagnostic push
561
#pragma GCC diagnostic push
1421
561
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
562
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1422
562
void mir_window_spec_set_buffer_usage(MirWindowSpec* spec, MirBufferUsage usage)
563
void mir_window_spec_set_buffer_usage(MirWindowSpec* spec, MirBufferUsage usage)
1424
563
    __attribute__((deprecated("No longer applicable, use mir_render_surface apis")));
564
MIR_FOR_REMOVAL_IN_VERSION_1("No longer applicable, use mir_render_surface apis");
1425
564
#pragma GCC diagnostic pop
565
#pragma GCC diagnostic pop
1426
565
/**
566
/**
1427
566
 *
567
 *
1428
@@ -585,32 +586,7 @@
1429
585
void mir_window_spec_set_streams(MirWindowSpec* spec,
586
void mir_window_spec_set_streams(MirWindowSpec* spec,
1430
586
                                 MirBufferStreamInfo* streams,
587
                                 MirBufferStreamInfo* streams,
1431
587
                                 unsigned int num_streams)
588
                                 unsigned int num_streams)
1458
588
    __attribute__((deprecated("Use mir_window_spec_add_render_surface instead")));
589
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_add_render_surface instead");
1433
589
1434
590
/**
1435
591
 * Set the MirWindowSpec to display content contained in a render surface
1436
592
 *
1437
593
 * \warning: The initial call to mir_window_spec_add_render_surface will set
1438
594
 *           the bottom-most content, and subsequent calls will stack the
1439
595
 *           content on top.
1440
596
 *
1441
597
 * \param spec             The window_spec to be updated
1442
598
 * \param render_surface   The render surface containing the content to be displayed
1443
599
 * \param logical_width    The width that the content will be displayed at
1444
600
 *                         (Ignored for buffer streams)
1445
601
 * \param logical_height   The height that the content will be displayed at
1446
602
 *                         (Ignored for buffer streams)
1447
603
 * \param displacement_x   The x displacement from the top-left corner of the MirWindow
1448
604
 * \param displacement_y   The y displacement from the top-left corner of the MirWindow
1449
605
 */
1450
606
#pragma GCC diagnostic push
1451
607
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1452
608
void mir_window_spec_add_render_surface(MirWindowSpec* spec,
1453
609
                                        MirRenderSurface* render_surface,
1454
610
                                        int logical_width, int logical_height,
1455
611
                                        int displacement_x, int displacement_y)
1456
612
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
1457
613
#pragma GCC diagnostic pop
1459
614
590
1460
615
/**
591
/**
1461
616
 * Release the resources held by a MirWindowSpec.
592
 * Release the resources held by a MirWindowSpec.
1462
@@ -710,7 +686,7 @@
1463
710
 *   \param[in] window The window
686
 *   \param[in] window The window
1464
711
 */
687
 */
1465
712
MirBufferStream* mir_window_get_buffer_stream(MirWindow* window)
688
MirBufferStream* mir_window_get_buffer_stream(MirWindow* window)
1467
713
    __attribute__((deprecated("Use mir_window_spec_add_render_surface during window creation/modification instead")));
689
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_add_render_surface during window creation/modification instead");
1468
714
/**
690
/**
1469
715
 * Retrieve a text description of the error. The returned string is owned by
691
 * Retrieve a text description of the error. The returned string is owned by
1470
716
 * the library and remains valid until the window or the associated
692
 * the library and remains valid until the window or the associated
1471
@@ -732,7 +708,7 @@
1472
732
#pragma GCC diagnostic push
708
#pragma GCC diagnostic push
1473
733
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
709
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1474
734
void mir_window_get_parameters(MirWindow* window, MirWindowParameters* parameters)
710
void mir_window_get_parameters(MirWindow* window, MirWindowParameters* parameters)
1476
735
    __attribute__((deprecated("Use mir_window_get_xxx apis or listen to state/attribute change events instead")));
711
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_get_xxx apis or listen to state/attribute change events instead");
1477
736
#pragma GCC diagnostic pop
712
#pragma GCC diagnostic pop
1478
737
713
1479
738
714
1480
@@ -816,7 +792,7 @@
1481
816
#pragma GCC diagnostic push
792
#pragma GCC diagnostic push
1482
817
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
793
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1483
818
void mir_window_configure_cursor(MirWindow* window, MirCursorConfiguration const* parameters)
794
void mir_window_configure_cursor(MirWindow* window, MirCursorConfiguration const* parameters)
1485
819
    __attribute__((deprecated("Use mir_window_spec_set_cursor_name/mir_window_spec_set_cursor_render_surface instead")));
795
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_set_cursor_name/mir_window_spec_set_cursor_render_surface instead");
1486
820
#pragma GCC diagnostic pop
796
#pragma GCC diagnostic pop
1487
821
/**
797
/**
1488
822
 * Request to set the preferred orientations of a window.
798
 * Request to set the preferred orientations of a window.
1489
@@ -847,7 +823,7 @@
1490
847
 * \param [in,out] context   User data passed to completion callback.
823
 * \param [in,out] context   User data passed to completion callback.
1491
848
 */
824
 */
1492
849
void mir_window_request_persistent_id(MirWindow* window, MirWindowIdCallback callback, void* context)
825
void mir_window_request_persistent_id(MirWindow* window, MirWindowIdCallback callback, void* context)
1494
850
__attribute__((deprecated("Use mir_window_request_window_id() instead")));
826
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_request_window_id() instead");
1495
851
void mir_window_request_window_id(MirWindow* window, MirWindowIdCallback callback, void* context);
827
void mir_window_request_window_id(MirWindow* window, MirWindowIdCallback callback, void* context);
1496
852
828
1497
853
/**
829
/**
1498
@@ -857,7 +833,7 @@
1499
857
 *         be freed with a call to mir_persistent_id_release()
833
 *         be freed with a call to mir_persistent_id_release()
1500
858
 */
834
 */
1501
859
MirPersistentId* mir_window_request_persistent_id_sync(MirWindow* window)
835
MirPersistentId* mir_window_request_persistent_id_sync(MirWindow* window)
1503
860
__attribute__((deprecated("Use mir_window_request_window_id_sync")));
836
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_request_window_id_sync");
1504
861
MirWindowId* mir_window_request_window_id_sync(MirWindow* window);
837
MirWindowId* mir_window_request_window_id_sync(MirWindow* window);
1505
862
#ifdef __cplusplus
838
#ifdef __cplusplus
1506
863
}
839
}
1507
864
840
1508
=== modified file 'include/client/mir_toolkit/rs/mir_render_surface.h'
1509
--- include/client/mir_toolkit/rs/mir_render_surface.h	2017-05-08 03:04:26 +0000
1510
+++ include/client/mir_toolkit/rs/mir_render_surface.h	2017-05-18 11:24:43 +0000
1511
@@ -21,6 +21,18 @@
1512
21
#define MIR_TOOLKIT_MIR_RENDER_SURFACE_H_
21
#define MIR_TOOLKIT_MIR_RENDER_SURFACE_H_
1513
22
22
1514
23
#include <mir_toolkit/client_types.h>
23
#include <mir_toolkit/client_types.h>
1515
24
#include <mir_toolkit/deprecations.h>
1516
25
1517
26
#ifndef MIR_DEPRECATE_RENDERSURFACES
1518
27
    #define MIR_DEPRECATE_RENDERSURFACES 1
1519
28
#endif
1520
29
1521
30
#if MIR_ENABLE_DEPRECATIONS > 0 && MIR_DEPRECATE_RENDERSURFACES > 0
1522
31
    #define MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1\
1523
32
    __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")))
1524
33
#else
1525
34
    #define MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1
1526
35
#endif
1527
24
36
1528
25
#ifdef __cplusplus
37
#ifdef __cplusplus
1529
26
/**
38
/**
1530
@@ -30,6 +42,9 @@
1531
30
extern "C" {
42
extern "C" {
1532
31
#endif
43
#endif
1533
32
44
1534
45
typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
1535
46
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1536
47
1537
33
#pragma GCC diagnostic push
48
#pragma GCC diagnostic push
1538
34
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
49
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1539
35
/**
50
/**
1540
@@ -49,7 +64,7 @@
1541
49
    int width, int height,
64
    int width, int height,
1542
50
    MirRenderSurfaceCallback callback,
65
    MirRenderSurfaceCallback callback,
1543
51
    void* context)
66
    void* context)
1545
52
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
67
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1546
53
68
1547
54
/**
69
/**
1548
55
 * Create a render surface and wait for the result
70
 * Create a render surface and wait for the result
1549
@@ -64,7 +79,7 @@
1550
64
MirRenderSurface* mir_connection_create_render_surface_sync(
79
MirRenderSurface* mir_connection_create_render_surface_sync(
1551
65
    MirConnection* connection,
80
    MirConnection* connection,
1552
66
    int width, int height)
81
    int width, int height)
1554
67
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
82
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1555
68
83
1556
69
/**
84
/**
1557
70
 * Get the size of the MirRenderSurface
85
 * Get the size of the MirRenderSurface
1558
@@ -76,7 +91,7 @@
1559
76
void mir_render_surface_get_size(
91
void mir_render_surface_get_size(
1560
77
    MirRenderSurface* render_surface,
92
    MirRenderSurface* render_surface,
1561
78
    int* width, int* height)
93
    int* width, int* height)
1563
79
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
94
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1564
80
95
1565
81
/**
96
/**
1566
82
 * Set the size of the MirRenderSurface
97
 * Set the size of the MirRenderSurface
1567
@@ -88,7 +103,7 @@
1568
88
void mir_render_surface_set_size(
103
void mir_render_surface_set_size(
1569
89
    MirRenderSurface* render_surface,
104
    MirRenderSurface* render_surface,
1570
90
    int width, int height)
105
    int width, int height)
1572
91
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
106
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1573
92
107
1574
93
/**
108
/**
1575
94
 * Test for a valid render surface
109
 * Test for a valid render surface
1576
@@ -100,7 +115,7 @@
1577
100
 */
115
 */
1578
101
bool mir_render_surface_is_valid(
116
bool mir_render_surface_is_valid(
1579
102
    MirRenderSurface* render_surface)
117
    MirRenderSurface* render_surface)
1581
103
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
118
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1582
104
119
1583
105
/**
120
/**
1584
106
 * Retrieve a text description of the error. The returned string is owned by
121
 * Retrieve a text description of the error. The returned string is owned by
1585
@@ -113,7 +128,7 @@
1586
113
 */
128
 */
1587
114
char const *mir_render_surface_get_error_message(
129
char const *mir_render_surface_get_error_message(
1588
115
    MirRenderSurface* render_surface)
130
    MirRenderSurface* render_surface)
1590
116
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
131
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1591
117
132
1592
118
/**
133
/**
1593
119
 * Release the specified render surface
134
 * Release the specified render surface
1594
@@ -122,7 +137,7 @@
1595
122
 */
137
 */
1596
123
void mir_render_surface_release(
138
void mir_render_surface_release(
1597
124
    MirRenderSurface* render_surface)
139
    MirRenderSurface* render_surface)
1599
125
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
140
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1600
126
141
1601
127
/**
142
/**
1602
128
 * Obtain the buffer stream backing a given render surface.
143
 * Obtain the buffer stream backing a given render surface.
1603
@@ -142,7 +157,7 @@
1604
142
    MirRenderSurface* render_surface,
157
    MirRenderSurface* render_surface,
1605
143
    int width, int height,
158
    int width, int height,
1606
144
    MirPixelFormat format)
159
    MirPixelFormat format)
1608
145
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
160
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1609
146
161
1610
147
/**
162
/**
1611
148
 * Obtain the presentation chain backing a given render surface.
163
 * Obtain the presentation chain backing a given render surface.
1612
@@ -155,7 +170,7 @@
1613
155
 */
170
 */
1614
156
MirPresentationChain* mir_render_surface_get_presentation_chain(
171
MirPresentationChain* mir_render_surface_get_presentation_chain(
1615
157
    MirRenderSurface* render_surface)
172
    MirRenderSurface* render_surface)
1617
158
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
173
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1618
159
174
1619
160
/** Query whether the server supports a given presentation mode.
175
/** Query whether the server supports a given presentation mode.
1620
161
 *
176
 *
1621
@@ -189,7 +204,7 @@
1622
189
    MirWindowSpec* spec,
204
    MirWindowSpec* spec,
1623
190
    MirRenderSurface* render_surface,
205
    MirRenderSurface* render_surface,
1624
191
    int hotspot_x, int hotspot_y)
206
    int hotspot_x, int hotspot_y)
1626
192
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
207
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1627
193
208
1628
194
/**
209
/**
1629
195
 * Returns a new cursor configuration tied to a given render surface.
210
 * Returns a new cursor configuration tied to a given render surface.
1630
@@ -204,7 +219,30 @@
1631
204
MirCursorConfiguration* mir_cursor_configuration_from_render_surface(
219
MirCursorConfiguration* mir_cursor_configuration_from_render_surface(
1632
205
    MirRenderSurface* surface,
220
    MirRenderSurface* surface,
1633
206
    int hotspot_x, int hotspot_y)
221
    int hotspot_x, int hotspot_y)
1635
207
__attribute__((deprecated("Use mir_window_spec_set_cursor_render_surface instead")));
222
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1636
223
1637
224
1638
225
/**
1639
226
 * Set the MirWindowSpec to display content contained in a render surface
1640
227
 *
1641
228
 * \warning: The initial call to mir_window_spec_add_render_surface will set
1642
229
 *           the bottom-most content, and subsequent calls will stack the
1643
230
 *           content on top.
1644
231
 *
1645
232
 * \param spec             The window_spec to be updated
1646
233
 * \param render_surface   The render surface containing the content to be displayed
1647
234
 * \param logical_width    The width that the content will be displayed at
1648
235
 *                         (Ignored for buffer streams)
1649
236
 * \param logical_height   The height that the content will be displayed at
1650
237
 *                         (Ignored for buffer streams)
1651
238
 * \param displacement_x   The x displacement from the top-left corner of the MirWindow
1652
239
 * \param displacement_y   The y displacement from the top-left corner of the MirWindow
1653
240
 */
1654
241
void mir_window_spec_add_render_surface(MirWindowSpec* spec,
1655
242
                                        MirRenderSurface* render_surface,
1656
243
                                        int logical_width, int logical_height,
1657
244
                                        int displacement_x, int displacement_y)
1658
245
MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
1659
208
246
1660
209
#pragma GCC diagnostic pop
247
#pragma GCC diagnostic pop
1661
210
248
1662
211
249
1663
=== modified file 'include/core/mir_toolkit/common.h'
1664
--- include/core/mir_toolkit/common.h	2017-05-08 03:04:26 +0000
1665
+++ include/core/mir_toolkit/common.h	2017-05-18 11:24:43 +0000
1666
@@ -21,6 +21,8 @@
1667
21
#ifndef MIR_COMMON_H_
21
#ifndef MIR_COMMON_H_
1668
22
#define MIR_COMMON_H_
22
#define MIR_COMMON_H_
1669
23
23
1670
24
#include <mir_toolkit/deprecations.h>
1671
25
1672
24
//for clang
26
//for clang
1673
25
#ifndef __has_feature
27
#ifndef __has_feature
1674
26
  #define __has_feature(x) 0  // Compatibility with non-clang
28
  #define __has_feature(x) 0  // Compatibility with non-clang
1675
@@ -35,7 +37,7 @@
1676
35
    (__has_extension(attribute_deprecated_with_message) && \
37
    (__has_extension(attribute_deprecated_with_message) && \
1677
36
     __has_extension(enumerator_attributes))
38
     __has_extension(enumerator_attributes))
1678
37
  #define MIR_DEPRECATED_ENUM(ENUM, INSTEAD) \
39
  #define MIR_DEPRECATED_ENUM(ENUM, INSTEAD) \
1680
38
      ENUM __attribute__ ((deprecated("Use " #INSTEAD " instead")))
40
      ENUM MIR_FOR_REMOVAL_IN_VERSION_1("Use " #INSTEAD " instead")
1681
39
#else
41
#else
1682
40
  #define MIR_DEPRECATED_ENUM(ENUM, INSTEAD) \
42
  #define MIR_DEPRECATED_ENUM(ENUM, INSTEAD) \
1683
41
      ENUM
43
      ENUM
1684
@@ -65,7 +67,7 @@
1685
65
    mir_surface_attrib_preferred_orientation,
67
    mir_surface_attrib_preferred_orientation,
1686
66
    /* Must be last */
68
    /* Must be last */
1687
67
    mir_surface_attribs
69
    mir_surface_attribs
1689
68
} MirSurfaceAttrib __attribute__ ((deprecated("use MirWindowAttrib")));
70
} MirSurfaceAttrib MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowAttrib");
1690
69
71
1691
70
/**
72
/**
1692
71
 * Attributes of a window that the client and server/shell may wish to
73
 * Attributes of a window that the client and server/shell may wish to
1693
@@ -102,7 +104,7 @@
1694
102
    mir_surface_type_satellite,    /**< AKA "toolbox"/"toolbar"             */
104
    mir_surface_type_satellite,    /**< AKA "toolbox"/"toolbar"             */
1695
103
    mir_surface_type_tip,          /**< AKA "tooltip"                       */
105
    mir_surface_type_tip,          /**< AKA "tooltip"                       */
1696
104
    mir_surface_types
106
    mir_surface_types
1698
105
} MirSurfaceType __attribute__ ((deprecated("use MirWindowType")));
107
} MirSurfaceType MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowType");
1699
106
108
1700
107
typedef enum MirWindowType
109
typedef enum MirWindowType
1701
108
{
110
{
1702
@@ -132,7 +134,7 @@
1703
132
    mir_surface_state_horizmaximized,
134
    mir_surface_state_horizmaximized,
1704
133
    mir_surface_state_hidden,
135
    mir_surface_state_hidden,
1705
134
    mir_surface_states
136
    mir_surface_states
1707
135
} MirSurfaceState __attribute__ ((deprecated("use MirWindowState")));
137
} MirSurfaceState MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowState");
1708
136
138
1709
137
typedef enum MirWindowState
139
typedef enum MirWindowState
1710
138
{
140
{
1711
@@ -154,7 +156,7 @@
1712
154
{
156
{
1713
155
    mir_surface_unfocused = 0,
157
    mir_surface_unfocused = 0,
1714
156
    mir_surface_focused
158
    mir_surface_focused
1716
157
} MirSurfaceFocusState __attribute__ ((deprecated("use MirWindowFocusState")));
159
} MirSurfaceFocusState MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowFocusState");
1717
158
160
1718
159
typedef enum MirWindowFocusState
161
typedef enum MirWindowFocusState
1719
160
{
162
{
1720
@@ -166,7 +168,7 @@
1721
166
{
168
{
1722
167
    mir_surface_visibility_occluded = 0,
169
    mir_surface_visibility_occluded = 0,
1723
168
    mir_surface_visibility_exposed
170
    mir_surface_visibility_exposed
1725
169
} MirSurfaceVisibility __attribute__ ((deprecated("use MirWindowFocusState")));
171
} MirSurfaceVisibility MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowFocusState");
1726
170
172
1727
171
typedef enum MirWindowVisibility
173
typedef enum MirWindowVisibility
1728
172
{
174
{
1729
173
175
1730
=== added file 'include/core/mir_toolkit/deprecations.h'
1731
--- include/core/mir_toolkit/deprecations.h	1970-01-01 00:00:00 +0000
1732
+++ include/core/mir_toolkit/deprecations.h	2017-05-18 11:24:43 +0000
1733
@@ -0,0 +1,36 @@
1734
1
/*
1735
2
 * Copyright © 2017 Canonical Ltd.
1736
3
 *
1737
4
 * This program is free software: you can redistribute it and/or modify it
1738
5
 * under the terms of the GNU Lesser General Public License version 3,
1739
6
 * as published by the Free Software Foundation.
1740
7
 *
1741
8
 * This program is distributed in the hope that it will be useful,
1742
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1743
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1744
11
 * GNU Lesser General Public License for more details.
1745
12
 *
1746
13
 * You should have received a copy of the GNU Lesser General Public License
1747
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1748
15
 */
1749
16
1750
17
#ifndef MIR_DEPRECATIONS_H_
1751
18
#define MIR_DEPRECATIONS_H_
1752
19
1753
20
#ifndef MIR_ENABLE_DEPRECATIONS
1754
21
    // use __GNUC__ < 6 as a proxy for building on Ubunutu 16.04LTS ("Xenial")
1755
22
    #if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ >= 6)
1756
23
        #define MIR_ENABLE_DEPRECATIONS 1
1757
24
    #else
1758
25
        #define MIR_ENABLE_DEPRECATIONS 0
1759
26
    #endif
1760
27
#endif
1761
28
1762
29
#if MIR_ENABLE_DEPRECATIONS > 0
1763
30
    #define MIR_FOR_REMOVAL_IN_VERSION_1(message)\
1764
31
    __attribute__((deprecated(message)))
1765
32
#else
1766
33
    #define MIR_FOR_REMOVAL_IN_VERSION_1(message)
1767
34
#endif
1768
35
1769
36
#endif //MIR_DEPRECATIONS_H_
1770
0
37
1771
=== modified file 'include/server/mir/shell/basic_window_manager.h'
1772
--- include/server/mir/shell/basic_window_manager.h	2017-05-08 03:04:26 +0000
1773
+++ include/server/mir/shell/basic_window_manager.h	2017-05-18 11:24:43 +0000
1774
@@ -230,7 +230,7 @@
1775
230
    void update_event_timestamp(MirPointerEvent const* pev);
230
    void update_event_timestamp(MirPointerEvent const* pev);
1776
231
    void update_event_timestamp(MirTouchEvent const* tev);
231
    void update_event_timestamp(MirTouchEvent const* tev);
1777
232
    void update_event_timestamp(MirInputEvent const* iev);
232
    void update_event_timestamp(MirInputEvent const* iev);
1779
233
} __attribute__((deprecated("Use libmiral instead")));
233
} MIR_FOR_REMOVAL_IN_VERSION_1("Use libmiral instead");
1780
234
234
1781
235
#pragma GCC diagnostic push
235
#pragma GCC diagnostic push
1782
236
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
236
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1783
@@ -260,7 +260,7 @@
1784
260
        return std::unique_ptr<WMPolicy>(
260
        return std::unique_ptr<WMPolicy>(
1785
261
            new WMPolicy(this, std::forward<PolicyArgs>(policy_args)...));
261
            new WMPolicy(this, std::forward<PolicyArgs>(policy_args)...));
1786
262
    }
262
    }
1788
263
} __attribute__((deprecated("Use libmiral instead")));
263
} MIR_FOR_REMOVAL_IN_VERSION_1("Use libmiral instead");
1789
264
#pragma GCC diagnostic pop
264
#pragma GCC diagnostic pop
1790
265
}
265
}
1791
266
}
266
}
1792
267
267
1793
=== modified file 'src/common/events/input_configuration_event.cpp'
1794
--- src/common/events/input_configuration_event.cpp	2017-05-08 03:04:26 +0000
1795
+++ src/common/events/input_configuration_event.cpp	2017-05-18 11:24:43 +0000
1796
@@ -18,13 +18,12 @@
1797
18
18
1798
19
#include "mir/events/input_configuration_event.h"
19
#include "mir/events/input_configuration_event.h"
1799
20
20
1800
21
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1801
21
MirInputConfigurationEvent::MirInputConfigurationEvent()
22
MirInputConfigurationEvent::MirInputConfigurationEvent()
1802
22
{
23
{
1803
23
    event.initInputConfiguration();
24
    event.initInputConfiguration();
1804
24
}
25
}
1805
25
26
1806
26
#pragma GCC diagnostic push
1807
27
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1808
28
MirInputConfigurationAction MirInputConfigurationEvent::action() const
27
MirInputConfigurationAction MirInputConfigurationEvent::action() const
1809
29
{
28
{
1810
30
    return static_cast<MirInputConfigurationAction>(event.asReader().getInputConfiguration().getAction());
29
    return static_cast<MirInputConfigurationAction>(event.asReader().getInputConfiguration().getAction());
1811
@@ -34,7 +33,6 @@
1812
34
{
33
{
1813
35
    event.getInputConfiguration().setAction(static_cast<mir::capnp::InputConfigurationEvent::Action>(action));
34
    event.getInputConfiguration().setAction(static_cast<mir::capnp::InputConfigurationEvent::Action>(action));
1814
36
}
35
}
1815
37
#pragma GCC diagnostic pop
1816
38
36
1817
39
std::chrono::nanoseconds MirInputConfigurationEvent::when() const
37
std::chrono::nanoseconds MirInputConfigurationEvent::when() const
1818
40
{
38
{
1819
41
39
1820
=== modified file 'src/include/common/mir/events/input_configuration_event.h'
1821
--- src/include/common/mir/events/input_configuration_event.h	2017-05-08 03:04:26 +0000
1822
+++ src/include/common/mir/events/input_configuration_event.h	2017-05-18 11:24:43 +0000
1823
@@ -37,8 +37,7 @@
1824
37
37
1825
38
    MirInputDeviceId id() const;
38
    MirInputDeviceId id() const;
1826
39
    void set_id(MirInputDeviceId id);
39
    void set_id(MirInputDeviceId id);
1829
40
}
40
};
1828
41
 __attribute__((deprecated));
1830
42
#pragma GCC diagnostic pop
41
#pragma GCC diagnostic pop
1831
43
42
1832
44
#endif /* MIR_COMMON_INPUT_CONFIGURATION_EVENT_H_ */
43
#endif /* MIR_COMMON_INPUT_CONFIGURATION_EVENT_H_ */
Status:	Merged
Approved by:	Brandon Schaefer on 2017-05-19
Approved revision:	no longer in the source branch.
Merged at revision:	4172
Proposed branch:	lp:~alan-griffiths/mir/deprecation-macros
Merge into:	lp:mir
Diff against target:	1832 lines (+294/-227) 27 files modified include/client/mir/event_printer.h (+5/-5) include/client/mir/events/event_builders.h (+10/-10) include/client/mir_toolkit/client_types.h (+25/-28) include/client/mir_toolkit/debug/surface.h (+4/-3) include/client/mir_toolkit/events/event.h (+11/-10) include/client/mir_toolkit/events/input_configuration_event.h (+8/-4) include/client/mir_toolkit/events/keymap_event.h (+1/-1) include/client/mir_toolkit/events/surface_event.h (+3/-2) include/client/mir_toolkit/events/surface_output_event.h (+6/-5) include/client/mir_toolkit/events/surface_placement.h (+2/-1) include/client/mir_toolkit/mir_blob.h (+3/-2) include/client/mir_toolkit/mir_buffer_stream.h (+13/-10) include/client/mir_toolkit/mir_connection.h (+11/-10) include/client/mir_toolkit/mir_cursor_configuration.h (+4/-3) include/client/mir_toolkit/mir_display_configuration.h (+3/-2) include/client/mir_toolkit/mir_persistent_id.h (+5/-4) include/client/mir_toolkit/mir_platform_message.h (+8/-7) include/client/mir_toolkit/mir_screencast.h (+2/-1) include/client/mir_toolkit/mir_surface.h (+61/-60) include/client/mir_toolkit/mir_wait.h (+3/-2) include/client/mir_toolkit/mir_window.h (+9/-33) include/client/mir_toolkit/rs/mir_render_surface.h (+49/-11) include/core/mir_toolkit/common.h (+8/-6) include/core/mir_toolkit/deprecations.h (+36/-0) include/server/mir/shell/basic_window_manager.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/deprecation-macros
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)		2017-05-16	Approve on 2017-05-19
Andreas Pokorny (community)			Approve on 2017-05-18
Mir CI Bot	continuous-integration		Approve on 2017-05-18
Review via email: mp+324124@code.launchpad.net