1
=== modified file 'examples/CMakeLists.txt'
2
--- examples/CMakeLists.txt	2014-06-11 16:11:32 +0000
3
+++ examples/CMakeLists.txt	2014-07-21 15:42:48 +0000
4
@@ -36,6 +36,12 @@
5
36
target_link_libraries(mir_demo_client_eglplasma
36
target_link_libraries(mir_demo_client_eglplasma
6
37
  eglapp
37
  eglapp
7
38
)
38
)
8
39
add_executable(mir_demo_client_cursors
9
40
  cursors_demo_client.c
10
41
)
11
42
target_link_libraries(mir_demo_client_cursors
12
43
  eglapp
13
44
)
14
39
45
15
40
add_executable(mir_demo_client_basic
46
add_executable(mir_demo_client_basic
16
41
  basic.c
47
  basic.c
17
42
48
18
=== added file 'examples/cursors_demo_client.c'
19
--- examples/cursors_demo_client.c	1970-01-01 00:00:00 +0000
20
+++ examples/cursors_demo_client.c	2014-07-21 15:42:48 +0000
21
@@ -0,0 +1,75 @@
22
1
/*
23
2
 * Copyright © 2014 Canonical LTD
24
3
 *
25
4
 * This program is free software: you can redistribute it and/or modify
26
5
 * it under the terms of the GNU General Public License version 3 as
27
6
 * published by the Free Software Foundation.
28
7
 *
29
8
 * This program is distributed in the hope that it will be useful,
30
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
31
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
32
11
 * GNU General Public License for more details.
33
12
 *
34
13
 * You should have received a copy of the GNU General Public License
35
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
36
15
 *
37
16
 * Author: Robert Carr <robert.carr@canonical.com>
38
17
 */
39
18
40
19
#include "mir_toolkit/mir_client_library.h"
41
20
42
21
#include "eglapp.h"
43
22
#include <stdio.h>
44
23
#include <unistd.h>
45
24
#include <GLES2/gl2.h>
46
25
47
26
void configure_cursor(MirSurface *surface, unsigned int cursor_index)
48
27
{
49
28
    char const *const cursors[] = {
50
29
        mir_arrow_cursor_name,
51
30
        mir_busy_cursor_name,
52
31
        mir_caret_cursor_name,
53
32
        mir_pointing_hand_cursor_name,
54
33
        mir_open_hand_cursor_name,
55
34
        mir_closed_hand_cursor_name,
56
35
        mir_horizontal_resize_cursor_name,
57
36
        mir_vertical_resize_cursor_name,
58
37
        mir_diagonal_resize_bottom_to_top_cursor_name,
59
38
        mir_diagonal_resize_top_to_bottom_cursor_name,
60
39
        mir_omnidirectional_resize_cursor_name,
61
40
        mir_vsplit_resize_cursor_name,
62
41
        mir_hsplit_resize_cursor_name
63
42
    };
64
43
65
44
    size_t num_cursors = sizeof(cursors)/sizeof(*cursors);
66
45
    size_t real_index = cursor_index % num_cursors;
67
46
    
68
47
    MirCursorConfiguration *conf = mir_cursor_configuration_from_name(cursors[real_index]);
69
48
70
49
    mir_wait_for(mir_surface_configure_cursor(surface, conf));
71
50
    
72
51
    mir_cursor_configuration_destroy(conf);
73
52
}
74
53
75
54
int main(int argc, char *argv[])
76
55
{
77
56
    unsigned int width = 128, height = 128;
78
57
79
58
    if (!mir_eglapp_init(argc, argv, &width, &height))
80
59
        return 1;
81
60
82
61
    glClearColor(0.5, 0.5, 0.5, mir_eglapp_background_opacity);
83
62
    glClear(GL_COLOR_BUFFER_BIT);
84
63
    mir_eglapp_swap_buffers();
85
64
86
65
    unsigned int cursor_index = 0;
87
66
    while (mir_eglapp_running())
88
67
    {
89
68
        configure_cursor(mir_eglapp_native_surface(), cursor_index++);
90
69
        sleep(1);
91
70
    }
92
71
93
72
    mir_eglapp_shutdown();
94
73
95
74
    return 0;
96
75
}
97
0
76
98
=== modified file 'include/client/mir_toolkit/mir_cursor_configuration.h'
99
--- include/client/mir_toolkit/mir_cursor_configuration.h	2014-06-17 22:07:15 +0000
100
+++ include/client/mir_toolkit/mir_cursor_configuration.h	2014-07-21 15:42:48 +0000
101
@@ -42,8 +42,9 @@
102
42
42
103
43
/**
43
/**
104
44
 * Returns a new MirCursorConfiguration representing a named cursor
44
 * Returns a new MirCursorConfiguration representing a named cursor
107
45
 * from the system cursor theme. Currently only the symbolic values,
45
 * from the system cursor theme. Symbolic cursor names, such as
108
46
 * mir_default_cursor_name and mir_disabled_cursor_name are supported
46
 * mir_default_cursor_name and mir_caret_cursor_name are available
109
47
 * see (mir_toolkit/cursors.h).
110
47
 * as input.
48
 * as input.
111
48
 *    \param [in] name The cursor name
49
 *    \param [in] name The cursor name
112
49
 *    \return A cursor parameters object which must be passed
50
 *    \return A cursor parameters object which must be passed
113
50
51
114
=== modified file 'include/shared/mir_toolkit/common.h'
115
--- include/shared/mir_toolkit/common.h	2014-07-08 17:16:01 +0000
116
+++ include/shared/mir_toolkit/common.h	2014-07-21 15:42:48 +0000
117
@@ -21,6 +21,8 @@
118
21
#ifndef MIR_COMMON_H_
21
#ifndef MIR_COMMON_H_
119
22
#define MIR_COMMON_H_
22
#define MIR_COMMON_H_
120
23
23
121
24
#include <mir_toolkit/cursors.h>
122
25
123
24
/**
26
/**
124
25
 * \addtogroup mir_toolkit
27
 * \addtogroup mir_toolkit
125
26
 * @{
28
 * @{
126
@@ -137,17 +139,6 @@
127
137
    mir_orientation_right = 270
139
    mir_orientation_right = 270
128
138
} MirOrientation;
140
} MirOrientation;
129
139
141
130
140
/**
131
141
 * A special cursor name for use with mir_cursor_configuration_from_name
132
142
 * representing the system default cursor.
133
143
 */
134
144
extern char const *const mir_default_cursor_name;
135
145
/**
136
146
 * A special cursor name for use with mir_cursor_configuration_from_name
137
147
 * representing a disabled cursor image.
138
148
 */
139
149
extern char const *const mir_disabled_cursor_name;
140
150
141
151
/**@}*/
142
/**@}*/
142
152
143
143
153
#endif
144
#endif
144
154
145
145
=== added file 'include/shared/mir_toolkit/cursors.h'
146
--- include/shared/mir_toolkit/cursors.h	1970-01-01 00:00:00 +0000
147
+++ include/shared/mir_toolkit/cursors.h	2014-07-21 15:42:48 +0000
148
@@ -0,0 +1,115 @@
149
1
/*
150
2
 * Cursor name definitions.
151
3
 *
152
4
 * Copyright © 2014 Canonical Ltd.
153
5
 *
154
6
 * This program is free software: you can redistribute it and/or modify
155
7
 * it under the terms of the GNU Lesser General Public License version 3 as
156
8
 * published by the Free Software Foundation.
157
9
 *
158
10
 * This program is distributed in the hope that it will be useful,
159
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
160
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
161
13
 * GNU Lesser General Public License for more details.
162
14
 *
163
15
 * You should have received a copy of the GNU Lesser General Public License
164
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
165
17
 *
166
18
 * Author: Robert Carr <robert.carr@canonical.com>
167
19
 */
168
20
169
21
#ifndef MIR_CURSORS_H_
170
22
#define MIR_CURSORS_H_
171
23
172
24
/**
173
25
 * \addtogroup mir_toolkit
174
26
 * @{
175
27
 */
176
28
177
29
/* This is C code. Not C++. */
178
30
179
31
/**
180
32
 * A special cursor name for use with mir_cursor_configuration_from_name
181
33
 * representing the system default cursor.
182
34
 */
183
35
extern char const *const mir_default_cursor_name;
184
36
/**
185
37
 * A special cursor name for use with mir_cursor_configuration_from_name
186
38
 * representing a disabled cursor image.
187
39
 */
188
40
extern char const *const mir_disabled_cursor_name;
189
41
190
42
/**
191
43
 * The standard arrow cursor (typically the system default)
192
44
 */
193
45
extern char const* const mir_arrow_cursor_name;
194
46
195
47
/**
196
48
 * The "wait" cursor, typically an hourglass or watch used during operations
197
49
 * which prevent the user from interacting.
198
50
 */
199
51
extern char const* const mir_busy_cursor_name;
200
52
201
53
/**
202
54
 * The caret or ibeam cursor, indicating acceptance of text input
203
55
 */
204
56
extern char const* const mir_caret_cursor_name;
205
57
206
58
/**
207
59
 * The pointing hand cursor, typically used for clickable elements such
208
60
 * as hyperlinks.
209
61
 */
210
62
extern char const* const mir_pointing_hand_cursor_name;
211
63
212
64
/**
213
65
 * The open handed cursor, typically used to indicate that the area beneath
214
66
 * the cursor may be clicked and dragged around.
215
67
 */
216
68
extern char const* const mir_open_hand_cursor_name;
217
69
218
70
/**
219
71
 * The close handed cursor, typically used to indicate that a drag operation is in process
220
72
 * which involves scrolling.
221
73
 */
222
74
extern char const* const mir_closed_hand_cursor_name;
223
75
224
76
/**
225
77
 * The cursor used to indicate a horizontal resize operation.
226
78
 */
227
79
extern char const* const mir_horizontal_resize_cursor_name;
228
80
229
81
/**
230
82
 * The cursor used to indicate a vertical resize operation.
231
83
 */
232
84
extern char const* const mir_vertical_resize_cursor_name;
233
85
234
86
/**
235
87
 * The cursor used to indicate diagonal resize from top-right and bottom-left corners.
236
88
 */
237
89
extern char const* const mir_diagonal_resize_bottom_to_top_cursor_name;
238
90
239
91
/**
240
92
 * The cursor used to indicate diagonal resize from bottom-left and top-right corners.
241
93
 */
242
94
extern char const* const mir_diagonal_resize_top_to_bottom_cursor_name;
243
95
244
96
/**
245
97
 * The cursor used to indicate resize with no directional constraint.
246
98
 */
247
99
extern char const* const mir_omnidirectional_resize_cursor_name;
248
100
249
101
/**
250
102
 * The cursor used for vertical splitters, indicating that a handle may be
251
103
 * dragged to adjust vertical space.
252
104
 */
253
105
extern char const* const mir_vsplit_resize_cursor_name;
254
106
255
107
/**
256
108
 * The cursor used for horizontal splitters, indicating that a handle may be
257
109
 * dragged to adjust horizontal space.
258
110
 */
259
111
extern char const* const mir_hsplit_resize_cursor_name;
260
112
261
113
/**@}*/
262
114
263
115
#endif
264
0
116
265
=== modified file 'src/client/mir_cursor_api.cpp'
266
--- src/client/mir_cursor_api.cpp	2014-06-17 22:07:15 +0000
267
+++ src/client/mir_cursor_api.cpp	2014-07-21 15:42:48 +0000
268
@@ -23,6 +23,19 @@
269
23
23
270
24
char const *const mir_default_cursor_name = "default";
24
char const *const mir_default_cursor_name = "default";
271
25
char const *const mir_disabled_cursor_name = "disabled";
25
char const *const mir_disabled_cursor_name = "disabled";
272
26
char const* const mir_arrow_cursor_name = "arrow";
273
27
char const* const mir_busy_cursor_name = "busy";
274
28
char const* const mir_caret_cursor_name = "caret";
275
29
char const* const mir_pointing_hand_cursor_name = "pointing-hand";
276
30
char const* const mir_open_hand_cursor_name = "open-hand";
277
31
char const* const mir_closed_hand_cursor_name = "closed-hand";
278
32
char const* const mir_horizontal_resize_cursor_name = "horizontal-resize";
279
33
char const* const mir_vertical_resize_cursor_name = "vertical-resize";
280
34
char const* const mir_diagonal_resize_bottom_to_top_cursor_name = "diagonal-resize-bottom-to-top";
281
35
char const* const mir_diagonal_resize_top_to_bottom_cursor_name = "diagonal-resize-top_to_bottom";
282
36
char const* const mir_omnidirectional_resize_cursor_name = "omnidirectional-resize";
283
37
char const* const mir_vsplit_resize_cursor_name = "vsplit-resize";
284
38
char const* const mir_hsplit_resize_cursor_name = "hsplit-resize";
285
26
39
286
27
MirCursorConfiguration::MirCursorConfiguration(char const* name) :
40
MirCursorConfiguration::MirCursorConfiguration(char const* name) :
287
28
    name{name ? name : std::string()}
41
    name{name ? name : std::string()}
288
29
42
289
=== modified file 'src/server/input/xcursor_loader.cpp'
290
--- src/server/input/xcursor_loader.cpp	2014-06-25 05:16:43 +0000
291
+++ src/server/input/xcursor_loader.cpp	2014-07-21 15:42:48 +0000
292
@@ -25,6 +25,8 @@
293
25
25
294
26
#include <string.h>
26
#include <string.h>
295
27
27
296
28
#include <mir_toolkit/cursors.h>
297
29
298
28
// Unforunately this can not be compiled as C++...so we can not namespace
30
// Unforunately this can not be compiled as C++...so we can not namespace
299
29
// these symbols. In order to differentiate from internal symbols
31
// these symbols. In order to differentiate from internal symbols
300
30
//  we refer to them via their _ prefixed version, i.e. _XcursorImage
32
//  we refer to them via their _ prefixed version, i.e. _XcursorImage
301
@@ -75,6 +77,71 @@
302
75
    _XcursorImage *image;
77
    _XcursorImage *image;
303
76
    std::shared_ptr<_XcursorImages> const save_resource;
78
    std::shared_ptr<_XcursorImages> const save_resource;
304
77
};
79
};
305
80
306
81
std::string const
307
82
xcursor_name_for_mir_cursor(std::string const& mir_cursor_name)
308
83
{
309
84
    if (mir_cursor_name == mir_default_cursor_name)
310
85
    {
311
86
        return "arrow";
312
87
    }
313
88
    else if (mir_cursor_name == mir_arrow_cursor_name)
314
89
    {
315
90
        return "arrow";
316
91
    }
317
92
    else if (mir_cursor_name == mir_busy_cursor_name)
318
93
    {
319
94
        return "watch";
320
95
    }
321
96
    else if (mir_cursor_name == mir_caret_cursor_name)
322
97
    {
323
98
        return "xterm"; // Yep
324
99
    }
325
100
    else if (mir_cursor_name == mir_pointing_hand_cursor_name)
326
101
    {
327
102
        return "hand2";
328
103
    }
329
104
    else if (mir_cursor_name == mir_open_hand_cursor_name)
330
105
    {
331
106
        return "hand";
332
107
    }
333
108
    else if (mir_cursor_name == mir_closed_hand_cursor_name)
334
109
    {
335
110
        return "grabbing";
336
111
    }
337
112
    else if (mir_cursor_name == mir_horizontal_resize_cursor_name)
338
113
    {
339
114
        return "h_double_arrow";
340
115
    }
341
116
    else if (mir_cursor_name == mir_vertical_resize_cursor_name)
342
117
    {
343
118
        return "v_double_arrow";
344
119
    }
345
120
    else if (mir_cursor_name == mir_diagonal_resize_bottom_to_top_cursor_name)
346
121
    {
347
122
        return "top_right_corner";
348
123
    }
349
124
    else if (mir_cursor_name == mir_diagonal_resize_top_to_bottom_cursor_name)
350
125
    {
351
126
        return "bottom_right_corner";
352
127
    }
353
128
    else if (mir_cursor_name == mir_omnidirectional_resize_cursor_name)
354
129
    {
355
130
        return "fleur";
356
131
    }
357
132
    else if (mir_cursor_name == mir_vsplit_resize_cursor_name)
358
133
    {
359
134
        return "v_double_arrow";
360
135
    }
361
136
    else if (mir_cursor_name == mir_hsplit_resize_cursor_name)
362
137
    {
363
138
        return "h_double_arrow";
364
139
    }
365
140
    else
366
141
    {
367
142
        return mir_cursor_name;
368
143
    }
369
144
}
370
78
}
145
}
371
79
146
372
80
mi::XCursorLoader::XCursorLoader()
147
mi::XCursorLoader::XCursorLoader()
373
@@ -129,9 +196,7 @@
374
129
std::shared_ptr<mg::CursorImage> mi::XCursorLoader::image(std::string const& cursor_name,
196
std::shared_ptr<mg::CursorImage> mi::XCursorLoader::image(std::string const& cursor_name,
375
130
    geom::Size const& size)
197
    geom::Size const& size)
