1
=== modified file 'examples/fingerpaint.c'
2
--- examples/fingerpaint.c	2015-08-25 02:27:09 +0000
3
+++ examples/fingerpaint.c	2015-10-19 05:47:59 +0000
4
@@ -42,6 +42,7 @@
5
42
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
42
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
6
43
static pthread_cond_t change = PTHREAD_COND_INITIALIZER;
43
static pthread_cond_t change = PTHREAD_COND_INITIALIZER;
7
44
static bool changed = true;
44
static bool changed = true;
8
45
static int force_radius = 0;
9
45
46
10
46
static void shutdown(int signum)
47
static void shutdown(int signum)
11
47
{
48
{
12
@@ -263,11 +264,13 @@
13
263
                {
264
                {
14
264
                    x = mir_touch_event_axis_value(tev, p, mir_touch_axis_x);
265
                    x = mir_touch_event_axis_value(tev, p, mir_touch_axis_x);
15
265
                    y = mir_touch_event_axis_value(tev, p, mir_touch_axis_y);
266
                    y = mir_touch_event_axis_value(tev, p, mir_touch_axis_y);
18
266
                    float size = mir_touch_event_axis_value(tev, p,
267
                    float m = mir_touch_event_axis_value(tev, p,
19
267
                                                          mir_touch_axis_size);
268
                                                  mir_touch_axis_touch_major);
20
269
                    float n = mir_touch_event_axis_value(tev, p,
21
270
                                                  mir_touch_axis_touch_minor);
22
271
                    radius = (m + n) / 4;  /* Half the average */
23
268
                    pressure = mir_touch_event_axis_value(tev, p,
272
                    pressure = mir_touch_event_axis_value(tev, p,
24
269
                                                      mir_touch_axis_pressure);
273
                                                      mir_touch_axis_pressure);
25
270
                    radius = size * 50.0f + 1.0f;
26
271
                }
274
                }
27
272
                else if (pev != NULL)
275
                else if (pev != NULL)
28
273
                {
276
                {
29
@@ -277,6 +280,9 @@
30
277
                    radius = 5;
280
                    radius = 5;
31
278
                }
281
                }
32
279
282
33
283
                if (force_radius)
34
284
                    radius = force_radius;
35
285
36
280
                size_t c = (base_color + p) %
286
                size_t c = (base_color + p) %
37
281
                           (sizeof(color)/sizeof(color[0]));
287
                           (sizeof(color)/sizeof(color[0]));
38
282
                Color tone = color[c];
288
                Color tone = color[c];
39
@@ -365,7 +371,18 @@
40
365
                switch (arg[1])
371
                switch (arg[1])
41
366
                {
372
                {
42
367
                case 'm':
373
                case 'm':
44
368
                    mir_socket = argv[++i];
374
                    ++i;
45
375
                    if (i < argc)
46
376
                        mir_socket = argv[i];
47
377
                    else
48
378
                        help = 1;
49
379
                    break;
50
380
                case 'r':
51
381
                    ++i;
52
382
                    if (i < argc)
53
383
                        force_radius = atoi(argv[i]);
54
384
                    else
55
385
                        help = 1;
56
369
                    break;
386
                    break;
57
370
                case 'w':
387
                case 'w':
58
371
                    swap_interval = 1;
388
                    swap_interval = 1;
59
@@ -385,7 +402,8 @@
60
385
            {
402
            {
61
386
                printf("Usage: %s [<options>]\n"
403
                printf("Usage: %s [<options>]\n"
62
387
                       "  -h               Show this help text\n"
404
                       "  -h               Show this help text\n"
64
388
                       "  -m socket        Mir server socket\n"
405
                       "  -m <socket path> Mir server socket\n"
65
406
                       "  -r <radius>      Force paint brush radius\n"
66
389
                       "  -w               Wait for vblank (don't drop frames)\n"
407
                       "  -w               Wait for vblank (don't drop frames)\n"
67
390
                       "  --               Ignore further arguments\n"
408
                       "  --               Ignore further arguments\n"
68
391
                       , argv[0]);
409
                       , argv[0]);
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-10-19
Kevin DuBois (community)			Approve on 2015-10-15
Andreas Pokorny (community)		2015-10-15	Approve on 2015-10-15
Review via email: mp+274505@code.launchpad.net