1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2017-02-17 02:24:03 +0000
3
+++ CMakeLists.txt	2017-05-26 16:23:13 +0000
4
@@ -29,7 +29,7 @@
5
29
29
6
30
set(MIR_VERSION_MAJOR 0)
30
set(MIR_VERSION_MAJOR 0)
7
31
set(MIR_VERSION_MINOR 26)
31
set(MIR_VERSION_MINOR 26)
9
32
set(MIR_VERSION_PATCH 2)
32
set(MIR_VERSION_PATCH 3)
10
33
33
11
34
add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
34
add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
12
35
add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
35
add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
13
36
36
14
=== modified file 'debian/changelog'
15
--- debian/changelog	2017-04-12 21:43:04 +0000
16
+++ debian/changelog	2017-05-26 16:23:13 +0000
17
@@ -1,3 +1,22 @@
18
1
mir (0.26.3-0ubuntu1) UNRELEASED; urgency=medium
19
2
20
3
  * New upstream release 0.26.3 (https://launchpad.net/mir/+milestone/0.26.3)
21
4
    - Enhancements:
22
5
      . Make deprecations optional (and default to off for builds on 16.04 LTS)
23
6
      . Added support for building on Ubuntu 17.10 artful.
24
7
    - Bugs fixed:
25
8
      . Mir needs to be updated to 0.26 in 16.04LTS (LP: #1685186)
26
9
      . unity-system-compositor crashed with SIGSEGV in
27
10
        libinput_device_config_accel_is_available() from
28
11
        libinput_device_config_accel_set_speed() from
29
12
        mir::input::evdev::LibInputDevice::apply_settings() (LP: #1672955)
30
13
      . Please transition to Boost 1.62 (LP: #1675138)
31
14
      . Mir sending key repeat events continually to nested shell after VT
32
15
        switch (causes Unity8 lockup for a while) (LP: #1675357)
33
16
      . mir_demo_standalone_render_overlays fails to link (LP: #1677239)
34
17
35
18
 -- Daniel van Vugt <daniel.van.vugt@canonical.com>  Thu, 30 Mar 2017 11:43:28 +0800
36
19
37
1
mir (0.26.2+17.04.20170322.1-0ubuntu2) zesty; urgency=medium
20
mir (0.26.2+17.04.20170322.1-0ubuntu2) zesty; urgency=medium
38
2
21
39
3
  [ Mattia Rizzolo ]
22
  [ Mattia Rizzolo ]
40
4
23
41
=== modified file 'include/client/mir/event_printer.h'
42
--- include/client/mir/event_printer.h	2017-01-19 05:30:03 +0000
43
+++ include/client/mir/event_printer.h	2017-05-26 16:23:13 +0000
44
@@ -35,19 +35,19 @@
45
35
std::ostream& operator<<(std::ostream& out, MirOrientation orientation);
35
std::ostream& operator<<(std::ostream& out, MirOrientation orientation);
46
36
36
47
37
std::ostream& operator<<(std::ostream& out, MirSurfaceAttrib attribute)
37
std::ostream& operator<<(std::ostream& out, MirSurfaceAttrib attribute)
49
38
__attribute__ ((deprecated("use << with MirWindowAttrib instead")));
38
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowAttrib instead");
50
39
std::ostream& operator<<(std::ostream& out, MirWindowAttrib attribute);
39
std::ostream& operator<<(std::ostream& out, MirWindowAttrib attribute);
51
40
std::ostream& operator<<(std::ostream& out, MirSurfaceFocusState state)
40
std::ostream& operator<<(std::ostream& out, MirSurfaceFocusState state)
53
41
__attribute__ ((deprecated("use << with MirWindowFocusState instead")));
41
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowFocusState instead");
54
42
std::ostream& operator<<(std::ostream& out, MirWindowFocusState state);
42
std::ostream& operator<<(std::ostream& out, MirWindowFocusState state);
55
43
std::ostream& operator<<(std::ostream& out, MirSurfaceVisibility state)
43
std::ostream& operator<<(std::ostream& out, MirSurfaceVisibility state)
57
44
__attribute__ ((deprecated("use << with MirWindowVisibility instead")));
44
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowVisibility instead");
58
45
std::ostream& operator<<(std::ostream& out, MirWindowVisibility state);
45
std::ostream& operator<<(std::ostream& out, MirWindowVisibility state);
59
46
std::ostream& operator<<(std::ostream& out, MirSurfaceType type)
46
std::ostream& operator<<(std::ostream& out, MirSurfaceType type)
61
47
__attribute__ ((deprecated("use << with MirWindowType instead")));
47
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowType instead");
62
48
std::ostream& operator<<(std::ostream& out, MirWindowType type);
48
std::ostream& operator<<(std::ostream& out, MirWindowType type);
63
49
std::ostream& operator<<(std::ostream& out, MirSurfaceState state)
49
std::ostream& operator<<(std::ostream& out, MirSurfaceState state)
65
50
__attribute__ ((deprecated("use << with MirWindowState instead")));
50
MIR_FOR_REMOVAL_IN_VERSION_1("use << with MirWindowState instead");
66
51
std::ostream& operator<<(std::ostream& out, MirWindowState state);
51
std::ostream& operator<<(std::ostream& out, MirWindowState state);
67
52
52
68
53
std::ostream& operator<<(std::ostream& out, MirPromptSessionEvent const& event);
53
std::ostream& operator<<(std::ostream& out, MirPromptSessionEvent const& event);
69
54
54
70
=== modified file 'include/client/mir/events/event_builders.h'
71
--- include/client/mir/events/event_builders.h	2017-01-19 05:30:03 +0000
72
+++ include/client/mir/events/event_builders.h	2017-05-26 16:23:13 +0000
73
@@ -48,7 +48,7 @@
74
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);
75
49
// Surface configure event
49
// Surface configure event
76
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)
78
51
__attribute__ ((deprecated("use make_event with MirWindowAttribute instead")));
51
MIR_FOR_REMOVAL_IN_VERSION_1("use make_event with MirWindowAttribute instead");
79
52
// Window configure event
52
// Window configure event
80
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);
81
54
// Close surface event
54
// Close surface event
82
@@ -81,12 +81,12 @@
83
81
// Deprecated version with uint64_t mac
81
// Deprecated version with uint64_t mac
84
82
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
82
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
85
83
    uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
83
    uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
87
84
    int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
84
    int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
88
85
85
89
86
// Deprecated version without mac
86
// Deprecated version without mac
90
87
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
87
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
91
88
    MirKeyboardAction action, xkb_keysym_t key_code,
88
    MirKeyboardAction action, xkb_keysym_t key_code,
93
89
    int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
89
    int scan_code, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
94
90
90
95
91
// Touch event
91
// Touch event
96
92
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
92
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
97
@@ -94,11 +94,11 @@
98
94
94
99
95
// Deprecated version with uint64_t mac
95
// Deprecated version with uint64_t mac
100
96
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
96
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
102
97
    uint64_t mac, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
97
    uint64_t mac, MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
103
98
98
104
99
// Deprecated version without mac
99
// Deprecated version without mac
105
100
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
100
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
107
101
    MirInputEventModifiers modifiers) __attribute__ ((deprecated));
101
    MirInputEventModifiers modifiers) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
108
102
102
109
103
void add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
103
void add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
110
104
    MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,
104
    MirTouchTooltype tooltype, float x_axis_value, float y_axis_value,
111
@@ -110,14 +110,14 @@
112
110
    uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
110
    uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
113
111
    MirPointerButtons buttons_pressed,
111
    MirPointerButtons buttons_pressed,
114
112
    float x_axis_value, float y_axis_value,
112
    float x_axis_value, float y_axis_value,
116
113
    float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
113
    float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
117
114
114
118
115
// Deprecated version without relative axis and mac
115
// Deprecated version without relative axis and mac
119
116
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
116
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
120
117
    MirInputEventModifiers modifiers, MirPointerAction action,
117
    MirInputEventModifiers modifiers, MirPointerAction action,
121
118
    MirPointerButtons buttons_pressed,
118
    MirPointerButtons buttons_pressed,
122
119
    float x_axis_value, float y_axis_value,
119
    float x_axis_value, float y_axis_value,
124
120
    float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
120
    float hscroll_value, float vscroll_value) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
125
121
121
126
122
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
122
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
127
123
    std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers, MirPointerAction action,
123
    std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers, MirPointerAction action,
128
@@ -132,7 +132,7 @@
129
132
    MirPointerButtons buttons_pressed,
132
    MirPointerButtons buttons_pressed,
130
133
    float x_axis_value, float y_axis_value,
133
    float x_axis_value, float y_axis_value,
131
134
    float hscroll_value, float vscroll_value,
134
    float hscroll_value, float vscroll_value,
133
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");
134
136
136
135
137
// Deprecated version without mac
137
// Deprecated version without mac
136
138
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
138
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
137
@@ -140,11 +140,11 @@
138
140
    MirPointerButtons buttons_pressed,
140
    MirPointerButtons buttons_pressed,
139
141
    float x_axis_value, float y_axis_value,
141
    float x_axis_value, float y_axis_value,
140
142
    float hscroll_value, float vscroll_value,
142
    float hscroll_value, float vscroll_value,
142
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");
143
144
144
144
145
// Input configuration event
145
// Input configuration event
145
146
EventUPtr make_event(MirInputConfigurationAction action,
146
EventUPtr make_event(MirInputConfigurationAction action,
147
147
    MirInputDeviceId id, std::chrono::nanoseconds time) __attribute__((deprecated));
147
    MirInputDeviceId id, std::chrono::nanoseconds time) MIR_FOR_REMOVAL_IN_VERSION_1("unused");
148
148
148
149
149
EventUPtr make_event(std::chrono::nanoseconds timestamp,
149
EventUPtr make_event(std::chrono::nanoseconds timestamp,
150
150
                     MirPointerButtons pointer_buttons,
150
                     MirPointerButtons pointer_buttons,
151
151
151
152
=== modified file 'include/client/mir_toolkit/client_types.h'
153
--- include/client/mir_toolkit/client_types.h	2017-03-16 16:47:21 +0000
154
+++ include/client/mir_toolkit/client_types.h	2017-05-26 16:23:13 +0000
155
@@ -23,6 +23,7 @@
156
23
23
157
24
#include <mir_toolkit/events/event.h>
24
#include <mir_toolkit/events/event.h>
158
25
#include <mir_toolkit/common.h>
25
#include <mir_toolkit/common.h>
159
26
#include <mir_toolkit/deprecations.h>
160
26
27
161
27
#include <stddef.h>
28
#include <stddef.h>
162
28
29
163
@@ -38,23 +39,22 @@
164
38
typedef void* MirEGLNativeWindowType;
39
typedef void* MirEGLNativeWindowType;
165
39
typedef void* MirEGLNativeDisplayType;
40
typedef void* MirEGLNativeDisplayType;
166
40
typedef struct MirConnection MirConnection;
41
typedef struct MirConnection MirConnection;
168
41
typedef struct MirSurface MirSurface __attribute__((deprecated("Use MirWindow instead")));
42
typedef struct MirSurface MirSurface MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindow instead");
169
42
typedef struct MirSurface MirWindow;
43
typedef struct MirSurface MirWindow;
171
43
typedef struct MirSurfaceSpec MirSurfaceSpec __attribute__((deprecated("Use MirWindowSpec instead")));
44
typedef struct MirSurfaceSpec MirSurfaceSpec MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowSpec instead");
172
44
typedef struct MirSurfaceSpec MirWindowSpec;
45
typedef struct MirSurfaceSpec MirWindowSpec;
173
45
typedef struct MirScreencast MirScreencast;
46
typedef struct MirScreencast MirScreencast;
174
46
typedef struct MirScreencastSpec MirScreencastSpec;
47
typedef struct MirScreencastSpec MirScreencastSpec;
175
47
typedef struct MirPromptSession MirPromptSession;
48
typedef struct MirPromptSession MirPromptSession;
176
48
typedef struct MirBufferStream MirBufferStream;
49
typedef struct MirBufferStream MirBufferStream;
178
49
typedef struct MirPersistentId MirPersistentId __attribute((deprecated("Use MirWindowId instead")));
50
typedef struct MirPersistentId MirPersistentId MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowId instead");
179
50
typedef struct MirPersistentId MirWindowId;
51
typedef struct MirPersistentId MirWindowId;
180
51
typedef struct MirBlob MirBlob;
52
typedef struct MirBlob MirBlob;
181
52
typedef struct MirDisplayConfig MirDisplayConfig;
53
typedef struct MirDisplayConfig MirDisplayConfig;
182
53
typedef struct MirError MirError;
54
typedef struct MirError MirError;
183
54
typedef struct MirPresentationChain MirPresentationChain;
55
typedef struct MirPresentationChain MirPresentationChain;
184
55
typedef struct MirBuffer MirBuffer;
56
typedef struct MirBuffer MirBuffer;
187
56
typedef struct MirRenderSurface MirRenderSurface
57
typedef struct MirRenderSurface MirRenderSurface;
186
57
__attribute__((deprecated("This type is slated for rename due to MirRenderSurface-->MirSurface transition")));
188
58
58
189
59
/**
59
/**
190
60
 * Descriptor for an output connection.
60
 * Descriptor for an output connection.
191
@@ -82,7 +82,7 @@
192
82
typedef void (*MirConnectedCallback)(
82
typedef void (*MirConnectedCallback)(
193
83
    MirConnection *connection, void *client_context);
83
    MirConnection *connection, void *client_context);
194
84
typedef MirConnectedCallback mir_connected_callback
84
typedef MirConnectedCallback mir_connected_callback
196
85
    __attribute__((deprecated("Use MirConnectedCallback instead")));
85
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirConnectedCallback instead");
197
86
86
198
87
/**
87
/**
199
88
 * Callback to be passed when calling window functions :
88
 * Callback to be passed when calling window functions :
200
@@ -102,7 +102,7 @@
201
102
typedef void (*MirBufferStreamCallback)(
102
typedef void (*MirBufferStreamCallback)(
202
103
    MirBufferStream *stream, void *client_context);
103
    MirBufferStream *stream, void *client_context);
203
104
typedef MirBufferStreamCallback mir_buffer_stream_callback
104
typedef MirBufferStreamCallback mir_buffer_stream_callback
205
105
    __attribute__((deprecated("Use MirBufferStreamCallback instead")));
105
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirBufferStreamCallback instead");
206
106
106
207
107
/**
107
/**
208
108
 * Callback for handling of window events.
108
 * Callback for handling of window events.
209
@@ -124,7 +124,7 @@
210
124
typedef void (*MirLifecycleEventCallback)(
124
typedef void (*MirLifecycleEventCallback)(
211
125
    MirConnection* connection, MirLifecycleState state, void* context);
125
    MirConnection* connection, MirLifecycleState state, void* context);
212
126
typedef MirLifecycleEventCallback mir_lifecycle_event_callback
126
typedef MirLifecycleEventCallback mir_lifecycle_event_callback
214
127
    __attribute__((deprecated("Use MirLifecycleEventCallback instead")));
127
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirLifecycleEventCallback instead");
215
128
128
216
129
/**
129
/**
217
130
 * Callback called when the server pings for responsiveness testing.
130
 * Callback called when the server pings for responsiveness testing.
218
@@ -136,7 +136,7 @@
219
136
typedef void (*MirPingEventCallback)(
136
typedef void (*MirPingEventCallback)(
220
137
    MirConnection* connection, int32_t serial, void* context);
137
    MirConnection* connection, int32_t serial, void* context);
221
138
typedef MirPingEventCallback mir_ping_event_callback
138
typedef MirPingEventCallback mir_ping_event_callback
223
139
    __attribute__((deprecated("Use MirPingEventCallback instead")));
139
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirPingEventCallback instead");
224
140
140
225
141
/**
141
/**
226
142
 * Callback called when a display config change has occurred
142
 * Callback called when a display config change has occurred
227
@@ -147,7 +147,7 @@
228
147
typedef void (*MirDisplayConfigCallback)(
147
typedef void (*MirDisplayConfigCallback)(
229
148
    MirConnection* connection, void* context);
148
    MirConnection* connection, void* context);
230
149
typedef MirDisplayConfigCallback mir_display_config_callback
149
typedef MirDisplayConfigCallback mir_display_config_callback
232
150
    __attribute__((deprecated("Use MirDisplayConfigCallback instead")));
150
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirDisplayConfigCallback instead");
233
151
151
234
152
/**
152
/**
235
153
 * Callback called when a request for client file descriptors completes
153
 * Callback called when a request for client file descriptors completes
236
@@ -162,7 +162,7 @@
237
162
typedef void (*MirClientFdCallback)(
162
typedef void (*MirClientFdCallback)(
238
163
    MirPromptSession *prompt_session, size_t count, int const* fds, void* context);
163
    MirPromptSession *prompt_session, size_t count, int const* fds, void* context);
239
164
typedef MirClientFdCallback mir_client_fd_callback
164
typedef MirClientFdCallback mir_client_fd_callback
241
165
    __attribute__((deprecated("Use MirClientFdCallback instead")));
165
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirClientFdCallback instead");
242
166
166
243
167
#pragma GCC diagnostic push
167
#pragma GCC diagnostic push
244
168
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
168
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
245
@@ -201,7 +201,7 @@
246
201
     * use the value mir_display_output_id_invalid.
201
     * use the value mir_display_output_id_invalid.
247
202
     */
202
     */
248
203
    uint32_t output_id;
203
    uint32_t output_id;
250
204
} MirSurfaceParameters __attribute__((deprecated("Use MirWindowParameters instead")));
204
} MirSurfaceParameters MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_get apis or listen for attribute events instead");
251
205
205
252
206
enum { mir_platform_package_max = 32 };
206
enum { mir_platform_package_max = 32 };
253
207
207
254
@@ -214,7 +214,7 @@
255
214
 * \todo This should be removed from the public API at the next API break.