376
131
{
198
{
380
132
    // 'arrow' is the default cursor in XCursor themes.
199
    auto xcursor_name = xcursor_name_for_mir_cursor(cursor_name);
378
133
    if (cursor_name == "default")
379
134
        return image("arrow", size);
381
135
200
382
136
    if (size != mi::default_cursor_size)
201
    if (size != mi::default_cursor_size)
383
137
        BOOST_THROW_EXCEPTION(
202
        BOOST_THROW_EXCEPTION(
384
@@ -139,7 +204,7 @@
385
139
    
204
    
386
140
    std::lock_guard<std::mutex> lg(guard);
205
    std::lock_guard<std::mutex> lg(guard);
387
141
206
389
142
    auto it = loaded_images.find(cursor_name);
207
    auto it = loaded_images.find(xcursor_name);
390
143
    if (it != loaded_images.end())
208
    if (it != loaded_images.end())
391
144
        return it->second;
209
        return it->second;
392
145
210
Status:	Merged
Approved by:	Robert Carr on 2014-07-21
Approved revision:	no longer in the source branch.
Merged at revision:	1782
Proposed branch:	lp:~mir-team/mir/cursor-spike-phase-7-name-some-cursors
Merge into:	lp:mir
Prerequisite:	lp:~mir-team/mir/cursor-spike-phase-6-load-x-cursors
Diff against target:	391 lines (+283/-17) 7 files modified examples/CMakeLists.txt (+6/-0) examples/cursors_demo_client.c (+75/-0) include/client/mir_toolkit/mir_cursor_configuration.h (+3/-2) include/shared/mir_toolkit/common.h (+2/-11) include/shared/mir_toolkit/cursors.h (+115/-0) src/client/mir_cursor_api.cpp (+13/-0) src/server/input/xcursor_loader.cpp (+69/-4)
To merge this branch:	bzr merge lp:~mir-team/mir/cursor-spike-phase-7-name-some-cursors
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-07-02	Approve on 2014-07-21
Kevin DuBois (community)			Approve on 2014-07-21
Cemil Azizoglu (community)			Approve on 2014-07-21
Alan Griffiths		2014-07-02	Approve on 2014-07-09
Review via email: mp+225242@code.launchpad.net