Merge lp:~alan-griffiths/miral/fix-1677550 into lp:miral

[Alan Griffiths]

std::wstring_convert<> is now range checking input strictly - stop lying to it.

[Alan Griffiths (alan-griffiths)]

Checked manually on Zesty (current), Xenial, and Xenial+Overlay

[Alan Griffiths (alan-griffiths)]

But it doesn't work for the gnome-shell "New Profile" dialog title

review: Needs Fixing

[lp:~alan-griffiths/miral/fix-1677550]

546. By Alan Griffiths on 2017-03-30

Rely on the fact that Latin1 has the same codepoints as UTF8

[Alan Griffiths (alan-griffiths)]

> But it doesn't work for the gnome-shell "New Profile" dialog title

Fixed

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Alan Griffiths (alan-griffiths)]

review: Abstain

[lp:~alan-griffiths/miral/fix-1677550]

547. By Alan Griffiths on 2017-03-30

Use the user's preferred locale

[Alexandros Frantzis (afrantzis)]

Looks good. Verified fix on zesty with Mir-on-X with both english and non-english text.

review: Approve

=== modified file 'miral-shell/decoration_provider.cpp'
--- miral-shell/decoration_provider.cpp	2017-03-15 12:36:17 +0000
+++ miral-shell/decoration_provider.cpp	2017-03-30 14:13:04 +0000
@@ -42,6 +42,12 @@
 
 void null_window_callback(MirWindow*, void*) {}
 
+struct preferred_codecvt : std::codecvt_byname<wchar_t, char, std::mbstate_t>
+{
+    preferred_codecvt() : std::codecvt_byname<wchar_t, char, std::mbstate_t>("") {}
+    ~preferred_codecvt() = default;
+};
+
 struct Printer
 {
     Printer();
@@ -53,7 +59,7 @@
     void printhelp(MirGraphicsRegion const& region);
 
 private:
-    std::wstring_convert<std::codecvt_utf16<wchar_t>> converter;
+    std::wstring_convert<preferred_codecvt> converter;
 
     bool working = false;
     FT_Library lib;
@@ -112,6 +118,7 @@
 }
 
 void Printer::print(MirGraphicsRegion const& region, std::string const& title_, int const intensity)
+try
 {
     if (!working)
         return;
@@ -151,6 +158,10 @@
         base_y += glyph->advance.y >> 6;
     }
 }
+catch (...)
+{
+    std::cerr << "WARNING: failed render title: \"" <<  title_ << "\"\n";
+}
 
 void Printer::printhelp(MirGraphicsRegion const& region)
 {