214
 * \todo This should be removed from the public API at the next API break.
256
215
 */
215
 */
257
216
#ifndef __cplusplus
216
#ifndef __cplusplus
259
217
__attribute__ ((deprecated))
217
MIR_FOR_REMOVAL_IN_VERSION_1("Use of this type is inherently non-portable")
260
218
#endif
218
#endif
261
219
typedef enum MirPlatformType
219
typedef enum MirPlatformType
262
220
{
220
{
263
@@ -429,7 +429,7 @@
264
429
typedef void (*MirScreencastCallback)(
429
typedef void (*MirScreencastCallback)(
265
430
    MirScreencast *screencast, void *client_context);
430
    MirScreencast *screencast, void *client_context);
266
431
typedef MirScreencastCallback mir_screencast_callback
431
typedef MirScreencastCallback mir_screencast_callback
268
432
    __attribute__((deprecated("Use MirScreencastCallback instead")));
432
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirScreencastCallback instead");
269
433
433
270
434
/**
434
/**
271
435
 * Callback member of MirPromptSession for handling of prompt sessions.
435
 * Callback member of MirPromptSession for handling of prompt sessions.
272
@@ -439,7 +439,7 @@
273
439
typedef void (*MirPromptSessionCallback)(
439
typedef void (*MirPromptSessionCallback)(
274
440
    MirPromptSession* prompt_provider, void* context);
440
    MirPromptSession* prompt_provider, void* context);
275
441
typedef MirPromptSessionCallback mir_prompt_session_callback
441
typedef MirPromptSessionCallback mir_prompt_session_callback
277
442
    __attribute__((deprecated("Use MirPromptSessionCallback instead")));
442
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirPromptSessionCallback instead");
278
443
443
279
444
/**
444
/**
280
445
 * Callback member of MirPromptSession for handling of prompt sessions events.
445
 * Callback member of MirPromptSession for handling of prompt sessions events.
281
@@ -452,7 +452,7 @@
282
452
    void* context);
452
    void* context);
283
453
typedef MirPromptSessionStateChangeCallback
453
typedef MirPromptSessionStateChangeCallback
284
454
        mir_prompt_session_state_change_callback
454
        mir_prompt_session_state_change_callback
286
455
    __attribute__((deprecated("Use MirPromptSessionStateChangeCallback instead")));
455
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirPromptSessionStateChangeCallback instead");
287
456
456
288
457
/**
457
/**
289
458
 * Callback called when a platform operation completes.
458
 * Callback called when a platform operation completes.
290
@@ -467,7 +467,7 @@
291
467
typedef void (*MirPlatformOperationCallback)(
467
typedef void (*MirPlatformOperationCallback)(
292
468
    MirConnection* connection, MirPlatformMessage* reply, void* context);
468
    MirConnection* connection, MirPlatformMessage* reply, void* context);
293
469
typedef MirPlatformOperationCallback mir_platform_operation_callback
469
typedef MirPlatformOperationCallback mir_platform_operation_callback
295
470
    __attribute__((deprecated("Use MirPlatformOperationCallback instead")));
470
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirPlatformOperationCallback instead");
296
471
471
297
472
/**
472
/**
298
473
 * Callback called when a change of input devices has occurred
473
 * Callback called when a change of input devices has occurred
299
@@ -479,7 +479,7 @@
300
479
typedef void (*MirInputConfigCallback)(
479
typedef void (*MirInputConfigCallback)(
301
480
    MirConnection* connection, void* context);
480
    MirConnection* connection, void* context);
302
481
typedef MirInputConfigCallback mir_input_config_callback
481
typedef MirInputConfigCallback mir_input_config_callback
304
482
    __attribute__((deprecated("Use MirInputConfigCallback instead")));
482
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirInputConfigCallback instead");
305
483
483
306
484
typedef void (*MirBufferCallback)(MirBuffer*, void* context);
484
typedef void (*MirBufferCallback)(MirBuffer*, void* context);
307
485
485
308
@@ -539,24 +539,21 @@
309
539
typedef void (*MirErrorCallback)(
539
typedef void (*MirErrorCallback)(
310
540
    MirConnection* connection, MirError const* error, void* context);
540
    MirConnection* connection, MirError const* error, void* context);
311
541
typedef MirErrorCallback mir_error_callback
541
typedef MirErrorCallback mir_error_callback
313
542
    __attribute__((deprecated("Use MirErrorCallback instead")));
542
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirErrorCallback instead");
314
543
543
315
544
#pragma GCC diagnostic push
544
#pragma GCC diagnostic push
316
545
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
545
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
317
546
546
318
547
typedef void (*mir_surface_callback)(MirSurface *surface, void *client_context)
547
typedef void (*mir_surface_callback)(MirSurface *surface, void *client_context)
320
548
__attribute__((deprecated("Use MirWindowCallback instead")));
548
MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowCallback instead");
321
549
549
322
550
typedef void (*mir_surface_event_callback)(
550
typedef void (*mir_surface_event_callback)(
323
551
    MirSurface* surface, MirEvent const* event, void* context)
551
    MirSurface* surface, MirEvent const* event, void* context)
325
552
__attribute__((deprecated("Use MirWindowEventCallback instead")));
552
MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowEventCallback instead");
326
553
553
327
554
typedef void (*mir_surface_id_callback)(
554
typedef void (*mir_surface_id_callback)(
328
555
    MirSurface* surface, MirPersistentId* id, void* context)
555
    MirSurface* surface, MirPersistentId* id, void* context)
333
556
__attribute__((deprecated("Use MirWindowIdCallback instead")));
556
MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowIdCallback instead");
330
557
331
558
typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
332
559
__attribute__((deprecated("This type is slated for rename due to MirRenderSurface-->MirSurface transition")));
334
560
557
335
561
typedef MirSurfaceParameters MirWindowParameters;
558
typedef MirSurfaceParameters MirWindowParameters;
336
562
559
337
563
560
338
=== modified file 'include/client/mir_toolkit/debug/surface.h'
339
--- include/client/mir_toolkit/debug/surface.h	2017-01-18 04:43:15 +0000
340
+++ include/client/mir_toolkit/debug/surface.h	2017-05-26 16:23:13 +0000
341
@@ -19,6 +19,7 @@
342
19
#define MIR_CLIENT_LIBRARY_DEBUG_H
19
#define MIR_CLIENT_LIBRARY_DEBUG_H
343
20
20
344
21
#include <mir_toolkit/mir_client_library.h>
21
#include <mir_toolkit/mir_client_library.h>
345
22
#include <mir_toolkit/deprecations.h>
346
22
23
347
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
348
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 */
349
@@ -65,13 +66,13 @@
350
65
bool mir_debug_surface_coords_to_screen(MirSurface *surface,
66
bool mir_debug_surface_coords_to_screen(MirSurface *surface,
351
66
                                       int x, int y,
67
                                       int x, int y,
352
67
                                       int* screen_x, int* screen_y)
68
                                       int* screen_x, int* screen_y)
354
68
__attribute__((deprecated("Use mir_extension_window_coordinate_translation instead")));
69
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_extension_window_coordinate_translation instead");
355
69
70
356
70
int mir_debug_surface_id(MirSurface *surface)
71
int mir_debug_surface_id(MirSurface *surface)
358
71
__attribute__((deprecated("Use mir_debug_window_id() instead")));
72
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_debug_window_id() instead");
359
72
73
360
73
uint32_t mir_debug_surface_current_buffer_id(MirSurface *surface)
74
uint32_t mir_debug_surface_current_buffer_id(MirSurface *surface)
362
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");
363
75
76
364
76
#pragma GCC diagnostic pop
77
#pragma GCC diagnostic pop
365
77
78
366
78
79
367
=== modified file 'include/client/mir_toolkit/events/event.h'
368
--- include/client/mir_toolkit/events/event.h	2017-01-25 08:12:00 +0000
369
+++ include/client/mir_toolkit/events/event.h	2017-05-26 16:23:13 +0000
370
@@ -22,6 +22,7 @@
371
22
#include <stddef.h>
22
#include <stddef.h>
372
23
#include <stdint.h>
23
#include <stdint.h>
373
24
#include "mir_toolkit/common.h"
24
#include "mir_toolkit/common.h"
374
25
#include <mir_toolkit/deprecations.h>
375
25
26
376
26
#ifdef __cplusplus
27
#ifdef __cplusplus
377
27
/**
28
/**
378
@@ -58,24 +59,24 @@
379
58
#pragma GCC diagnostic pop
59
#pragma GCC diagnostic pop
380
59
60
381
60
typedef struct MirSurfaceEvent MirSurfaceEvent
61
typedef struct MirSurfaceEvent MirSurfaceEvent
383
61
    __attribute__ ((deprecated("use MirWindowEvent instead")));
62
    MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowEvent instead");
384
62
typedef struct MirSurfaceEvent MirWindowEvent;
63
typedef struct MirSurfaceEvent MirWindowEvent;
385
63
typedef struct MirResizeEvent MirResizeEvent;
64
typedef struct MirResizeEvent MirResizeEvent;
386
64
typedef struct MirPromptSessionEvent MirPromptSessionEvent;
65
typedef struct MirPromptSessionEvent MirPromptSessionEvent;
387
65
typedef struct MirOrientationEvent MirOrientationEvent;
66
typedef struct MirOrientationEvent MirOrientationEvent;
388
66
typedef struct MirCloseSurfaceEvent MirCloseSurfaceEvent
67
typedef struct MirCloseSurfaceEvent MirCloseSurfaceEvent
390
67
    __attribute__ ((deprecated("use MirCloseWindowEvent instead")));
68
    MIR_FOR_REMOVAL_IN_VERSION_1("use MirCloseWindowEvent instead");
391
68
typedef struct MirCloseSurfaceEvent MirCloseWindowEvent;
69
typedef struct MirCloseSurfaceEvent MirCloseWindowEvent;
392
69
typedef struct MirInputEvent MirInputEvent;
70
typedef struct MirInputEvent MirInputEvent;
393
70
typedef struct MirKeymapEvent MirKeymapEvent;
71
typedef struct MirKeymapEvent MirKeymapEvent;
394
71
typedef struct MirInputConfigurationEvent MirInputConfigurationEvent 
72
typedef struct MirInputConfigurationEvent MirInputConfigurationEvent 
396
72
    __attribute__ ((deprecated("Use MirInputDeviceStateEvent and the MirInputConfig callback instead")));
73
    MIR_FOR_REMOVAL_IN_VERSION_1("Use MirInputDeviceStateEvent and the MirInputConfig callback instead");
397
73
typedef struct MirSurfaceOutputEvent MirSurfaceOutputEvent
74
typedef struct MirSurfaceOutputEvent MirSurfaceOutputEvent
399
74
    __attribute__ ((deprecated("use MirWindowOutputEvent instead")));
75
    MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowOutputEvent instead");
400
75
typedef struct MirSurfaceOutputEvent MirWindowOutputEvent;
76
typedef struct MirSurfaceOutputEvent MirWindowOutputEvent;
401
76
typedef struct MirInputDeviceStateEvent MirInputDeviceStateEvent;
77
typedef struct MirInputDeviceStateEvent MirInputDeviceStateEvent;
402
77
typedef struct MirSurfacePlacementEvent MirSurfacePlacementEvent
78
typedef struct MirSurfacePlacementEvent MirSurfacePlacementEvent
404
78
    __attribute__ ((deprecated("use MirWindowPlacementEvent instead")));
79
    MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowPlacementEvent instead");
405
79
typedef struct MirSurfacePlacementEvent MirWindowPlacementEvent;
80
typedef struct MirSurfacePlacementEvent MirWindowPlacementEvent;
406
80
81
407
81
typedef struct MirCookie MirCookie;
82
typedef struct MirCookie MirCookie;
408
@@ -136,7 +137,7 @@
409
136
 * \return           The associated MirSurfaceEvent
137
 * \return           The associated MirSurfaceEvent
410
137
 */
138
 */
411
138
MirSurfaceEvent const* mir_event_get_surface_event(MirEvent const* event)
139
MirSurfaceEvent const* mir_event_get_surface_event(MirEvent const* event)
413
139
__attribute__ ((deprecated("use mir_event_get_window_event instead")));
140
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_event_get_window_event instead");
414
140
141
415
141
/**
142
/**
416
142
 * Retrieve the MirWindowEvent associated with a MirEvent of
143
 * Retrieve the MirWindowEvent associated with a MirEvent of
417
@@ -195,7 +196,7 @@
418
195
 * \return           The associated MirCloseSurfaceEvent
196
 * \return           The associated MirCloseSurfaceEvent
419
196
 */
197
 */
420
197
/// @cond
198
/// @cond
422
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")
423
199
/// @endcond
200
/// @endcond
424
200
MirCloseSurfaceEvent const* mir_event_get_close_surface_event(MirEvent const* event);
201
MirCloseSurfaceEvent const* mir_event_get_close_surface_event(MirEvent const* event);
425
201
#pragma GCC diagnostic pop
202
#pragma GCC diagnostic pop
426
@@ -223,7 +224,7 @@
427
223
 * \return           The associated MirInputConfigurationEvent
224
 * \return           The associated MirInputConfigurationEvent
428
224
 */
225
 */
429
225
/// @cond
226
/// @cond
431
226
__attribute__((deprecated))
227
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback")
432
227
/// @endcond
228
/// @endcond
433
228
MirInputConfigurationEvent const* mir_event_get_input_configuration_event(MirEvent const* event);
229
MirInputConfigurationEvent const* mir_event_get_input_configuration_event(MirEvent const* event);
434
229
#pragma GCC diagnostic pop
230
#pragma GCC diagnostic pop
435
@@ -242,7 +243,7 @@
436
242
 * \return           The associated MirSurfaceOutputEvent
243
 * \return           The associated MirSurfaceOutputEvent
437
243
 */
244
 */
438
244
MirSurfaceOutputEvent const* mir_event_get_surface_output_event(MirEvent const* event)
245
MirSurfaceOutputEvent const* mir_event_get_surface_output_event(MirEvent const* event)
440
245
__attribute__((deprecated("use mir_event_get_window_output_event")));
246
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_event_get_window_output_event");
441
246
247
442
247
/**
248
/**
443
248
 * Retrieve the MirWindowOutputEvent associated with a MirEvent of type
249
 * Retrieve the MirWindowOutputEvent associated with a MirEvent of type
444
@@ -279,7 +280,7 @@
445
279
 * \return           The associated MirSurfacePlacementEvent
280
 * \return           The associated MirSurfacePlacementEvent
446
280
 */
281
 */
447
281
MirSurfacePlacementEvent const* mir_event_get_surface_placement_event(MirEvent const* event)
282
MirSurfacePlacementEvent const* mir_event_get_surface_placement_event(MirEvent const* event)
449
282
__attribute__((deprecated("use mir_event_get_window_placement_event")));
283
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_event_get_window_placement_event");
450
283
284
451
284
/**
285
/**
452
285
 * Retrieve the MirWindowPlacementEvent associated with a MirEvent of
286
 * Retrieve the MirWindowPlacementEvent associated with a MirEvent of
453
286
287
454
=== modified file 'include/client/mir_toolkit/events/input_configuration_event.h'
455
--- include/client/mir_toolkit/events/input_configuration_event.h	2017-01-20 16:27:50 +0000
456
+++ include/client/mir_toolkit/events/input_configuration_event.h	2017-05-26 16:23:13 +0000
457
@@ -20,6 +20,7 @@
458
20
#define MIR_TOOLKIT_EVENTS_INPUT_CONFIGURATION_EVENT_H_
20
#define MIR_TOOLKIT_EVENTS_INPUT_CONFIGURATION_EVENT_H_
459
21
21
460
22
#include <mir_toolkit/events/event.h>
22
#include <mir_toolkit/events/event.h>
461
23
#include <mir_toolkit/deprecations.h>
462
23
24
463
24
#ifdef __cplusplus
25
#ifdef __cplusplus
464
25
/**
26
/**
465
@@ -45,7 +46,7 @@
466
45
    mir_input_configuration_action_configuration_changed,
46
    mir_input_configuration_action_configuration_changed,
467
46
    mir_input_configuration_action_device_reset
47
    mir_input_configuration_action_device_reset
468
47
} MirInputConfigurationAction
48
} MirInputConfigurationAction
470
48
__attribute__((deprecated));
49
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback");
471
49
50
472
50
#pragma GCC diagnostic push
51
#pragma GCC diagnostic push
473
51
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
52
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
474
@@ -55,7 +56,8 @@
475
55
 * \param[in] ev The input configuration event
56
 * \param[in] ev The input configuration event
476
56
 * \return       The action
57
 * \return       The action
477
57
 */
58
 */
479
58
MirInputConfigurationAction mir_input_configuration_event_get_action(MirInputConfigurationEvent const* ev) __attribute__((deprecated));
59
MirInputConfigurationAction mir_input_configuration_event_get_action(MirInputConfigurationEvent const* ev)
480
60
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback");
481
59
61
482
60
/**
62
/**
483
61
 * Retreive the time associated with a MirInputConfiguration event
63
 * Retreive the time associated with a MirInputConfiguration event
484
@@ -63,7 +65,8 @@
485
63
 * \param[in] ev The input configuration event
65
 * \param[in] ev The input configuration event
486
64
 * \return       The time in nanoseconds since epoch
66
 * \return       The time in nanoseconds since epoch
487
65
 */
67
 */
489
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)
490
69
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback");
491
67
70
492
68
/**
71
/**
493
69
 * Retreive the device id associated with a MirInputConfiguration event
72
 * Retreive the device id associated with a MirInputConfiguration event
494
@@ -71,7 +74,8 @@
495
71
 * \param[in] ev The input configuration event
74
 * \param[in] ev The input configuration event
496
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
497
73
 */
76
 */
499
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)
500
78
MIR_FOR_REMOVAL_IN_VERSION_1("Input devices and changes to the input devices are indicated via the MirInputConfigCallback");
501
75
#pragma GCC diagnostic pop
79
#pragma GCC diagnostic pop
502
76
80
503
77
#ifdef __cplusplus
81
#ifdef __cplusplus
504
78
82
505
=== modified file 'include/client/mir_toolkit/events/keymap_event.h'
506
--- include/client/mir_toolkit/events/keymap_event.h	2017-01-18 02:29:37 +0000
507
+++ include/client/mir_toolkit/events/keymap_event.h	2017-05-26 16:23:13 +0000
508
@@ -42,7 +42,7 @@
509
42
 */
