[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] gtk: Hardcode LC_CTYPE as C.utf-8
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 10/10] gtk: Hardcode LC_CTYPE as C.utf-8 |
Date: |
Tue, 31 Jan 2017 14:41:46 +0100 |
From: Kevin Wolf <address@hidden>
Commit 2cb5d2a4 removed setlocale() for everything except LC_MESSAGES in
order to avoid unwanted side effects such as using the wrong decimal
separator in generated JSON objects. However, the problem that unsetting
LC_CTYPE caused is that non-ASCII characters are considered
non-printable now and therefore the GTK menus display question marks for
accented letters, Chinese characters etc.
A first attempt to fix this [1] was rejected because even just setting
LC_CTYPE to the user's locale (and thereby modifying the semantics of
the ctype.h functions) could have unwanted effects that we're not aware
of yet.
Recently, however, glibc introduced a new locale "C.utf-8" that just
uses UTF-8 as its charset, but otherwise leaves the semantics alone.
Just setting the right character set is enough for our use case, so we
can just hardcode this one without having to be afraid of nasty side
effects.
Older systems that don't have the new locale will continue displaying
question marks, but this should fix the problem for most users.
[1] https://lists.gnu.org/archive/html/qemu-devel/2015-12/msg03591.html
('Re: gtk: use setlocale() for LC_MESSAGES only')
Signed-off-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index b734c0b..3c415d2 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2258,8 +2258,12 @@ void gtk_display_init(DisplayState *ds, bool
full_screen, bool grab_on_hover)
s->free_scale = FALSE;
- /* LC_MESSAGES only. See early_gtk_display_init() for details */
+ /* Mostly LC_MESSAGES only. See early_gtk_display_init() for details. For
+ * LC_CTYPE, we need to make sure that non-ASCII characters are considered
+ * printable, but without changing any of the character classes to make
+ * sure that we don't accidentally break implicit assumptions. */
setlocale(LC_MESSAGES, "");
+ setlocale(LC_CTYPE, "C.utf-8");
bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR);
textdomain("qemu");
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] ui patch queue, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL 08/10] spice: wakeup QXL worker to pick up mouse changes, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL 01/10] qapi: add support for mice with extra/side buttons, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL 07/10] ui/gtk.c: add ctrl-alt-= support for zoom in acceleration, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL 09/10] vnc: fix overflow in vnc_update_stats, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL 05/10] ui/gtk: Fix mouse wheel on 3.4.0 or later, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL 03/10] ui: add support for mice with extra/side buttons, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL 04/10] vnc: track LED state separately, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL 10/10] gtk: Hardcode LC_CTYPE as C.utf-8,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 02/10] ps2: add support for mice with extra/side buttons, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL 06/10] ui: fix format specfier in vnc to avoid break in build., Gerd Hoffmann, 2017/01/31
- Re: [Qemu-devel] [PULL 00/10] ui patch queue, Eric Blake, 2017/01/31