← Back to branch summary

~mir-team/mir/squash-overzealous-exception-to-accomodate-underzealous-drivers

« back to all changes in this revision

Viewing changes to examples/fingerpaint.c

  • Committer: Tarmac
  • Author(s): Daniel van Vugt
  • Date: 2015-02-04 15:37:12 UTC
  • mfrom: (2251.2.30 touch-event)
  • Revision ID: tarmac-20150204153712-548cnpxai9r8xnsx
Refine touch event API naming that was introduced in Mir 0.10:

MirTouchInputEvent              -> MirTouchEvent
MirTouchInputEventTouchId       -> MirTouchId
MirTouchInputEventTouchAction   -> MirTouchAction
MirTouchInputEventTouchTooltype -> MirTouchTooltype

mir_input_event_get_touch_input_event  -> mir_input_event_get_touch_event
mir_touch_input_event_get_touch_action     -> mir_touch_event_action
mir_touch_input_event_get_modifiers        -> mir_touch_event_modifiers
mir_touch_input_event_get_touch_axis_value -> mir_touch_event_axis_value
mir_touch_input_event_get_touch_count      -> mir_touch_event_point_count
mir_touch_input_event_get_touch_id         -> mir_touch_event_id
mir_touch_input_event_get_touch_tooltype   -> mir_touch_event_tooltype

Full ABI compatibility is retained so nobody needs to recompile. Although if anyone is compiling new code they will be forced to use the new API.

More related proposals to come later.

Approved by PS Jenkins bot, Cemil Azizoglu, Alan Griffiths, Alberto Aguirre.

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/fingerpaint.c
212
212
        static float max_pressure = 1.0f;
213
213
 
214
214
        MirInputEvent const* input_event = mir_event_get_input_event(event);
215
 
        MirTouchInputEvent const* tev = NULL;
 
215
        MirTouchEvent const* tev = NULL;
216
216
        MirPointerInputEvent const* pev = NULL;
217
217
        unsigned touch_count = 0;
218
218
        bool ended = false;
221
221
        switch (type)
222
222
        {
223
223
        case mir_input_event_type_touch:
224
 
            tev = mir_input_event_get_touch_input_event(input_event);
225
 
            touch_count = mir_touch_input_event_get_touch_count(tev);
 
224
            tev = mir_input_event_get_touch_event(input_event);
 
225
            touch_count = mir_touch_event_point_count(tev);
226
226
            ended = touch_count == 1 &&
227
 
                    (mir_touch_input_event_get_touch_action(tev, 0) ==
228
 
                     mir_touch_input_event_action_up);
 
227
                    (mir_touch_event_action(tev, 0) == mir_touch_action_up);
229
228
            break;
230
229
        case mir_input_event_type_pointer:
231
230
            pev = mir_input_event_get_pointer_input_event(input_event);
259
258
 
260
259
                if (tev != NULL)
261
260
                {
262
 
                    x = mir_touch_input_event_get_touch_axis_value(tev, p,
263
 
                        mir_touch_input_axis_x);
264
 
                    y = mir_touch_input_event_get_touch_axis_value(tev, p,
265
 
                        mir_touch_input_axis_y);
266
 
                    float size = mir_touch_input_event_get_touch_axis_value(
267
 
                        tev, p, mir_touch_input_axis_size);
268
 
                    pressure = mir_touch_input_event_get_touch_axis_value(tev,
269
 
                        p, mir_touch_input_axis_pressure);
 
261
                    x = mir_touch_event_axis_value(tev, p, mir_touch_axis_x);
 
262
                    y = mir_touch_event_axis_value(tev, p, mir_touch_axis_y);
 
263
                    float size = mir_touch_event_axis_value(tev, p,
 
264
                                                          mir_touch_axis_size);
 
265
                    pressure = mir_touch_event_axis_value(tev, p,
 
266
                                                      mir_touch_axis_pressure);
270
267
                    radius = size * 50.0f + 1.0f;
271
268
                }
272
269
                else if (pev != NULL)