42
 */
510
43
void mir_keymap_event_get_rules(MirKeymapEvent const* ev,
43
void mir_keymap_event_get_rules(MirKeymapEvent const* ev,
511
44
                                struct xkb_rule_names* rules)
44
                                struct xkb_rule_names* rules)
513
45
    __attribute__ ((deprecated));
45
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_keymap_event_get_keymap_buffer() instead");
514
46
46
515
47
/**
47
/**
516
48
 * Retrieve the new keymap reported by this MirKeymapEvent
48
 * Retrieve the new keymap reported by this MirKeymapEvent
517
49
49
518
=== modified file 'include/client/mir_toolkit/events/surface_event.h'
519
--- include/client/mir_toolkit/events/surface_event.h	2017-01-23 03:38:33 +0000
520
+++ include/client/mir_toolkit/events/surface_event.h	2017-05-26 16:23:13 +0000
521
@@ -20,6 +20,7 @@
522
20
#define MIR_TOOLKIT_EVENTS_SURFACE_EVENT_H_
20
#define MIR_TOOLKIT_EVENTS_SURFACE_EVENT_H_
523
21
21
524
22
#include <mir_toolkit/events/event.h>
22
#include <mir_toolkit/events/event.h>
525
23
#include <mir_toolkit/deprecations.h>
526
23
24
527
24
#ifdef __cplusplus
25
#ifdef __cplusplus
528
25
/**
26
/**
529
@@ -39,7 +40,7 @@
530
39
 * \return           The associated attribute
40
 * \return           The associated attribute
531
40
 */
41
 */
532
41
MirSurfaceAttrib mir_surface_event_get_attribute(MirSurfaceEvent const* event)
42
MirSurfaceAttrib mir_surface_event_get_attribute(MirSurfaceEvent const* event)
534
42
__attribute__ ((deprecated("use mir_window_event_get_attribute instead")));
43
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_event_get_attribute instead");
535
43
44
536
44
/**
45
/**
537
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
538
@@ -48,7 +49,7 @@
539
48
 * \return           The associated attribute value
49
 * \return           The associated attribute value
540
49
 */
50
 */
541
50
int mir_surface_event_get_attribute_value(MirSurfaceEvent const* event)
51
int mir_surface_event_get_attribute_value(MirSurfaceEvent const* event)
543
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");
544
52
#pragma GCC diagnostic pop
53
#pragma GCC diagnostic pop
545
53
54
546
54
#ifdef __cplusplus
55
#ifdef __cplusplus
547
55
56
548
=== modified file 'include/client/mir_toolkit/events/surface_output_event.h'
549
--- include/client/mir_toolkit/events/surface_output_event.h	2017-01-23 03:38:33 +0000
550
+++ include/client/mir_toolkit/events/surface_output_event.h	2017-05-26 16:23:13 +0000
551
@@ -20,6 +20,7 @@
552
20
#define MIR_TOOLKIT_SURFACE_OUTPUT_EVENT_H_
20
#define MIR_TOOLKIT_SURFACE_OUTPUT_EVENT_H_
553
21
21
554
22
#include <mir_toolkit/events/event.h>
22
#include <mir_toolkit/events/event.h>
555
23
#include <mir_toolkit/deprecations.h>
556
23
24
557
24
#ifdef __cplusplus
25
#ifdef __cplusplus
558
25
/**
26
/**
559
@@ -39,7 +40,7 @@
560
39
 * \return          The new DPI value for the surface is primarily on.
40
 * \return          The new DPI value for the surface is primarily on.
561
40
 */
41
 */
562
41
int mir_surface_output_event_get_dpi(MirSurfaceOutputEvent const* ev)
42
int mir_surface_output_event_get_dpi(MirSurfaceOutputEvent const* ev)
564
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");
565
43
44
566
44
/**
45
/**
567
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
568
@@ -48,7 +49,7 @@
569
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.
570
49
 */
50
 */
571
50
MirFormFactor mir_surface_output_event_get_form_factor(MirSurfaceOutputEvent const* ev)
51
MirFormFactor mir_surface_output_event_get_form_factor(MirSurfaceOutputEvent const* ev)
573
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");
574
52
53
575
53
/**
54
/**
576
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
577
@@ -58,7 +59,7 @@
578
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.
579
59
 */
60
 */
580
60
float mir_surface_output_event_get_scale(MirSurfaceOutputEvent const* ev)
61
float mir_surface_output_event_get_scale(MirSurfaceOutputEvent const* ev)
582
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");
583
62
63
584
63
/**
64
/**
585
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
586
@@ -70,7 +71,7 @@
587
70
 * \return          The refresh rate in Hz
71
 * \return          The refresh rate in Hz
588
71
 */
72
 */
589
72
double mir_surface_output_event_get_refresh_rate(MirSurfaceOutputEvent const* ev)
73
double mir_surface_output_event_get_refresh_rate(MirSurfaceOutputEvent const* ev)
591
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");
592
74
75
593
75
/**
76
/**
594
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
595
@@ -80,7 +81,7 @@
596
80
 *                  (From MirDisplayOutput::output_id)
81
 *                  (From MirDisplayOutput::output_id)
597
81
 */
82
 */
598
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)
600
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");
601
84
85
602
85
#pragma GCC diagnostic pop
86
#pragma GCC diagnostic pop
603
86
87
604
87
88
605
=== modified file 'include/client/mir_toolkit/events/surface_placement.h'
606
--- include/client/mir_toolkit/events/surface_placement.h	2017-01-19 05:30:03 +0000
607
+++ include/client/mir_toolkit/events/surface_placement.h	2017-05-26 16:23:13 +0000
608
@@ -20,6 +20,7 @@
609
20
#define MIR_TOOLKIT_SURFACE_PLACEMENT_H_
20
#define MIR_TOOLKIT_SURFACE_PLACEMENT_H_
610
21
21
611
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
612
23
#include <mir_toolkit/deprecations.h>
613
23
24
614
24
#ifdef __cplusplus
25
#ifdef __cplusplus
615
25
/**
26
/**
616
@@ -38,7 +39,7 @@
617
38
 * \return            The position relative to the parent surface
39
 * \return            The position relative to the parent surface
618
39
 */
40
 */
619
40
MirRectangle mir_surface_placement_get_relative_position(MirSurfacePlacementEvent const* event)
41
MirRectangle mir_surface_placement_get_relative_position(MirSurfacePlacementEvent const* event)
621
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");
622
42
43
623
43
#ifdef __cplusplus
44
#ifdef __cplusplus
624
44
}
45
}
625
45
46
626
=== modified file 'include/client/mir_toolkit/mir_blob.h'
627
--- include/client/mir_toolkit/mir_blob.h	2017-01-19 05:30:03 +0000
628
+++ include/client/mir_toolkit/mir_blob.h	2017-05-26 16:23:13 +0000
629
@@ -19,6 +19,7 @@
630
19
#define MIR_TOOLKIT_MIR_BLOB_H_
19
#define MIR_TOOLKIT_MIR_BLOB_H_
631
20
20
632
21
#include <mir_toolkit/client_types.h>
21
#include <mir_toolkit/client_types.h>
633
22
#include <mir_toolkit/deprecations.h>
634
22
23
635
23
#ifdef __cplusplus
24
#ifdef __cplusplus
636
24
/**
25
/**
637
@@ -35,7 +36,7 @@
638
35
 * \return                 A blob
36
 * \return                 A blob
639
36
 */
37
 */
640
37
MirBlob* mir_blob_from_display_configuration(MirDisplayConfiguration* configuration)
38
MirBlob* mir_blob_from_display_configuration(MirDisplayConfiguration* configuration)
642
38
__attribute__ ((deprecated("use mir_blob_from_display_config instead")));
39
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_blob_from_display_config instead");
643
39
40
644
40
/**
41
/**
645
41
 * Create a blob from a display config
42
 * Create a blob from a display config
646
@@ -65,7 +66,7 @@
647
65
 * \return                 A display configuration
66
 * \return                 A display configuration
648
66
 */
67
 */
649
67
MirDisplayConfiguration* mir_blob_to_display_configuration(MirBlob* blob)
68
MirDisplayConfiguration* mir_blob_to_display_configuration(MirBlob* blob)
651
68
__attribute__ ((deprecated("use mir_blob_to_display_config instead")));
69
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_blob_to_display_config instead");
652
69
70
653
70
/**
71
/**
654
71
 * Create a blob from a display config
72
 * Create a blob from a display config
655
72
73
656
=== modified file 'include/client/mir_toolkit/mir_buffer_stream.h'
657
--- include/client/mir_toolkit/mir_buffer_stream.h	2017-01-24 07:49:13 +0000
658
+++ include/client/mir_toolkit/mir_buffer_stream.h	2017-05-26 16:23:13 +0000
659
@@ -20,6 +20,7 @@
660
20
20
661
21
#include <mir_toolkit/mir_native_buffer.h>
21
#include <mir_toolkit/mir_native_buffer.h>
662
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
663
23
#include <mir_toolkit/deprecations.h>
664
23
24
665
24
#ifdef __cplusplus
25
#ifdef __cplusplus
666
25
/**
26
/**
667
@@ -141,7 +142,8 @@
668
141
 *                            mir_platform_type_gbm
142
 *                            mir_platform_type_gbm
669
142
 */
143
 */
670
143
/// @cond
144
/// @cond
672
144
__attribute__ ((deprecated))
145
MIR_FOR_REMOVAL_IN_VERSION_1("To identify the graphics platform use mir_connection_get_graphics_module(). \n"
673
146
                             "To safely interpret the buffer contents use mir_buffer_stream_get_graphics_region()")
674
145
/// @endcond
147
/// @endcond
675
146
MirPlatformType mir_buffer_stream_get_platform_type(MirBufferStream *stream);
148
MirPlatformType mir_buffer_stream_get_platform_type(MirBufferStream *stream);
676
147
149
677
148
150
678
=== modified file 'include/client/mir_toolkit/mir_connection.h'
679
--- include/client/mir_toolkit/mir_connection.h	2017-01-24 19:53:45 +0000
680
+++ include/client/mir_toolkit/mir_connection.h	2017-05-26 16:23:13 +0000
681
@@ -20,6 +20,7 @@
682
20
20
683
21
#include <mir_toolkit/client_types.h>
21
#include <mir_toolkit/client_types.h>
684
22
#include <mir_toolkit/common.h>
22
#include <mir_toolkit/common.h>
685
23
#include <mir_toolkit/deprecations.h>
686
23
24
687
24
#include <stdbool.h>
25
#include <stdbool.h>
688
25
26
689
@@ -93,7 +94,7 @@
690
93
 *   \param [out] platform_package  Structure to be populated
94
 *   \param [out] platform_package  Structure to be populated
691
94
 */
95
 */
692
95
void mir_connection_get_platform(MirConnection *connection, MirPlatformPackage *platform_package)
96
void mir_connection_get_platform(MirConnection *connection, MirPlatformPackage *platform_package)
694
96
__attribute__((deprecated("use platform extensions instead")));
97
MIR_FOR_REMOVAL_IN_VERSION_1("use platform extensions instead");
695
97
98
696
98
/**
99
/**
697
99
 * Query graphics platform module.
100
 * Query graphics platform module.
698
@@ -105,7 +106,7 @@
699
105
 *   \param [out] properties    Structure to be populated
106
 *   \param [out] properties    Structure to be populated
700
106
 */
107
 */
701
107
void mir_connection_get_graphics_module(MirConnection *connection, MirModuleProperties *properties)
108
void mir_connection_get_graphics_module(MirConnection *connection, MirModuleProperties *properties)
703
108
__attribute__((deprecated("use graphics module extension instead")));
109
MIR_FOR_REMOVAL_IN_VERSION_1("use graphics module extension instead");
704
109
110
705
110
/**
111
/**
706
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.
707
@@ -156,7 +157,7 @@
708
156
 *   \return                        structure that describes the display configuration
157
 *   \return                        structure that describes the display configuration
709
157
 */
158
 */
710
158
MirDisplayConfiguration* mir_connection_create_display_config(MirConnection *connection)
159
MirDisplayConfiguration* mir_connection_create_display_config(MirConnection *connection)
712
159
__attribute__ ((deprecated("use mir_connection_create_display_configuration instead")));
160
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_connection_create_display_configuration instead");
713
160
161
714
161
/**
162
/**
715
162
 * Query the display
163
 * Query the display
716
@@ -188,7 +189,7 @@
717
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
718
189
 */
190
 */
719
190
void mir_display_config_destroy(MirDisplayConfiguration* display_configuration)
191
void mir_display_config_destroy(MirDisplayConfiguration* display_configuration)
721
191
__attribute__ ((deprecated("use mir_display_config_release instead")));
192
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_display_config_release instead");
722
192
193
723
193
/**
194
/**
724
194
 * Apply the display configuration
195
 * Apply the display configuration
725
@@ -204,7 +205,7 @@
726
204
 *   \return                            A handle that can be passed to mir_wait_for
205
 *   \return                            A handle that can be passed to mir_wait_for
727
205
 */
206
 */
