Merge lp://qastaging/~robertcarr/mir/more-event-pretty-printing into lp://qastaging/mir

8 +static std::string format_key_action(MirKeyAction action)
... and others

No need for static, we are defining these inside an anonymous namespace.
(I know that existing functions there are already static, but I'd rather we fixed them than pollute all the new functions).

23 + static std::tuple<MirKeyFlag, char const*> key_flag_strings[] = {
... and others

Could be const.

36 + for (unsigned int i = 0; i < sizeof(key_flag_strings)/sizeof(*key_flag_strings); i++) {
... and others

for (auto const& key_flag_string : key_flag_strings)
{
}

19 +static std::string format_key_flags(MirKeyFlag flags)
20 +{
21 + std::stringstream ss;
22 +
23 + static std::tuple<MirKeyFlag, char const*> key_flag_strings[] = {
24 + std::make_tuple(mir_key_flag_woke_here, "mir_key_flag_woke_here"),
25 + std::make_tuple(mir_key_flag_soft_keyboard, "mir_key_flag_soft_keyboard"),
26 + std::make_tuple(mir_key_flag_keep_touch_mode, "mir_key_flag_keep_touch_mode"),
27 + std::make_tuple(mir_key_flag_from_system, "mir_key_flag_from_system"),
28 + std::make_tuple(mir_key_flag_editor_action, "mir_key_flag_editor_action"),
29 + std::make_tuple(mir_key_flag_canceled, "mir_key_flag_canceled"),
30 + std::make_tuple(mir_key_flag_virtual_hard_key, "mir_key_flag_virtual_hard_key"),
31 + std::make_tuple(mir_key_flag_long_press, "mir_key_flag_long_press"),
32 + std::make_tuple(mir_key_flag_canceled_long_press, "mir_key_flag_canceled_long_press"),
33 + std::make_tuple(mir_key_flag_tracking, "mir_key_flag_tracking"),
34 + std::make_tuple(mir_key_flag_fallback, "mir_key_flag_fallback")
35 + };
36 + for (unsigned int i = 0; i < sizeof(key_flag_strings)/sizeof(*key_flag_strings); i++) {
37 + auto flag = std::get<0>(key_flag_strings[i]);
38 + auto const& str = std::get<1>(key_flag_strings[i]);
39 + if (flags & flag)
40 + ss << str << " ";
41 + }
42 + return ss.str();
43 +}

This (and similar code) looks unnecessarily hard to parse. C.f.

static std::string format_key_flags(MirKeyFlag flags)
{
    static struct { MirKeyFlag flag; char const* str; } const key_flag_strings[] = {
        { mir_key_flag_woke_here, "mir_key_flag_woke_here" },
        { mir_key_flag_soft_keyboard, "mir_key_flag_soft_keyboard" },
        { mir_key_flag_keep_touch_mode, "mir_key_flag_keep_touch_mode" },
        { mir_key_flag_from_system, "mir_key_flag_from_system" },
        { mir_key_flag_editor_action, "mir_key_flag_editor_action" },
        { mir_key_flag_canceled, "mir_key_flag_canceled" },
        { mir_key_flag_virtual_hard_key, "mir_key_flag_virtual_hard_key" },
        { mir_key_flag_long_press, "mir_key_flag_long_press" },
        { mir_key_flag_canceled_long_press, "mir_key_flag_canceled_long_press" },
        { mir_key_flag_tracking, "mir_key_flag_tracking" },
        { mir_key_flag_fallback, "mir_key_flag_fallback" }
    };

    std::stringstream ss;
    for (auto key_flag_string = std::begin(key_flag_strings); key_flag_string != std::end(key_flag_strings); ++key_flag_string)
    {
        if (flags & key_flag_string->flag)
            ss << key_flag_string->str << " ";
    }
    return ss.str();
}

or

std::string format_key_flags(MirKeyFlag flags)
{
    struct Entry { MirKeyFlag flag; char const* str; };

    static auto const key_flag_strings = {
        Entry{ mir_key_flag_woke_here, "mir_key_flag_woke_here" },
        Entry{ mir_key_flag_soft_keyboard, "mir_key_flag_soft_keyboard" },
        Entry{ mir_key_flag_keep_touch_mode, "mir_key_flag_keep_touch_mode" },
        Entry{ mir_key_flag_from_system, "mir_key_flag_from_system" },
        Entry{ mir_key_flag_editor_action, "mir_key_flag_editor_action" },
        Entry{ mir_key_flag_canceled, "mir_key_flag_canceled" },
        Entry{ mir_key_flag_virtual_hard_key, "mir_key_flag_virtual...

8 +static std::string format_key_action(MirKeyAction action)
9 +{
10 + std::stringstream ss;
11 +
12 + static std::string key_action_strings[] = { "mir_key_action_down", "mir_key_action_up",
13 + "mir_key_action_multiple" };
14 + ss << key_action_strings[action];
15 +
16 + return ss.str();
17 +}

C.f.

char const* format_key_action(MirKeyAction action)
{
    static char const* const key_action_strings[] =
    {
        "mir_key_action_down",
        "mir_key_action_up",
        "mir_key_action_multiple"
    };

    return key_action_strings[action];
}

Sorry to waste time...this was kind of a a careless how fast can I do this with an emacs macro while mir builds on my phone kind of situation ;)

Cleaned things up.

Nit:

167 - for (unsigned int i = 0; i < ev.pointer_count; i++)
168 - {
169 + for (unsigned int i = 0; i < ev.pointer_count; i++) {

(and elsewhere) that's not our brace style.

I still think there's a lot of unnecessary creation of strings that are later copied to the output stream.

It isn't hard to copy them directly. E.g.

inline std::ostream& operator<<(std::ostream& o, std::function<std::ostream&(std::ostream&)> const& f)
{
    return f(o);
}

std::function<std::ostream&(std::ostream&)> format_key_flags(MirKeyFlag flags)
{
    static struct { MirKeyFlag flag; char const* str; } const key_flag_strings[] = {
        { mir_key_flag_woke_here, "mir_key_flag_woke_here" },
        { mir_key_flag_soft_keyboard, "mir_key_flag_soft_keyboard" },
        { mir_key_flag_keep_touch_mode, "mir_key_flag_keep_touch_mode" },
        { mir_key_flag_from_system, "mir_key_flag_from_system" },
        { mir_key_flag_editor_action, "mir_key_flag_editor_action" },
        { mir_key_flag_canceled, "mir_key_flag_canceled" },
        { mir_key_flag_virtual_hard_key, "mir_key_flag_virtual_hard_key" },
        { mir_key_flag_long_press, "mir_key_flag_long_press" },
        { mir_key_flag_canceled_long_press, "mir_key_flag_canceled_long_press" },
        { mir_key_flag_tracking, "mir_key_flag_tracking" },
        { mir_key_flag_fallback, "mir_key_flag_fallback" }
    };

    return [&](std::ostream& ss) -> std::ostream&
    {
        for (auto const& entry : key_flag_strings)
        {
            if (flags & entry.flag)
                ss << entry.str << " ";
        }
        return ss;
    };
}

And, of course, https://code.launchpad.net/~robertcarr/mir/more-event-pretty-printing/+merge/194765/comments/449812 is still not addressed