728
206
MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration)
207
MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration)
730
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");
731
208
209
732
209
/**
210
/**
733
210
 * Apply the display config for the connection
211
 * Apply the display config for the connection
734
@@ -254,7 +255,7 @@
735
254
MirWaitHandle* mir_connection_set_base_display_config(
255
MirWaitHandle* mir_connection_set_base_display_config(
736
255
    MirConnection* connection,
256
    MirConnection* connection,
737
256
    MirDisplayConfiguration const* display_configuration)
257
    MirDisplayConfiguration const* display_configuration)
739
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");
740
258
259
741
259
260
742
260
/**
261
/**
743
@@ -379,7 +380,7 @@
744
379
    MirConnection* connection,
380
    MirConnection* connection,
745
380
    MirPlatformMessage const* request,
381
    MirPlatformMessage const* request,
746
381
    MirPlatformOperationCallback callback, void* context)
382
    MirPlatformOperationCallback callback, void* context)
748
382
__attribute__ ((deprecated("use platform specific extensions instead")));
383
MIR_FOR_REMOVAL_IN_VERSION_1("use platform specific extensions instead");
749
383
384
750
384
/**
385
/**
751
385
 * Create a snapshot of the attached input devices and device configurations.
386
 * Create a snapshot of the attached input devices and device configurations.
752
@@ -399,7 +400,7 @@
753
399
 * \param [in] config  The input configuration
400
 * \param [in] config  The input configuration
754
400
 */
401
 */
755
401
void mir_input_config_destroy(MirInputConfig const* config)
402
void mir_input_config_destroy(MirInputConfig const* config)
757
402
__attribute__ ((deprecated("use mir_input_config_release instead")));
403
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_input_config_release instead");
758
403
404
759
404
/**
405
/**
760
405
 * Release this snapshot of the input configuration.
406
 * Release this snapshot of the input configuration.
761
406
407
762
=== modified file 'include/client/mir_toolkit/mir_cursor_configuration.h'
763
--- include/client/mir_toolkit/mir_cursor_configuration.h	2017-01-18 02:29:37 +0000
764
+++ include/client/mir_toolkit/mir_cursor_configuration.h	2017-05-26 16:23:13 +0000
765
@@ -20,6 +20,7 @@
766
20
20
767
21
#include <mir_toolkit/common.h>
21
#include <mir_toolkit/common.h>
768
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
769
23
#include <mir_toolkit/deprecations.h>
770
23
24
771
24
/**
25
/**
772
25
 * Opaque structure containing cursor parameterization. Create with mir_cursor* family.
26
 * Opaque structure containing cursor parameterization. Create with mir_cursor* family.
773
@@ -53,7 +54,7 @@
774
53
 *            to_mir_cursor_configuration_destroy
54
 *            to_mir_cursor_configuration_destroy
775
54
 */
55
 */
776
55
/// @cond
56
/// @cond
778
56
__attribute__ ((deprecated))
57
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_cursor_name()")
779
57
/// @endcond
58
/// @endcond
780
58
MirCursorConfiguration *mir_cursor_configuration_from_name(char const* name);
59
MirCursorConfiguration *mir_cursor_configuration_from_name(char const* name);
781
59
60
782
60
61
783
=== modified file 'include/client/mir_toolkit/mir_display_configuration.h'
784
--- include/client/mir_toolkit/mir_display_configuration.h	2017-02-20 05:36:21 +0000
785
+++ include/client/mir_toolkit/mir_display_configuration.h	2017-05-26 16:23:13 +0000
786
@@ -20,6 +20,7 @@
787
20
#define MIR_TOOLKIT_MIR_DISPLAY_CONFIGURATION_H_
20
#define MIR_TOOLKIT_MIR_DISPLAY_CONFIGURATION_H_
788
21
21
789
22
#include "client_types.h"
22
#include "client_types.h"
790
23
#include <mir_toolkit/deprecations.h>
791
23
24
792
24
#ifdef __cplusplus
25
#ifdef __cplusplus
793
25
extern "C" {
26
extern "C" {
794
@@ -60,7 +61,7 @@
795
60
 */
61
 */
796
61
int mir_display_config_get_max_simultaneous_outputs(
62
int mir_display_config_get_max_simultaneous_outputs(
797
62
    MirDisplayConfig const* config)
63
    MirDisplayConfig const* config)
799
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.");
800
64
65
801
65
/**
66
/**
802
66
 * Get the number of outputs available in this display configuration.
67
 * Get the number of outputs available in this display configuration.
803
@@ -268,7 +269,7 @@
804
268
 * \returns           The name of the output type.
269
 * \returns           The name of the output type.
805
269
 */
270
 */
806
270
char const* mir_display_output_type_name(MirDisplayOutputType type)
271
char const* mir_display_output_type_name(MirDisplayOutputType type)
808
271
__attribute__((deprecated("use mir_output_type_name instead")));
272
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_output_type_name instead");
809
272
273
810
273
/**
274
/**
811
274
 * Get the textual name of an output type.
275
 * Get the textual name of an output type.
812
275
276
813
=== modified file 'include/client/mir_toolkit/mir_persistent_id.h'
814
--- include/client/mir_toolkit/mir_persistent_id.h	2017-02-02 19:52:04 +0000
815
+++ include/client/mir_toolkit/mir_persistent_id.h	2017-05-26 16:23:13 +0000
816
@@ -19,6 +19,7 @@
817
19
#define MIR_TOOLKIT_MIR_PERSISTENT_ID_H_
19
#define MIR_TOOLKIT_MIR_PERSISTENT_ID_H_
818
20
20
819
21
#include <mir_toolkit/client_types.h>
21
#include <mir_toolkit/client_types.h>
820
22
#include <mir_toolkit/deprecations.h>
821
22
23
822
23
#include <stdbool.h>
24
#include <stdbool.h>
823
24
25
824
@@ -39,7 +40,7 @@
825
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.
826
40
 */
41
 */
827
41
bool mir_persistent_id_is_valid(MirPersistentId* id)
42
bool mir_persistent_id_is_valid(MirPersistentId* id)
829
42
__attribute__((deprecated("Use mir_window_id_is_valid() instead")));
43
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_id_is_valid() instead");
830
43
44
831
44
/**
45
/**
832
45
 * \brief Free a MirPersistentId
46
 * \brief Free a MirPersistentId
833
@@ -48,7 +49,7 @@
834
48
 *       object referred to by \arg id.
49
 *       object referred to by \arg id.
835
49
 */
50
 */
836
50
void mir_persistent_id_release(MirPersistentId* id)
51
void mir_persistent_id_release(MirPersistentId* id)
838
51
__attribute__((deprecated("Use mir_window_id_release() instead")));
52
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_id_release() instead");
839
52
53
840
53
/**
54
/**
841
54
 * \brief Get a string representation of a MirSurfaceId
55
 * \brief Get a string representation of a MirSurfaceId
842
@@ -59,7 +60,7 @@
843
59
 * \see mir_surface_id_from_string
60
 * \see mir_surface_id_from_string
844
60
 */
61
 */
845
61
char const* mir_persistent_id_as_string(MirPersistentId* id)
62
char const* mir_persistent_id_as_string(MirPersistentId* id)
847
62
__attribute__((deprecated("Use mir_window_id_as_string() instead")));
63
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_id_as_string() instead");
848
63
64
849
64
/**
65
/**
850
65
 * \brief Deserialise a string representation of a MirSurfaceId
66
 * \brief Deserialise a string representation of a MirSurfaceId
851
@@ -67,7 +68,7 @@
852
67
 * \return The deserialised MirSurfaceId
68
 * \return The deserialised MirSurfaceId
853
68
 */
69
 */
854
69
MirPersistentId* mir_persistent_id_from_string(char const* string_representation)
70
MirPersistentId* mir_persistent_id_from_string(char const* string_representation)
856
70
__attribute__((deprecated("Use mir_window_id_from_string() instead")));
71
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_id_from_string() instead");
857
71
72
858
72
#pragma GCC diagnostic pop
73
#pragma GCC diagnostic pop
859
73
74
860
74
75
861
=== modified file 'include/client/mir_toolkit/mir_platform_message.h'
862
--- include/client/mir_toolkit/mir_platform_message.h	2017-01-18 02:29:37 +0000
863
+++ include/client/mir_toolkit/mir_platform_message.h	2017-05-26 16:23:13 +0000
864
@@ -19,6 +19,7 @@
865
19
#define MIR_TOOLKIT_MIR_PLATFORM_MESSAGE_H_
19
#define MIR_TOOLKIT_MIR_PLATFORM_MESSAGE_H_
866
20
20
867
21
#include <sys/types.h>
21
#include <sys/types.h>
868
22
#include <mir_toolkit/deprecations.h>
869
22
23
870
23
#ifdef __cplusplus
24
#ifdef __cplusplus
871
24
/**
25
/**
872
@@ -51,7 +52,7 @@
873
51
 *   \param [in] opcode    The platform message opcode
52
 *   \param [in] opcode    The platform message opcode
874
52
 *   \return               The created MirPlatformMessage
53
 *   \return               The created MirPlatformMessage
875
53
 */
54
 */
877
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")
878
55
MirPlatformMessage* mir_platform_message_create(unsigned int opcode);
56
MirPlatformMessage* mir_platform_message_create(unsigned int opcode);
879
56
57
880
57
/**
58
/**
881
@@ -59,7 +60,7 @@
882
59
 *
60
 *
883
60
 *   \param [in] message   The MirPlatformMessage
61
 *   \param [in] message   The MirPlatformMessage
884
61
 */
62
 */
886
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")
887
63
void mir_platform_message_release(MirPlatformMessage const* message);
64
void mir_platform_message_release(MirPlatformMessage const* message);
888
64
65
889
65
/**
66
/**
890
@@ -71,7 +72,7 @@
891
71
 *   \param [in] data       Pointer to the data
72
 *   \param [in] data       Pointer to the data
892
72
 *   \param [in] data_size  The size of the data in bytes
73
 *   \param [in] data_size  The size of the data in bytes
893
73
 */
74
 */
895
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")
896
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);
897
76
77
898
77
/**
78
/**
899
@@ -89,7 +90,7 @@
900
89
 *   \param [in] fds       Pointer to the array of fds
90
 *   \param [in] fds       Pointer to the array of fds
901
90
 *   \param [in] num_fds   The number of fds
91
 *   \param [in] num_fds   The number of fds
902
91
 */
92
 */
904
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")
905
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);
906
94
95
907
95
/**
96
/**
908
@@ -98,7 +99,7 @@
909
98
 *   \param [in] message   The MirPlatformMessage
99
 *   \param [in] message   The MirPlatformMessage
910
99
 *   \return               The opcode
100
 *   \return               The opcode
911
100
 */
101
 */
913
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")
914
102
unsigned int mir_platform_message_get_opcode(MirPlatformMessage const* message);
103
unsigned int mir_platform_message_get_opcode(MirPlatformMessage const* message);
915
103
104
916
104
/**
105
/**
917
@@ -111,7 +112,7 @@
918
111
 *   \param [in] message   The MirPlatformMessage
112
 *   \param [in] message   The MirPlatformMessage
919
112
 *   \return               The data
113
 *   \return               The data
920
113
 */
114
 */
922
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")
923
115
MirPlatformMessageData mir_platform_message_get_data(MirPlatformMessage const* message);
116
MirPlatformMessageData mir_platform_message_get_data(MirPlatformMessage const* message);
924
116
117
925
117
/**
118
/**
926
@@ -128,7 +129,7 @@
927
128
 *   \param [in] message   The MirPlatformMessage
129
 *   \param [in] message   The MirPlatformMessage
928
129
 *   \return               The fds
130
 *   \return               The fds
929
130
 */
131
 */
931
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")
932
132
MirPlatformMessageFds mir_platform_message_get_fds(MirPlatformMessage const* message);
133
MirPlatformMessageFds mir_platform_message_get_fds(MirPlatformMessage const* message);
933
133
134
934
134
#ifdef __cplusplus
135
#ifdef __cplusplus
935
135
136
936
=== modified file 'include/client/mir_toolkit/mir_screencast.h'
937
--- include/client/mir_toolkit/mir_screencast.h	2017-01-19 05:30:03 +0000
938
+++ include/client/mir_toolkit/mir_screencast.h	2017-05-26 16:23:13 +0000
939
@@ -18,6 +18,7 @@
940
18
#define MIR_TOOLKIT_MIR_SCREENCAST_H_
18
#define MIR_TOOLKIT_MIR_SCREENCAST_H_
941
19
19
942
20
#include <mir_toolkit/client_types.h>
20
#include <mir_toolkit/client_types.h>
943
21
#include <mir_toolkit/deprecations.h>
944
21
22
945
22
#ifdef __cplusplus
23
#ifdef __cplusplus
946
23
/**
24
/**
947
@@ -143,7 +144,7 @@
948
143
MirScreencast* mir_connection_create_screencast_sync(
144
MirScreencast* mir_connection_create_screencast_sync(
949
144
    MirConnection* connection,
145
    MirConnection* connection,
950
145
    MirScreencastParameters* parameters)
146
    MirScreencastParameters* parameters)
952
146
__attribute__ ((deprecated("use mir_screencast_create_sync instead")));
147
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_screencast_create_sync instead");
953
147
148
954
148
/**
149
/**
955
149
 * Release the specified screencast.
150
 * Release the specified screencast.
956
150
151
957
=== modified file 'include/client/mir_toolkit/mir_surface.h'
958
--- include/client/mir_toolkit/mir_surface.h	2017-01-24 11:06:35 +0000
959
+++ include/client/mir_toolkit/mir_surface.h	2017-05-26 16:23:13 +0000
960
@@ -22,6 +22,7 @@
961
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
962
23
#include <mir_toolkit/common.h>
23
#include <mir_toolkit/common.h>
963
24
#include <mir_toolkit/mir_cursor_configuration.h>
24
#include <mir_toolkit/mir_cursor_configuration.h>
964
25
#include <mir_toolkit/deprecations.h>
965
25
26
966
26
#include <stdbool.h>
27
#include <stdbool.h>
967
27
28
968
@@ -40,7 +41,7 @@
969
40
MirSurfaceSpec* mir_connection_create_spec_for_normal_surface(MirConnection* connection,
41
MirSurfaceSpec* mir_connection_create_spec_for_normal_surface(MirConnection* connection,
970
41
                                                              int width, int height,
42
                                                              int width, int height,
971
42
                                                              MirPixelFormat format)
43
                                                              MirPixelFormat format)
973
43
__attribute__((deprecated("Use mir_create_normal_window_spec() instead")));
44
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_normal_window_spec() instead");
974
44
45
975
45
MirSurfaceSpec*
46
MirSurfaceSpec*
976
46
mir_connection_create_spec_for_menu(MirConnection* connection,
47
mir_connection_create_spec_for_menu(MirConnection* connection,
977
@@ -50,7 +51,7 @@
978
50
                                    MirSurface* parent,
51
                                    MirSurface* parent,
979
51
                                    MirRectangle* rect,
52
                                    MirRectangle* rect,
980
52
                                    MirEdgeAttachment edge)
53
                                    MirEdgeAttachment edge)
982
53
__attribute__((deprecated("Use mir_specify_menu() instead")));
54
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_specify_menu() instead");
983
54
55
984
55
MirSurfaceSpec*
56
MirSurfaceSpec*
985
56
mir_connection_create_spec_for_tooltip(MirConnection* connection,
57
mir_connection_create_spec_for_tooltip(MirConnection* connection,
986
@@ -58,7 +59,7 @@
987
58
                                       MirPixelFormat format,
59
                                       MirPixelFormat format,
988
59
                                       MirSurface* parent,
60
                                       MirSurface* parent,
989
60
                                       MirRectangle* zone)
61
                                       MirRectangle* zone)
991
61
__attribute__((deprecated("Use mir_create_tip_window_spec() instead")));
62
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_tip_window_spec() instead");
992
62
63
993
63
MirSurfaceSpec*
64
MirSurfaceSpec*
994
64
mir_connection_create_spec_for_tip(MirConnection* connection,
65
mir_connection_create_spec_for_tip(MirConnection* connection,
995
@@ -67,30 +68,30 @@
996
67
                                   MirSurface* parent,
68
                                   MirSurface* parent,
997
68
                                   MirRectangle* rect,
69
                                   MirRectangle* rect,
998
69
                                   MirEdgeAttachment edge)
70
                                   MirEdgeAttachment edge)
1000
70
__attribute__((deprecated("Use mir_create_tip_window_spec() instead")));
71
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_tip_window_spec() instead");
1001
71
72
1002
72
MirSurfaceSpec*
73
MirSurfaceSpec*
1003
73
mir_connection_create_spec_for_modal_dialog(MirConnection* connection,
74
mir_connection_create_spec_for_modal_dialog(MirConnection* connection,
1004
74
                                            int width, int height,
75
                                            int width, int height,
1005
75
                                            MirPixelFormat format,
76
                                            MirPixelFormat format,
1006
76
                                            MirSurface* parent)
77
                                            MirSurface* parent)
1008
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");
1009
78
79
1010
79
MirSurfaceSpec*
80
MirSurfaceSpec*
1011
80
mir_connection_create_spec_for_dialog(MirConnection* connection,
81
mir_connection_create_spec_for_dialog(MirConnection* connection,
1012
81
                                      int width, int height,
82
                                      int width, int height,
1013
82
                                      MirPixelFormat format)
83
                                      MirPixelFormat format)
1015
83
__attribute__((deprecated("Use mir_create_dialog_window_spec() instead")));
84
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_dialog_window_spec() instead");
1016
84
85
1017
85
MirSurfaceSpec* mir_create_surface_spec(MirConnection* connection)
86
MirSurfaceSpec* mir_create_surface_spec(MirConnection* connection)
1019
86
__attribute__((deprecated("Use mir_create_window_spec() instead")));
87
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_window_spec() instead");
1020
87
88
1021
88
MirSurfaceSpec*
89
MirSurfaceSpec*
1022
89
mir_connection_create_spec_for_changes(MirConnection* connection)
90
mir_connection_create_spec_for_changes(MirConnection* connection)
1024
90
__attribute__((deprecated("Use mir_create_window_spec() instead")));
91
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_create_window_spec() instead");
1025
91
92
1026
92
void mir_surface_spec_set_parent(MirSurfaceSpec* spec, MirSurface* parent)
93
void mir_surface_spec_set_parent(MirSurfaceSpec* spec, MirSurface* parent)
1028
93
__attribute__((deprecated("Use mir_window_spec_set_parent() instead")));
94
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_set_parent() instead");
1029
94
95
1030
95
/**
96
/**
1031
96
 *\deprecated This will soon be a property of the backing content.
97
 *\deprecated This will soon be a property of the backing content.
1032
@@ -103,77 +104,77 @@
1033
103
 *                        was removed by use of mir_window_spec_set_streams().
104
 *                        was removed by use of mir_window_spec_set_streams().
1034
104
 */
105
 */
1035
105
int mir_surface_get_swapinterval(MirSurface* surface)
106
int mir_surface_get_swapinterval(MirSurface* surface)
1037
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");
1038
107
108
1039
108
void mir_surface_spec_set_type(MirSurfaceSpec* spec, MirSurfaceType type)
109
void mir_surface_spec_set_type(MirSurfaceSpec* spec, MirSurfaceType type)
1041
109
__attribute__((deprecated("use mir_window_spec_set_type() instead")));
110
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_type() instead");
1042
110
111
1043
111
void mir_surface_spec_set_name(MirSurfaceSpec* spec, char const* name)
112
void mir_surface_spec_set_name(MirSurfaceSpec* spec, char const* name)
1045
112
__attribute__((deprecated("use mir_window_spec_set_name() instead")));
113
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_name() instead");
1046
113
114
1047
114
void mir_surface_spec_set_width(MirSurfaceSpec* spec, unsigned width)
115
void mir_surface_spec_set_width(MirSurfaceSpec* spec, unsigned width)
1049
115
__attribute__((deprecated("use mir_window_spec_set_width() instead")));
116
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_width() instead");
1050
116
117
1051
117
void mir_surface_spec_set_height(MirSurfaceSpec* spec, unsigned height)
118
void mir_surface_spec_set_height(MirSurfaceSpec* spec, unsigned height)
1053
118
__attribute__((deprecated("use mir_window_spec_set_height() instead")));
119
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_height() instead");
1054
119
120
1055
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)
1057
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");
1058
122
123
1059
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)
1061
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");
1062
125
126
1063
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)
1065
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");
1066
128
129
1067
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)
1069
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");
1070
131
132
1071
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)
1073
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");
1074
134
135
1075
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)
1077
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");
1078
137
138
1079
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)
1081
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");
1082
140
141
1083
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)
1085
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");
1086
143
144
1087
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)
1089
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");
1090
146
147
1091
147
void mir_surface_spec_set_preferred_orientation(MirSurfaceSpec* spec, MirOrientationMode mode)
148
void mir_surface_spec_set_preferred_orientation(MirSurfaceSpec* spec, MirOrientationMode mode)
1093
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");
1094
149
150
1095
150
bool mir_surface_spec_attach_to_foreign_parent(MirSurfaceSpec* spec,
151
bool mir_surface_spec_attach_to_foreign_parent(MirSurfaceSpec* spec,
1096
151
                                               MirPersistentId* parent,
152
                                               MirPersistentId* parent,
1097
152
                                               MirRectangle* attachment_rect,
153
                                               MirRectangle* attachment_rect,
1098
153
                                               MirEdgeAttachment edge)
154
                                               MirEdgeAttachment edge)
1100
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");
1101
155
156
1102
156
void mir_surface_spec_set_state(MirSurfaceSpec* spec, MirSurfaceState state)
157
void mir_surface_spec_set_state(MirSurfaceSpec* spec, MirSurfaceState state)
1104
157
__attribute__((deprecated("use mir_window_spec_set_state() instead")));
158
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_state() instead");
1105
158
159
1106
159
void mir_surface_spec_release(MirSurfaceSpec* spec)
160
void mir_surface_spec_release(MirSurfaceSpec* spec)
1108
160
__attribute__((deprecated("use mir_window_spec_release() instead")));
161
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_release() instead");
1109
161
162
1110
162
void mir_surface_spec_set_input_shape(MirSurfaceSpec* spec,
163
void mir_surface_spec_set_input_shape(MirSurfaceSpec* spec,
1111
163
                                      MirRectangle const *rectangles,
164
                                      MirRectangle const *rectangles,
1112
164
                                      size_t n_rects)
165
                                      size_t n_rects)
1114
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");
1115
166
167
1116
167
void mir_surface_spec_set_event_handler(MirSurfaceSpec* spec,
168
void mir_surface_spec_set_event_handler(MirSurfaceSpec* spec,
1117
168
                                        mir_surface_event_callback callback,
169
                                        mir_surface_event_callback callback,
1118
169
                                        void* context)
170
                                        void* context)
1120
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");
1121
171
172
1122
172
void mir_surface_spec_set_shell_chrome(MirSurfaceSpec* spec, MirShellChrome style)
173
void mir_surface_spec_set_shell_chrome(MirSurfaceSpec* spec, MirShellChrome style)
1124
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");
1125
174
175
1126
175
void mir_surface_spec_set_pointer_confinement(MirSurfaceSpec* spec, MirPointerConfinementState state)
176
void mir_surface_spec_set_pointer_confinement(MirSurfaceSpec* spec, MirPointerConfinementState state)
1128
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");
1129
177
178
1130
178
void mir_surface_spec_set_placement(MirSurfaceSpec*     spec,
179
void mir_surface_spec_set_placement(MirSurfaceSpec*     spec,
1131
179
                                    const MirRectangle* rect,
180
                                    const MirRectangle* rect,
1132
@@ -182,69 +183,69 @@
1133
182
                                    MirPlacementHints   placement_hints,
183
                                    MirPlacementHints   placement_hints,
1134
183
                                    int                 offset_dx,
184
                                    int                 offset_dx,
1135
184
                                    int                 offset_dy)
185
                                    int                 offset_dy)
1137
185
__attribute__((deprecated("use mir_window_spec_set_placement() instead")));
186
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_placement() instead");
1138
186
187
1139
187
MirSurfaceSpec* mir_connection_create_spec_for_input_method(MirConnection* connection,
188
MirSurfaceSpec* mir_connection_create_spec_for_input_method(MirConnection* connection,
1140
188
                                                            int width, int height,
189
                                                            int width, int height,
1141
189
                                                            MirPixelFormat format)
190
                                                            MirPixelFormat format)
1143
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");
1144
191
192
1145
192
void mir_surface_spec_set_pixel_format(MirSurfaceSpec* spec, MirPixelFormat format)
193
void mir_surface_spec_set_pixel_format(MirSurfaceSpec* spec, MirPixelFormat format)
1147
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");
1148
194
195
1149
195
void mir_surface_spec_set_buffer_usage(MirSurfaceSpec* spec, MirBufferUsage usage)
196
void mir_surface_spec_set_buffer_usage(MirSurfaceSpec* spec, MirBufferUsage usage)
1151
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");
1152
197
198
1153
198
void mir_surface_spec_set_streams(MirSurfaceSpec* spec,
199
void mir_surface_spec_set_streams(MirSurfaceSpec* spec,
1154
199
                                  MirBufferStreamInfo* streams,
200
                                  MirBufferStreamInfo* streams,
1155
200
                                  unsigned int num_streams)
201
                                  unsigned int num_streams)
1157
201
__attribute__((deprecated("use mir_window_spec_set_streams() instead")));
202
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_streams() instead");
1158
202
203
1159
203
void mir_surface_apply_spec(MirSurface* surface, MirSurfaceSpec* spec)
204
void mir_surface_apply_spec(MirSurface* surface, MirSurfaceSpec* spec)
1161
204
__attribute__((deprecated("use mir_window_apply_spec() instead")));
205
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_apply_spec() instead");
1162
205
206
1163
206
bool mir_surface_is_valid(MirSurface *surface)
207
bool mir_surface_is_valid(MirSurface *surface)
1165
207
__attribute__((deprecated("use mir_window_is_valid() instead")));
208
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_is_valid() instead");
1166
208
209
1167
209
MirWaitHandle* mir_surface_create(MirSurfaceSpec* requested_specification,
210
MirWaitHandle* mir_surface_create(MirSurfaceSpec* requested_specification,
1168
210
                                  mir_surface_callback callback, void* context)
211
                                  mir_surface_callback callback, void* context)
1170
211
__attribute__((deprecated("use mir_create_window() instead")));
212
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_create_window() instead");
1171
212
213
1172
213
MirSurface* mir_surface_create_sync(MirSurfaceSpec* requested_specification)
214
MirSurface* mir_surface_create_sync(MirSurfaceSpec* requested_specification)
1174
214
__attribute__((deprecated("use mir_create_window_sync() instead")));
215
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_create_window_sync() instead");
1175
215
216
1176
216
MirWaitHandle *mir_surface_release(
217
MirWaitHandle *mir_surface_release(
1177
217
    MirSurface *surface,
218
    MirSurface *surface,
1178
218
    mir_surface_callback callback,
219
    mir_surface_callback callback,
1179
219
    void *context)
220
    void *context)
1181
220
__attribute__((deprecated("use mir_window_release() instead")));
221
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_release() instead");
1182
221
222
1183
222
void mir_surface_release_sync(MirSurface *surface)
223
void mir_surface_release_sync(MirSurface *surface)
1185
223
__attribute__((deprecated("use mir_window_release_sync() instead")));
224
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_release_sync() instead");
1186
224
225
1187
225
void mir_surface_set_event_handler(MirSurface *surface,
226
void mir_surface_set_event_handler(MirSurface *surface,
1188
226
                                   mir_surface_event_callback callback,
227
                                   mir_surface_event_callback callback,
1189
227
                                   void* context)
228
                                   void* context)
1191
228
__attribute__((deprecated("use mir_window_set_event_handler() instead")));
229
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_set_event_handler() instead");
1192
229
230
1193
230
MirBufferStream* mir_surface_get_buffer_stream(MirSurface *surface)
231
MirBufferStream* mir_surface_get_buffer_stream(MirSurface *surface)
1195
231
__attribute__((deprecated("use mir_window_get_buffer_stream() instead")));
232
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_buffer_stream() instead");
1196
232
233
1197
233
char const* mir_surface_get_error_message(MirSurface *surface)
234
char const* mir_surface_get_error_message(MirSurface *surface)
1199
234
__attribute__((deprecated("use mir_window_get_error_message() instead")));
235
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_error_message() instead");
1200
235
236
1201
236
void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters)
237
void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters)
1203
237
__attribute__((deprecated("use mir_window_get_parameters() instead")));
238
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_parameters() instead");
1204
238
239
1205
239
MirSurfaceType mir_surface_get_type(MirSurface* surface)
240
MirSurfaceType mir_surface_get_type(MirSurface* surface)
1207
240
__attribute__((deprecated("use mir_window_get_type() instead")));
241
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_type() instead");
1208
241
242
1209
242
MirWaitHandle* mir_surface_set_state(MirSurface *surface,
243
MirWaitHandle* mir_surface_set_state(MirSurface *surface,
1210
243
                                     MirSurfaceState state)
244
                                     MirSurfaceState state)
1212
244
__attribute__((deprecated("use mir_window_set_state() instead")));
245
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_set_state() instead");
1213
245
246
1214
246
MirSurfaceState mir_surface_get_state(MirSurface *surface)
247
MirSurfaceState mir_surface_get_state(MirSurface *surface)
1216
247
__attribute__((deprecated("use mir_window_get_state() instead")));
248
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_state() instead");
1217
248
249
1218
249
/**
250
/**
1219
250
 * Set the swapinterval for the default stream.
251
 * Set the swapinterval for the default stream.
1220
@@ -260,37 +261,37 @@
1221
260
 *                        or NULL if the interval could not be supported
261
 *                        or NULL if the interval could not be supported
1222
261
 */
262
 */
1223
262
MirWaitHandle* mir_surface_set_swapinterval(MirSurface* surface, int interval)
263
MirWaitHandle* mir_surface_set_swapinterval(MirSurface* surface, int interval)
1225
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");
1226
264
265
1227
265
int mir_surface_get_dpi(MirSurface* surface)
266
int mir_surface_get_dpi(MirSurface* surface)
1229
266
__attribute__((deprecated("use mir_window_get_dpi() instead")));
267
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_dpi() instead");
1230
267
268
1231
268
MirSurfaceFocusState mir_surface_get_focus(MirSurface *surface)
269
MirSurfaceFocusState mir_surface_get_focus(MirSurface *surface)
1233
269
__attribute__((deprecated("use mir_window_get_focus_state() instead")));
270
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_focus_state() instead");
1234
270
271
1235
271
MirSurfaceVisibility mir_surface_get_visibility(MirSurface *surface)
272
MirSurfaceVisibility mir_surface_get_visibility(MirSurface *surface)
1237
272
__attribute__((deprecated("use mir_window_get_visibility() instead")));
273
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_visibility() instead");
1238
273
274
1239
274
MirWaitHandle* mir_surface_configure_cursor(MirSurface *surface, MirCursorConfiguration const* parameters)
275
MirWaitHandle* mir_surface_configure_cursor(MirSurface *surface, MirCursorConfiguration const* parameters)
1241
275
__attribute__((deprecated("use mir_window_configure_cursor() instead")));
276
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_configure_cursor() instead");
1242
276
277
1243
277
MirOrientation mir_surface_get_orientation(MirSurface *surface)
278
MirOrientation mir_surface_get_orientation(MirSurface *surface)
1245
278
__attribute__((deprecated("use mir_window_get_orientation() instead")));
279
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_orientation() instead");
1246
279
280
1247
280
MirWaitHandle* mir_surface_set_preferred_orientation(MirSurface *surface, MirOrientationMode orientation)
281
MirWaitHandle* mir_surface_set_preferred_orientation(MirSurface *surface, MirOrientationMode orientation)
1249
281
__attribute__((deprecated("use mir_window_set_preferred_orientation() instead")));
282
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_set_preferred_orientation() instead");
1250
282
283
1251
283
MirOrientationMode mir_surface_get_preferred_orientation(MirSurface *surface)
284
MirOrientationMode mir_surface_get_preferred_orientation(MirSurface *surface)
1253
284
__attribute__((deprecated("use mir_window_get_preferred_orientation() instead")));
285
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_get_preferred_orientation() instead");
1254
285
286
1255
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)
1257
287
__attribute__((deprecated("use mir_window_request_persistent_id() instead")));
288
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_request_persistent_id() instead");
1258
288
289
1259
289
MirPersistentId* mir_surface_request_persistent_id_sync(MirSurface *surface)
290
MirPersistentId* mir_surface_request_persistent_id_sync(MirSurface *surface)
1261
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");
1262
291
292
1263
292
void mir_surface_raise(MirSurface* surface, MirCookie const* cookie)
293
void mir_surface_raise(MirSurface* surface, MirCookie const* cookie)
1265
293
__attribute__((deprecated("use mir_window_raise() instead")));
294
MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_raise() instead");
1266
294
295
1267
295
#pragma GCC diagnostic pop
296
#pragma GCC diagnostic pop
1268
296
297
1269
297
298
1270
=== modified file 'include/client/mir_toolkit/mir_wait.h'
1271
--- include/client/mir_toolkit/mir_wait.h	2017-01-19 23:17:56 +0000
1272
+++ include/client/mir_toolkit/mir_wait.h	2017-05-26 16:23:13 +0000
1273
@@ -19,6 +19,7 @@
1274
19
#define MIR_TOOLKIT_MIR_WAIT_H_
19
#define MIR_TOOLKIT_MIR_WAIT_H_
1275
20
20
1276
21
#include <mir_toolkit/client_types.h>
21
#include <mir_toolkit/client_types.h>
1277
22
#include <mir_toolkit/deprecations.h>
1278
22
23
1279
23
#ifdef __cplusplus
24
#ifdef __cplusplus
1280
24
/**
25
/**
1281
@@ -36,7 +37,7 @@
1282
36
 *   \param [in] wait_handle  Handle returned by an asynchronous request
37
 *   \param [in] wait_handle  Handle returned by an asynchronous request
1283
37
 */
38
 */
1284
38
void mir_wait_for(MirWaitHandle *wait_handle)
39
void mir_wait_for(MirWaitHandle *wait_handle)
1286
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");
1287
40
41
1288
41
/**
42
/**
1289
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
1290
@@ -47,7 +48,7 @@
1291
47
 *   \param [in] wait_handle  Handle returned by an asynchronous request
48
 *   \param [in] wait_handle  Handle returned by an asynchronous request
1292
48
 */
49
 */
1293
49
void mir_wait_for_one(MirWaitHandle *wait_handle)
50
void mir_wait_for_one(MirWaitHandle *wait_handle)
1295
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");
1296
51
52
1297
52
53
1298
53
#ifdef __cplusplus
54
#ifdef __cplusplus
1299
54
55
1300
=== modified file 'include/client/mir_toolkit/mir_window.h'
1301
--- include/client/mir_toolkit/mir_window.h	2017-02-03 20:39:06 +0000
1302
+++ include/client/mir_toolkit/mir_window.h	2017-05-26 16:23:13 +0000
1303
@@ -22,6 +22,7 @@
1304
22
#include <mir_toolkit/client_types.h>
22
#include <mir_toolkit/client_types.h>
1305
23
#include <mir_toolkit/common.h>
23
#include <mir_toolkit/common.h>
1306
24
#include <mir_toolkit/mir_cursor_configuration.h>
24
#include <mir_toolkit/mir_cursor_configuration.h>
1307
25
#include <mir_toolkit/deprecations.h>
1308
25
26
1309
26
#include <stdbool.h>
27
#include <stdbool.h>
1310
27
28
1311
@@ -555,7 +556,7 @@
1312
555
                                        MirRenderSurface* render_surface,
556
                                        MirRenderSurface* render_surface,
1313
556
                                        int logical_width, int logical_height,
557
                                        int logical_width, int logical_height,
1314
557
                                        int displacement_x, int displacement_y)
558
                                        int displacement_x, int displacement_y)
1316
558
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
559
MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
1317
559
#pragma GCC diagnostic pop
560
#pragma GCC diagnostic pop
1318
560
561
1319
561
/**
562
/**
1320
@@ -774,7 +775,7 @@
1321
774
 * \param [in,out] context   User data passed to completion callback.
775
 * \param [in,out] context   User data passed to completion callback.
1322
775
 */
776
 */
1323
776
void mir_window_request_persistent_id(MirWindow* window, MirWindowIdCallback callback, void* context)
777
void mir_window_request_persistent_id(MirWindow* window, MirWindowIdCallback callback, void* context)
1325
777
__attribute__((deprecated("Use mir_window_request_window_id() instead")));
778
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_request_window_id() instead");
1326
778
void mir_window_request_window_id(MirWindow* window, MirWindowIdCallback callback, void* context);
779
void mir_window_request_window_id(MirWindow* window, MirWindowIdCallback callback, void* context);
1327
779
780
1328
780
/**
781
/**
1329
@@ -784,7 +785,7 @@
1330
784
 *         be freed with a call to mir_persistent_id_release()
785
 *         be freed with a call to mir_persistent_id_release()
1331
785
 */
786
 */
1332
786
MirPersistentId* mir_window_request_persistent_id_sync(MirWindow* window)
787
MirPersistentId* mir_window_request_persistent_id_sync(MirWindow* window)
1334
787
__attribute__((deprecated("Use mir_window_request_window_id_sync")));
788
MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_request_window_id_sync");
1335
788
MirWindowId* mir_window_request_window_id_sync(MirWindow* window);
789
MirWindowId* mir_window_request_window_id_sync(MirWindow* window);
1336
789
#ifdef __cplusplus
790
#ifdef __cplusplus
1337
790
}
791
}
1338
791
792
1339
=== modified file 'include/client/mir_toolkit/rs/mir_render_surface.h'
1340
--- include/client/mir_toolkit/rs/mir_render_surface.h	2017-03-16 16:47:21 +0000
1341
+++ include/client/mir_toolkit/rs/mir_render_surface.h	2017-05-26 16:23:13 +0000
1342
@@ -21,6 +21,18 @@
1343
21
#define MIR_TOOLKIT_MIR_RENDER_SURFACE_H_
21
#define MIR_TOOLKIT_MIR_RENDER_SURFACE_H_
1344
22
22
1345
23
#include <mir_toolkit/client_types.h>
23
#include <mir_toolkit/client_types.h>
1346
24
#include <mir_toolkit/deprecations.h>
1347
25
1348
26
#ifndef MIR_DEPRECATE_RENDERSURFACES
1349
27
    #define MIR_DEPRECATE_RENDERSURFACES 0
1350
28
#endif
1351
29
1352
30
#if MIR_ENABLE_DEPRECATIONS > 0 && MIR_DEPRECATE_RENDERSURFACES > 0
1353
31
    #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME\
1354
32
    __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")))
1355
33
#else
1356
34
    #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME
1357
35
#endif
1358
24
36
1359
25
#ifdef __cplusplus
37
#ifdef __cplusplus
1360
26
/**
38
/**
1361
@@ -30,6 +42,9 @@
1362
30
extern "C" {
42
extern "C" {
1363
31
#endif
43
#endif
1364
32
44
1365
45
typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
1366
46
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1367
47
1368
33
#pragma GCC diagnostic push
48
#pragma GCC diagnostic push
1369
34
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
49
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1370
35
/**
50
/**
1371
@@ -49,7 +64,7 @@
1372
49
    int width, int height,
64
    int width, int height,
1373
50
    MirRenderSurfaceCallback callback,
65
    MirRenderSurfaceCallback callback,
1374
51
    void* context)
66
    void* context)
1376
52
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
67
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1377
53
68
1378
54
/**
69
/**
1379
55
 * Create a render surface and wait for the result
70
 * Create a render surface and wait for the result
1380
@@ -64,7 +79,7 @@
1381
64
MirRenderSurface* mir_connection_create_render_surface_sync(
79
MirRenderSurface* mir_connection_create_render_surface_sync(
1382
65
    MirConnection* connection,
80
    MirConnection* connection,
1383
66
    int width, int height)
81
    int width, int height)
1385
67
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
82
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1386
68
83
1387
69
/**
84
/**
1388
70
 * Get the size of the MirRenderSurface
85
 * Get the size of the MirRenderSurface
1389
@@ -76,7 +91,7 @@
1390
76
void mir_render_surface_get_size(
91
void mir_render_surface_get_size(
1391
77
    MirRenderSurface* render_surface,
92
    MirRenderSurface* render_surface,
1392
78
    int* width, int* height)
93
    int* width, int* height)
1394
79
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
94
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1395
80
95
1396
81
/**
96
/**
1397
82
 * Set the size of the MirRenderSurface
97
 * Set the size of the MirRenderSurface
1398
@@ -88,7 +103,7 @@
1399
88
void mir_render_surface_set_size(
103
void mir_render_surface_set_size(
1400
89
    MirRenderSurface* render_surface,
104
    MirRenderSurface* render_surface,
1401
90
    int width, int height)
105
    int width, int height)
1403
91
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
106
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1404
92
107
1405
93
/**
108
/**
1406
94
 * Test for a valid render surface
109
 * Test for a valid render surface
1407
@@ -100,8 +115,7 @@
1408
100
 */
115
 */
1409
101
bool mir_render_surface_is_valid(
116
bool mir_render_surface_is_valid(
1410
102
    MirRenderSurface* render_surface)
117
    MirRenderSurface* render_surface)
1413
103
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
118
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1412
104
1414
105
/**
119
/**
1415
106
 * Retrieve a text description of the error. The returned string is owned by
120
 * Retrieve a text description of the error. The returned string is owned by
1416
107
 * the library and remains valid until the render surface or the associated
121
 * the library and remains valid until the render surface or the associated
1417
@@ -113,7 +127,7 @@
1418
113
 */
127
 */
1419
114
char const *mir_render_surface_get_error_message(
128
char const *mir_render_surface_get_error_message(
1420
115
    MirRenderSurface* render_surface)
129
    MirRenderSurface* render_surface)
1422
116
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
130
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1423
117
131
1424
118
/**
132
/**
1425
119
 * Release the specified render surface
133
 * Release the specified render surface
1426
@@ -122,7 +136,7 @@
1427
122
 */
136
 */
1428
123
void mir_render_surface_release(
137
void mir_render_surface_release(
1429
124
    MirRenderSurface* render_surface)
138
    MirRenderSurface* render_surface)
1431
125
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
139
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1432
126
140
1433
127
/**
141
/**
1434
128
 * Obtain the buffer stream backing a given render surface.
142
 * Obtain the buffer stream backing a given render surface.
1435
@@ -142,7 +156,7 @@
1436
142
    MirRenderSurface* render_surface,
156
    MirRenderSurface* render_surface,
1437
143
    int width, int height,
157
    int width, int height,
1438
144
    MirPixelFormat format)
158
    MirPixelFormat format)
1440
145
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
159
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1441
146
160
1442
147
/**
161
/**
1443
148
 * Obtain the presentation chain backing a given render surface.
162
 * Obtain the presentation chain backing a given render surface.
1444
@@ -155,7 +169,7 @@
1445
155
 */
169
 */
1446
156
MirPresentationChain* mir_render_surface_get_presentation_chain(
170
MirPresentationChain* mir_render_surface_get_presentation_chain(
1447
157
    MirRenderSurface* render_surface)
171
    MirRenderSurface* render_surface)
1449
158
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
172
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1450
159
173
1451
160
/** Query whether the server supports a given presentation mode.
174
/** Query whether the server supports a given presentation mode.
1452
161
 *
175
 *
1453
@@ -189,7 +203,29 @@
1454
189
    MirWindowSpec* spec,
203
    MirWindowSpec* spec,
1455
190
    MirRenderSurface* render_surface,
204
    MirRenderSurface* render_surface,
1456
191
    int hotspot_x, int hotspot_y)
205
    int hotspot_x, int hotspot_y)
1458
192
__attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")));
206
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1459
207
1460
208
/**
1461
209
 * Set the MirWindowSpec to display content contained in a render surface
1462
210
 *
1463
211
 * \warning: The initial call to mir_window_spec_add_render_surface will set
1464
212
 *           the bottom-most content, and subsequent calls will stack the
1465
213
 *           content on top.
1466
214
 *
1467
215
 * \param spec             The window_spec to be updated
1468
216
 * \param render_surface   The render surface containing the content to be displayed
1469
217
 * \param logical_width    The width that the content will be displayed at
1470
218
 *                         (Ignored for buffer streams)
1471
219
 * \param logical_height   The height that the content will be displayed at
1472
220
 *                         (Ignored for buffer streams)
1473
221
 * \param displacement_x   The x displacement from the top-left corner of the MirWindow
1474
222
 * \param displacement_y   The y displacement from the top-left corner of the MirWindow
1475
223
 */
1476
224
void mir_window_spec_add_render_surface(MirWindowSpec* spec,
1477
225
                                        MirRenderSurface* render_surface,
1478
226
                                        int logical_width, int logical_height,
1479
227
                                        int displacement_x, int displacement_y)
1480
228
MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
1481
193
229
1482
194
#pragma GCC diagnostic pop
230
#pragma GCC diagnostic pop
1483
195
231
1484
196
232
1485
=== modified file 'include/core/mir_toolkit/common.h'
1486
--- include/core/mir_toolkit/common.h	2017-01-23 22:29:00 +0000
1487
+++ include/core/mir_toolkit/common.h	2017-05-26 16:23:13 +0000
1488
@@ -21,6 +21,8 @@
1489
21
#ifndef MIR_COMMON_H_
21
#ifndef MIR_COMMON_H_
1490
22
#define MIR_COMMON_H_
22
#define MIR_COMMON_H_
1491
23
23
1492
24
#include <mir_toolkit/deprecations.h>
1493
25
1494
24
//for clang
26
//for clang
1495
25
#ifndef __has_feature
27
#ifndef __has_feature
1496
26
  #define __has_feature(x) 0  // Compatibility with non-clang
28
  #define __has_feature(x) 0  // Compatibility with non-clang
1497
@@ -35,7 +37,7 @@
1498
35
    (__has_extension(attribute_deprecated_with_message) && \
37
    (__has_extension(attribute_deprecated_with_message) && \
1499
36
     __has_extension(enumerator_attributes))
38
     __has_extension(enumerator_attributes))
1500
37
  #define MIR_DEPRECATED_ENUM(ENUM, INSTEAD) \
39
  #define MIR_DEPRECATED_ENUM(ENUM, INSTEAD) \
1502
38
      ENUM __attribute__ ((deprecated("Use " #INSTEAD " instead")))
40
      ENUM MIR_FOR_REMOVAL_IN_VERSION_1("Use " #INSTEAD " instead")
1503
39
#else
41
#else
1504
40
  #define MIR_DEPRECATED_ENUM(ENUM, INSTEAD) \
42
  #define MIR_DEPRECATED_ENUM(ENUM, INSTEAD) \
1505
41
      ENUM
43
      ENUM
1506
@@ -65,7 +67,7 @@
1507
65
    mir_surface_attrib_preferred_orientation,
67
    mir_surface_attrib_preferred_orientation,
1508
66
    /* Must be last */
68
    /* Must be last */
1509
67
    mir_surface_attribs
69
    mir_surface_attribs
1511
68
} MirSurfaceAttrib __attribute__ ((deprecated("use MirWindowAttrib")));
70
} MirSurfaceAttrib MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowAttrib");
1512
69
71
1513
70
/**
72
/**
1514
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
1515
@@ -102,7 +104,7 @@
1516
102
    mir_surface_type_satellite,    /**< AKA "toolbox"/"toolbar"             */
104
    mir_surface_type_satellite,    /**< AKA "toolbox"/"toolbar"             */
1517
103
    mir_surface_type_tip,          /**< AKA "tooltip"                       */
105
    mir_surface_type_tip,          /**< AKA "tooltip"                       */
1518
104
    mir_surface_types
106
    mir_surface_types
1520
105
} MirSurfaceType __attribute__ ((deprecated("use MirWindowType")));
107
} MirSurfaceType MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowType");
1521
106
108
1522
107
typedef enum MirWindowType
109
typedef enum MirWindowType
1523
108
{
110
{
1524
@@ -132,7 +134,7 @@
1525
132
    mir_surface_state_horizmaximized,
134
    mir_surface_state_horizmaximized,
1526
133
    mir_surface_state_hidden,
135
    mir_surface_state_hidden,
1527
134
    mir_surface_states
136
    mir_surface_states
1529
135
} MirSurfaceState __attribute__ ((deprecated("use MirWindowState")));
137
} MirSurfaceState MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowState");
1530
136
138
1531
137
typedef enum MirWindowState
139
typedef enum MirWindowState
1532
138
{
140
{
1533
@@ -154,7 +156,7 @@
1534
154
{
156
{
1535
155
    mir_surface_unfocused = 0,
157
    mir_surface_unfocused = 0,
1536
156
    mir_surface_focused
158
    mir_surface_focused
1538
157
} MirSurfaceFocusState __attribute__ ((deprecated("use MirWindowFocusState")));
159
} MirSurfaceFocusState MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowFocusState");
1539
158
160
1540
159
typedef enum MirWindowFocusState
161
typedef enum MirWindowFocusState
1541
160
{
162
{
1542
@@ -166,7 +168,7 @@
1543
166
{
168
{
1544
167
    mir_surface_visibility_occluded = 0,
169
    mir_surface_visibility_occluded = 0,
1545
168
    mir_surface_visibility_exposed
170
    mir_surface_visibility_exposed
1547
169
} MirSurfaceVisibility __attribute__ ((deprecated("use MirWindowFocusState")));
171
} MirSurfaceVisibility MIR_FOR_REMOVAL_IN_VERSION_1("use MirWindowFocusState");
1548
170
172
1549
171
typedef enum MirWindowVisibility
173
typedef enum MirWindowVisibility
1550
172
{
174
{
1551
173
175
1552
=== added file 'include/core/mir_toolkit/deprecations.h'
1553
--- include/core/mir_toolkit/deprecations.h	1970-01-01 00:00:00 +0000
1554
+++ include/core/mir_toolkit/deprecations.h	2017-05-26 16:23:13 +0000
1555
@@ -0,0 +1,36 @@
1556
1
/*
1557
2
 * Copyright © 2017 Canonical Ltd.
1558
3
 *
1559
4
 * This program is free software: you can redistribute it and/or modify it
1560
5
 * under the terms of the GNU Lesser General Public License version 3,
1561
6
 * as published by the Free Software Foundation.
1562
7
 *
1563
8
 * This program is distributed in the hope that it will be useful,
1564
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1565
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1566
11
 * GNU Lesser General Public License for more details.
1567
12
 *
1568
13
 * You should have received a copy of the GNU Lesser General Public License
1569
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1570
15
 */
1571
16
1572
17
#ifndef MIR_DEPRECATIONS_H_
1573
18
#define MIR_DEPRECATIONS_H_
1574
19
1575
20
#ifndef MIR_ENABLE_DEPRECATIONS
1576
21
    // use g++ version < 6.2 as a proxy for building on Ubunutu 16.04LTS ("Xenial") or 16.10 (Yakkety)
1577
22
    #if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ > 6) || ((__GNUC__ == 6) && (__GNUC_MINOR__ >= 2))
1578
23
        #define MIR_ENABLE_DEPRECATIONS 1
1579
24
    #else
1580
25
        #define MIR_ENABLE_DEPRECATIONS 0
1581
26
    #endif
1582
27
#endif
1583
28
1584
29
#if MIR_ENABLE_DEPRECATIONS > 0
1585
30
    #define MIR_FOR_REMOVAL_IN_VERSION_1(message)\
1586
31
    __attribute__((deprecated(message)))
1587
32
#else
1588
33
    #define MIR_FOR_REMOVAL_IN_VERSION_1(message)
1589
34
#endif
1590
35
1591
36
#endif //MIR_DEPRECATIONS_H_
1592
0
37
1593
=== modified file 'src/common/events/input_configuration_event.cpp'
1594
--- src/common/events/input_configuration_event.cpp	2017-01-20 16:27:50 +0000
1595
+++ src/common/events/input_configuration_event.cpp	2017-05-26 16:23:13 +0000
1596
@@ -18,13 +18,12 @@
1597
18
18
1598
19
#include "mir/events/input_configuration_event.h"
19
#include "mir/events/input_configuration_event.h"
1599
20
20
1600
21
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1601
21
MirInputConfigurationEvent::MirInputConfigurationEvent()
22
MirInputConfigurationEvent::MirInputConfigurationEvent()
1602
22
{
23
{
1603
23
    event.initInputConfiguration();
24
    event.initInputConfiguration();
1604
24
}
25
}
1605
25
26
1606
26
#pragma GCC diagnostic push
1607
27
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1608
28
MirInputConfigurationAction MirInputConfigurationEvent::action() const
27
MirInputConfigurationAction MirInputConfigurationEvent::action() const
1609
29
{
28
{
1610
30
    return static_cast<MirInputConfigurationAction>(event.asReader().getInputConfiguration().getAction());
29
    return static_cast<MirInputConfigurationAction>(event.asReader().getInputConfiguration().getAction());
1611
@@ -34,7 +33,6 @@
1612
34
{
33
{
1613
35
    event.getInputConfiguration().setAction(static_cast<mir::capnp::InputConfigurationEvent::Action>(action));
34
    event.getInputConfiguration().setAction(static_cast<mir::capnp::InputConfigurationEvent::Action>(action));
1614
36
}
35
}
1615
37
#pragma GCC diagnostic pop
1616
38
36
1617
39
std::chrono::nanoseconds MirInputConfigurationEvent::when() const
37
std::chrono::nanoseconds MirInputConfigurationEvent::when() const
1618
40
{
38
{
1619
41
39
1620
=== modified file 'src/include/common/mir/events/input_configuration_event.h'
1621
--- src/include/common/mir/events/input_configuration_event.h	2017-01-20 16:27:50 +0000
1622
+++ src/include/common/mir/events/input_configuration_event.h	2017-05-26 16:23:13 +0000
1623
@@ -37,8 +37,7 @@
1624
37
37
1625
38
    MirInputDeviceId id() const;
38
    MirInputDeviceId id() const;
1626
39
    void set_id(MirInputDeviceId id);
39
    void set_id(MirInputDeviceId id);
1629
40
}
40
};
1628
41
 __attribute__((deprecated));
1630
42
#pragma GCC diagnostic pop
41
#pragma GCC diagnostic pop
1631
43
42
1632
44
#endif /* MIR_COMMON_INPUT_CONFIGURATION_EVENT_H_ */
43
#endif /* MIR_COMMON_INPUT_CONFIGURATION_EVENT_H_ */
1633
45
44
1634
=== modified file 'src/platforms/android/utils/CMakeLists.txt'
1635
--- src/platforms/android/utils/CMakeLists.txt	2017-01-18 02:29:37 +0000
1636
+++ src/platforms/android/utils/CMakeLists.txt	2017-05-26 16:23:13 +0000
1637
@@ -36,6 +36,7 @@
1638
36
)
36
)
1639
37
37
1640
38
target_link_libraries(mir_demo_standalone_render_overlays
38
target_link_libraries(mir_demo_standalone_render_overlays
1641
39
  mirclient
1642
39
  mircommon
40
  mircommon
1643
40
  mirplatform
41
  mirplatform
1644
41
)
42
)
1645
42
43
1646
=== modified file 'src/platforms/mesa/server/kms/kms_page_flipper.cpp'
1647
--- src/platforms/mesa/server/kms/kms_page_flipper.cpp	2017-01-18 02:29:37 +0000
1648
+++ src/platforms/mesa/server/kms/kms_page_flipper.cpp	2017-05-26 16:23:13 +0000
1649
@@ -26,6 +26,7 @@
1650
26
#include <xf86drm.h>
26
#include <xf86drm.h>
1651
27
#include <xf86drmMode.h>
27
#include <xf86drmMode.h>
1652
28
#include <chrono>
28
#include <chrono>
1653
29
#include <cstring>
1654
29
30
1655
30
namespace mg = mir::graphics;
31
namespace mg = mir::graphics;
1656
31
namespace mgm = mir::graphics::mesa;
32
namespace mgm = mir::graphics::mesa;
1657
@@ -89,12 +90,11 @@
1658
89
90
1659
90
mg::Frame mgm::KMSPageFlipper::wait_for_flip(uint32_t crtc_id)
91
mg::Frame mgm::KMSPageFlipper::wait_for_flip(uint32_t crtc_id)
1660
91
{
92
{
1667
92
    static drmEventContext evctx =
93
    drmEventContext evctx;
1668
93
    {
94
    memset(&evctx, 0, sizeof evctx);
1669
94
        DRM_EVENT_CONTEXT_VERSION,  /* .version */
95
    evctx.version = 2;  // We only support the old v2 page_flip_handler
1670
95
        0,  /* .vblank_handler */
96
    evctx.page_flip_handler = &page_flip_handler;
1671
96
        page_flip_handler  /* .page_flip_handler */
97
1666
97
    };
1672
98
    static std::thread::id const invalid_tid;
98
    static std::thread::id const invalid_tid;
1673
99
99
1674
100
    {
100
    {
1675
101
101
1676
=== modified file 'src/server/input/default_configuration.cpp'
1677
--- src/server/input/default_configuration.cpp	2017-01-18 02:29:37 +0000
1678
+++ src/server/input/default_configuration.cpp	2017-05-26 16:23:13 +0000
1679
@@ -186,7 +186,9 @@
1680
186
            std::chrono::milliseconds const key_repeat_delay{50};
186
            std::chrono::milliseconds const key_repeat_delay{50};
1681
187
187
1682
188
            auto const options = the_options();
188
            auto const options = the_options();
1684
189
            auto enable_repeat = options->get<bool>(options::enable_key_repeat_opt);
189
            // lp:1675357: Disable generation of key repeat events on nested servers
1685
190
            auto enable_repeat = options->get<bool>(options::enable_key_repeat_opt) &&
1686
191
                !options->is_set(options::host_socket_opt);
1687
190
192
1688
191
            return std::make_shared<mi::KeyRepeatDispatcher>(
193
            return std::make_shared<mi::KeyRepeatDispatcher>(
1689
192
                the_event_filter_chain_dispatcher(), the_main_loop(), the_cookie_authority(),
194
                the_event_filter_chain_dispatcher(), the_main_loop(), the_cookie_authority(),
1690
@@ -365,7 +367,9 @@
1691
365
               the_key_mapper(),
367
               the_key_mapper(),
1692
366
               the_server_status_listener());
368
               the_server_status_listener());
1693
367
369
1695
368
           if (key_repeater && !the_options()->is_set(options::host_socket_opt))
370
           // lp:1675357: KeyRepeatDispatcher must be informed about removed input devices, otherwise
1696
371
           // pressed keys get repeated indefinitely
1697
372
           if (key_repeater)
1698
369
               key_repeater->set_input_device_hub(hub);
373
               key_repeater->set_input_device_hub(hub);
1699
370
           return hub;
374
           return hub;
1700
371
       });
375
       });
1701
372
376
1702
=== modified file 'src/server/input/default_device.cpp'
1703
--- src/server/input/default_device.cpp	2017-01-18 02:29:37 +0000
1704
+++ src/server/input/default_device.cpp	2017-05-26 16:23:13 +0000
1705
@@ -30,10 +30,17 @@
1706
30
30
1707
31
namespace mi = mir::input;
31
namespace mi = mir::input;
1708
32
32
1713
33
mi::DefaultDevice::DefaultDevice(MirInputDeviceId id, std::shared_ptr<dispatch::ActionQueue> const& actions,
33
mi::DefaultDevice::DefaultDevice(MirInputDeviceId id,
1714
34
                                 InputDevice& device, std::shared_ptr<KeyMapper> const& key_mapper)
34
                                 std::shared_ptr<dispatch::ActionQueue> const& actions,
1715
35
    : device_id{id}, device{device}, info(device.get_device_info()), pointer{device.get_pointer_settings()},
35
                                 InputDevice& device,
1716
36
      touchpad{device.get_touchpad_settings()}, actions{actions}, key_mapper{key_mapper}
36
                                 std::shared_ptr<KeyMapper> const& key_mapper)
1717
37
    : device_id{id},
1718
38
      device{device},
1719
39
      info(device.get_device_info()),
1720
40
      pointer{device.get_pointer_settings()},
1721
41
      touchpad{device.get_touchpad_settings()},
1722
42
      actions{actions},
1723
43
      key_mapper{key_mapper}
1724
37
{
44
{
1725
38
    if (contains(info.capabilities, mi::DeviceCapability::keyboard))
45
    if (contains(info.capabilities, mi::DeviceCapability::keyboard))
1726
39
    {
46
    {
1727
@@ -70,8 +77,8 @@
1728
70
    auto const& settings = pointer.value();
77
    auto const& settings = pointer.value();
1729
71
78
1730
72
    return MirPointerConfig(settings.handedness, settings.acceleration,
79
    return MirPointerConfig(settings.handedness, settings.acceleration,
1733
73
                                settings.cursor_acceleration_bias, settings.horizontal_scroll_scale,
80
                            settings.cursor_acceleration_bias, settings.horizontal_scroll_scale,
1734
74
                                settings.vertical_scroll_scale);
81
                            settings.vertical_scroll_scale);
1735
75
}
82
}
1736
76
83
1737
77
mir::optional_value<MirTouchpadConfig> mi::DefaultDevice::touchpad_configuration() const
84
mir::optional_value<MirTouchpadConfig> mi::DefaultDevice::touchpad_configuration() const
1738
@@ -82,14 +89,17 @@
1739
82
    auto const& settings = touchpad.value();
89
    auto const& settings = touchpad.value();
1740
83
90
1741
84
    return MirTouchpadConfig(settings.click_mode, settings.scroll_mode, settings.button_down_scroll_button,
91
    return MirTouchpadConfig(settings.click_mode, settings.scroll_mode, settings.button_down_scroll_button,
1744
85
                                 settings.tap_to_click, settings.disable_while_typing, settings.disable_with_mouse,
92
                             settings.tap_to_click, settings.disable_while_typing, settings.disable_with_mouse,
1745
86
                                 settings.middle_mouse_button_emulation);
93
                             settings.middle_mouse_button_emulation);
1746
87
}
94
}
1747
88
95
1748
89
void mi::DefaultDevice::apply_pointer_configuration(MirPointerConfig const& conf)
96
void mi::DefaultDevice::apply_pointer_configuration(MirPointerConfig const& conf)
1749
90
{
97
{
1752
91
    if (!pointer.is_set())
98
    {
1753
92
        BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot apply a pointer configuration"));
99
        std::lock_guard<std::mutex> lock(config_mutex);
1754
100
        if (!pointer.is_set())
1755
101
            BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot apply a pointer configuration"));
1756
102
    }
1757
93
103
1758
94
    if (conf.cursor_acceleration_bias() < -1.0 || conf.cursor_acceleration_bias() > 1.0)
104
    if (conf.cursor_acceleration_bias() < -1.0 || conf.cursor_acceleration_bias() > 1.0)
1759
95
        BOOST_THROW_EXCEPTION(std::invalid_argument("Cursor acceleration bias out of range"));
105
        BOOST_THROW_EXCEPTION(std::invalid_argument("Cursor acceleration bias out of range"));
1760
@@ -101,18 +111,25 @@
1761
101
    settings.vertical_scroll_scale = conf.vertical_scroll_scale();
111
    settings.vertical_scroll_scale = conf.vertical_scroll_scale();
1762
102
    settings.horizontal_scroll_scale = conf.horizontal_scroll_scale();
112
    settings.horizontal_scroll_scale = conf.horizontal_scroll_scale();
1763
103
113
1770
104
    pointer = settings;
114
    {
1771
105
115
        std::lock_guard<std::mutex> lock(config_mutex);
1772
106
    actions->enqueue([settings = std::move(settings), dev=&device]
116
        pointer = settings;
1773
107
                     {
117
        if (!actions) // device is disabled
1774
108
                         dev->apply_settings(settings);
118
            return;
1775
109
                     });
119
        actions->enqueue([settings = std::move(settings), dev=&device]
1776
120
                         {
1777
121
                             dev->apply_settings(settings);
1778
122
                         });
1779
123
    }
1780
110
}
124
}
1781
111
125
1782
112
void mi::DefaultDevice::apply_touchpad_configuration(MirTouchpadConfig const& conf)
126
void mi::DefaultDevice::apply_touchpad_configuration(MirTouchpadConfig const& conf)
1783
113
{
127
{
1786
114
    if (!touchpad.is_set())
128
    {
1787
115
        BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot apply a touchpad configuration"));
129
        std::lock_guard<std::mutex> lock(config_mutex);
1788
130
        if (!touchpad.is_set())
1789
131
            BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot apply a touchpad configuration"));
1790
132
    }
1791
116
133
1792
117
    if (conf.scroll_mode() & mir_touchpad_scroll_mode_button_down_scroll &&
134
    if (conf.scroll_mode() & mir_touchpad_scroll_mode_button_down_scroll &&
1793
118
        conf.button_down_scroll_button() == mi::no_scroll_button)
135
        conf.button_down_scroll_button() == mi::no_scroll_button)
1794
@@ -127,12 +144,17 @@
1795
127
    settings.tap_to_click = conf.tap_to_click();
144
    settings.tap_to_click = conf.tap_to_click();
1796
128
    settings.middle_mouse_button_emulation = conf.middle_mouse_button_emulation();
145
    settings.middle_mouse_button_emulation = conf.middle_mouse_button_emulation();
1797
129
146
1799
130
    touchpad = settings;
147
    {
1800
148
        std::lock_guard<std::mutex> lock(config_mutex);
1801
149
        touchpad = settings;
1802
131
150
1805
132
    actions->enqueue([settings = std::move(settings), dev=&device]
151
        if (!actions) // device is disabled
1806
133
                     {
152
            return;
1807
153
        actions->enqueue([settings = std::move(settings), dev=&device]
1808
154
                         {
1809
134
                         dev->apply_settings(settings);
155
                         dev->apply_settings(settings);
1811
135
                     });
156
                         });
1812
157
    }
1813
136
}
158
}
1814
137
159
1815
138
mir::optional_value<MirKeyboardConfig> mi::DefaultDevice::keyboard_configuration() const
160
mir::optional_value<MirKeyboardConfig> mi::DefaultDevice::keyboard_configuration() const
1816
@@ -145,9 +167,18 @@
1817
145
    if (!contains(info.capabilities, mi::DeviceCapability::keyboard))
167
    if (!contains(info.capabilities, mi::DeviceCapability::keyboard))
1818
146
        BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot apply a keyboard configuration"));
168
        BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot apply a keyboard configuration"));
1819
147
169
1820
170
    std::lock_guard<std::mutex> lock(config_mutex);
1821
171
    if (!actions) // device is disabled
1822
172
        return;
1823
148
    if (keyboard.value().device_keymap() != conf.device_keymap())
173
    if (keyboard.value().device_keymap() != conf.device_keymap())
1824
149
    {
1825
150
        keyboard = conf;
174
        keyboard = conf;
1828
151
        key_mapper->set_keymap_for_device(device_id, conf.device_keymap());
175
    else
1829
152
    }
176
        return;
1830
177
    key_mapper->set_keymap_for_device(device_id, conf.device_keymap());
1831
178
}
1832
179
1833
180
void mi::DefaultDevice::disable_queue()
1834
181
{
1835
182
    std::lock_guard<std::mutex> lock(config_mutex);
1836
183
    actions.reset();
1837
153
}
184
}
1838
154
185
1839
=== modified file 'src/server/input/default_device.h'
1840
--- src/server/input/default_device.h	2017-01-18 02:29:37 +0000
1841
+++ src/server/input/default_device.h	2017-05-26 16:23:13 +0000
1842
@@ -29,6 +29,7 @@
1843
29
#include "mir/optional_value.h"
29
#include "mir/optional_value.h"
1844
30
30
1845
31
#include <memory>
31
#include <memory>
1846
32
#include <mutex>
1847
32
33
1848
33
namespace mir
34
namespace mir
1849
34
{
35
{
1850
@@ -58,6 +59,7 @@
1851
58
    void apply_touchpad_configuration(MirTouchpadConfig const&) override;
59
    void apply_touchpad_configuration(MirTouchpadConfig const&) override;
1852
59
    optional_value<MirKeyboardConfig> keyboard_configuration() const override;
60
    optional_value<MirKeyboardConfig> keyboard_configuration() const override;
1853
60
    void apply_keyboard_configuration(MirKeyboardConfig const&) override;
61
    void apply_keyboard_configuration(MirKeyboardConfig const&) override;
1854
62
    void disable_queue();
1855
61
private:
63
private:
1856
62
    MirInputDeviceId const device_id;
64
    MirInputDeviceId const device_id;
1857
63
    InputDevice& device;
65
    InputDevice& device;
1858
@@ -65,8 +67,9 @@
1859
65
    optional_value<PointerSettings> pointer;
67
    optional_value<PointerSettings> pointer;
1860
66
    optional_value<TouchpadSettings> touchpad;
68
    optional_value<TouchpadSettings> touchpad;
1861
67
    optional_value<MirKeyboardConfig> keyboard;
69
    optional_value<MirKeyboardConfig> keyboard;
1863
68
    std::shared_ptr<dispatch::ActionQueue> const actions;
70
    std::shared_ptr<dispatch::ActionQueue> actions;
1864
69
    std::shared_ptr<KeyMapper> const key_mapper;
71
    std::shared_ptr<KeyMapper> const key_mapper;
1865
72
    std::mutex mutable config_mutex;
1866
70
};
73
};
1867
71
74
1868
72
}
75
}
1869
73
76
1870
=== modified file 'src/server/input/default_input_device_hub.cpp'
1871
--- src/server/input/default_input_device_hub.cpp	2017-01-19 09:38:52 +0000
1872
+++ src/server/input/default_input_device_hub.cpp	2017-05-26 16:23:13 +0000
1873
@@ -99,15 +99,16 @@
1874
99
    if (it == end(devices))
99
    if (it == end(devices))
1875
100
    {
100
    {
1876
101
        auto id = create_new_device_id();
101
        auto id = create_new_device_id();
1878
102
        auto handle = std::make_shared<DefaultDevice>(id, device_queue, *device, key_mapper);
102
        auto queue = std::make_shared<dispatch::ActionQueue>();
1879
103
        auto handle = std::make_shared<DefaultDevice>(id, queue, *device, key_mapper);
1880
103
        // send input device info to observer loop..
104
        // send input device info to observer loop..
1881
104
        devices.push_back(std::make_unique<RegisteredDevice>(
105
        devices.push_back(std::make_unique<RegisteredDevice>(
1883
105
            device, id, input_dispatchable, cookie_authority, handle));
106
            device, handle->id(), queue, cookie_authority, handle));
1884
106
107
1885
107
        auto const& dev = devices.back();
108
        auto const& dev = devices.back();
1886
108
109
1887
109
        seat->add_device(*handle);
110
        seat->add_device(*handle);
1889
110
        dev->start(seat);
111
        dev->start(seat, input_dispatchable);
1890
111
112
1891
112
        // pass input device handle to observer loop..
113
        // pass input device handle to observer loop..
1892
113
        observer_queue->enqueue(this,
114
        observer_queue->enqueue(this,
1893
@@ -115,7 +116,6 @@
1894
115
                                {
116
                                {
1895
116
                                    add_device_handle(handle);
117
                                    add_device_handle(handle);
1896
117
                                });
118
                                });
1897
118
1898
119
    }
119
    }
1899
120
    else
120
    else
1900
121
    {
121
    {
1901
@@ -140,7 +140,7 @@
1902
140
                if (seat)
140
                if (seat)
1903
141
                {
141
                {
1904
142
                    seat->remove_device(*item->handle);
142
                    seat->remove_device(*item->handle);
1906
143
                    item->stop();
143
                    item->stop(input_dispatchable);
1907
144
                }
144
                }
1908
145
                // send input device info to observer queue..
145
                // send input device info to observer queue..
1909
146
                observer_queue->enqueue(
146
                observer_queue->enqueue(
1910
@@ -166,14 +166,14 @@
1911
166
mi::DefaultInputDeviceHub::RegisteredDevice::RegisteredDevice(
166
mi::DefaultInputDeviceHub::RegisteredDevice::RegisteredDevice(
1912
167
    std::shared_ptr<InputDevice> const& dev,
167
    std::shared_ptr<InputDevice> const& dev,
1913
168
    MirInputDeviceId device_id,
168
    MirInputDeviceId device_id,
1915
169
    std::shared_ptr<dispatch::MultiplexingDispatchable> const& multiplexer,
169
    std::shared_ptr<dispatch::ActionQueue> const& queue,
1916
170
    std::shared_ptr<mir::cookie::Authority> const& cookie_authority,
170
    std::shared_ptr<mir::cookie::Authority> const& cookie_authority,
1917
171
    std::shared_ptr<mi::DefaultDevice> const& handle)
171
    std::shared_ptr<mi::DefaultDevice> const& handle)
1918
172
    : handle(handle),
172
    : handle(handle),
1919
173
      device_id(device_id),
173
      device_id(device_id),
1920
174
      cookie_authority(cookie_authority),
174
      cookie_authority(cookie_authority),
1921
175
      device(dev),
175
      device(dev),
1923
176
      multiplexer(multiplexer)
176
      queue(queue)
1924
177
{
177
{
1925
178
}
178
}
1926
179
179
1927
@@ -206,17 +206,23 @@
1928
206
    return dev == device;
206
    return dev == device;
1929
207
}
207
}
1930
208
208
1932
209
void mi::DefaultInputDeviceHub::RegisteredDevice::start(std::shared_ptr<Seat> const& seat)
209
void mi::DefaultInputDeviceHub::RegisteredDevice::start(std::shared_ptr<Seat> const& seat, std::shared_ptr<dispatch::MultiplexingDispatchable> const& multiplexer)
1933
210
{
210
{
1934
211
    multiplexer->add_watch(queue);
1935
212
1936
211
    this->seat = seat;
213
    this->seat = seat;
1937
212
    builder = std::make_unique<DefaultEventBuilder>(device_id, cookie_authority, seat);
214
    builder = std::make_unique<DefaultEventBuilder>(device_id, cookie_authority, seat);
1938
213
    device->start(this, builder.get());
215
    device->start(this, builder.get());
1939
214
}
216
}
1940
215
217
1942
216
void mi::DefaultInputDeviceHub::RegisteredDevice::stop()
218
void mi::DefaultInputDeviceHub::RegisteredDevice::stop(std::shared_ptr<dispatch::MultiplexingDispatchable> const& multiplexer)
1943
217
{
219
{
1944
220
    multiplexer->remove_watch(queue);
1945
221
    handle->disable_queue();
1946
222
1947
218
    device->stop();
223
    device->stop();
1948
219
    seat = nullptr;
224
    seat = nullptr;
1949
225
    queue.reset();
1950
220
    builder.reset();
226
    builder.reset();
1951
221
}
227
}
1952
222
228
1953
223
229
1954
=== modified file 'src/server/input/default_input_device_hub.h'
1955
--- src/server/input/default_input_device_hub.h	2017-01-19 09:38:52 +0000
1956
+++ src/server/input/default_input_device_hub.h	2017-05-26 16:23:13 +0000
1957
@@ -90,6 +90,7 @@
1958
90
    void device_changed(Device* dev);
90
    void device_changed(Device* dev);
1959
91
    void emit_changed_devices();
91
    void emit_changed_devices();
1960
92
    MirInputDeviceId create_new_device_id();
92
    MirInputDeviceId create_new_device_id();
1961
93
1962
93
    std::shared_ptr<Seat> const seat;
94
    std::shared_ptr<Seat> const seat;
1963
94
    std::shared_ptr<frontend::EventSink> const sink;
95
    std::shared_ptr<frontend::EventSink> const sink;
1964
95
    std::shared_ptr<dispatch::MultiplexingDispatchable> const input_dispatchable;
96
    std::shared_ptr<dispatch::MultiplexingDispatchable> const input_dispatchable;
1965
@@ -105,14 +106,14 @@
1966
105
    public:
106
    public:
1967
106
        RegisteredDevice(std::shared_ptr<InputDevice> const& dev,
107
        RegisteredDevice(std::shared_ptr<InputDevice> const& dev,
1968
107
                         MirInputDeviceId dev_id,
108
                         MirInputDeviceId dev_id,
1970
108
                         std::shared_ptr<dispatch::MultiplexingDispatchable> const& multiplexer,
109
                         std::shared_ptr<dispatch::ActionQueue> const& multiplexer,
1971
109
                         std::shared_ptr<cookie::Authority> const& cookie_authority,
110
                         std::shared_ptr<cookie::Authority> const& cookie_authority,
1972
110
                         std::shared_ptr<DefaultDevice> const& handle);
111
                         std::shared_ptr<DefaultDevice> const& handle);
1973
111
        void handle_input(MirEvent& event) override;
112
        void handle_input(MirEvent& event) override;
1974
112
        mir::geometry::Rectangle bounding_rectangle() const override;
113
        mir::geometry::Rectangle bounding_rectangle() const override;
1975
113
        bool device_matches(std::shared_ptr<InputDevice> const& dev) const;
114
        bool device_matches(std::shared_ptr<InputDevice> const& dev) const;
1978
114
        void start(std::shared_ptr<Seat> const& seat);
115
        void start(std::shared_ptr<Seat> const& seat, std::shared_ptr<dispatch::MultiplexingDispatchable> const& dispatchable);
1979
115
        void stop();
116
        void stop(std::shared_ptr<dispatch::MultiplexingDispatchable> const& dispatchable);
1980
116
        MirInputDeviceId id();
117
        MirInputDeviceId id();
1981
117
        std::shared_ptr<Seat> seat;
118
        std::shared_ptr<Seat> seat;
1982
118
        const std::shared_ptr<DefaultDevice> handle;
119
        const std::shared_ptr<DefaultDevice> handle;
1983
@@ -124,7 +125,7 @@
1984
124
        std::unique_ptr<DefaultEventBuilder> builder;
125
        std::unique_ptr<DefaultEventBuilder> builder;
1985
125
        std::shared_ptr<cookie::Authority> cookie_authority;
126
        std::shared_ptr<cookie::Authority> cookie_authority;
1986
126
        std::shared_ptr<InputDevice> const device;
127
        std::shared_ptr<InputDevice> const device;
1988
127
        std::shared_ptr<dispatch::MultiplexingDispatchable> const multiplexer;
128
        std::shared_ptr<dispatch::ActionQueue> queue;
1989
128
    };
129
    };
1990
129
130
1991
130
    std::vector<std::shared_ptr<Device>> handles;
131
    std::vector<std::shared_ptr<Device>> handles;
1992
131
132
1993
=== modified file 'tests/unit-tests/input/test_default_device.cpp'
1994
--- tests/unit-tests/input/test_default_device.cpp	2017-01-18 02:29:37 +0000
1995
+++ tests/unit-tests/input/test_default_device.cpp	2017-05-26 16:23:13 +0000
1996
@@ -155,3 +155,26 @@
1997
155
155
1998
156
    queue->dispatch(md::FdEvent::readable);
156
    queue->dispatch(md::FdEvent::readable);
1999
157
}
157
}
2000
158
2001
159
TEST_F(DefaultDevice, disable_queue_ends_config_processing)
2002
160
{
2003
161
    mi::DefaultDevice dev(MirInputDeviceId{17}, queue, touchpad, mt::fake_shared(key_mapper));
2004
162
2005
163
    dev.disable_queue();
2006
164
    MirPointerConfig pointer_conf;
2007
165
    pointer_conf.cursor_acceleration_bias(1.0);
2008
166
2009
167
    EXPECT_CALL(touchpad, apply_settings(Matcher<mi::TouchpadSettings const&>(_))).Times(0);
2010
168
    dev.apply_pointer_configuration(pointer_conf);
2011
169
}
2012
170
2013
171
TEST_F(DefaultDevice, disable_queue_removes_reference_to_queue)
2014
172
{
2015
173
    std::weak_ptr<md::ActionQueue> ref = queue;
2016
174
    mi::DefaultDevice dev(MirInputDeviceId{17}, queue, touchpad, mt::fake_shared(key_mapper));
2017
175
    queue.reset();
2018
176
2019
177
    EXPECT_THAT(ref.lock(), Ne(nullptr));
2020
178
    dev.disable_queue();
2021
179
    EXPECT_THAT(ref.lock(), Eq(nullptr));
2022
180
}
2023
158
181
2024
=== modified file 'tests/unit-tests/input/test_default_input_device_hub.cpp'
2025
--- tests/unit-tests/input/test_default_input_device_hub.cpp	2017-01-19 09:38:52 +0000
2026
+++ tests/unit-tests/input/test_default_input_device_hub.cpp	2017-05-26 16:23:13 +0000
2027
@@ -236,3 +236,21 @@
2028
236
    observer_loop.trigger_server_actions();
236
    observer_loop.trigger_server_actions();
2029
237
}
237
}
2030
238
238
2031
239
TEST_F(InputDeviceHubTest, no_device_config_action_after_device_removal)
2032
240
{
2033
241
    std::shared_ptr<mi::Device> dev_ptr;
2034
242
    MirPointerConfig ptr_config;
2035
243
    ptr_config.cursor_acceleration_bias(0.5);
2036
244
2037
245
    ON_CALL(mock_observer, device_added(WithName("mouse"))).WillByDefault(SaveArg<0>(&dev_ptr));
2038
246
2039
247
    hub.add_device(mt::fake_shared(mouse));
2040
248
    hub.add_observer(mt::fake_shared(mock_observer));
2041
249
    observer_loop.trigger_server_actions();
2042
250
2043
251
    EXPECT_CALL(mouse, apply_settings(Matcher<mi::PointerSettings const&>(_))).Times(0);
2044
252
2045
253
    dev_ptr->apply_pointer_configuration(ptr_config);
2046
254
    hub.remove_device(mt::fake_shared(mouse));
2047
255
    observer_loop.trigger_server_actions();
2048
256
}
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-05-26
Alan Griffiths			Needs Fixing on 2017-05-26
Daniel van Vugt		2017-04-25	Approve on 2017-05-11
Review via email: mp+323122@code.launchpad.net