mirror of
https://github.com/brl/mutter.git
synced 2025-08-02 22:54:44 +00:00
* clutter/clutter-main.c: (pre_parse_hook):
Call setlocale on init * clutter/x11/clutter-event-x11.c: (translate_key_event): Fix typo and use the same buffer size as xev
This commit is contained in:
@@ -153,7 +153,7 @@ clutter_backend_x11_post_parse (ClutterBackend *backend,
|
||||
|
||||
if (clutter_synchronise)
|
||||
XSynchronize (backend_x11->xdpy, True);
|
||||
|
||||
|
||||
XInternAtoms (backend_x11->xdpy,
|
||||
(char **) atom_names, n_atom_names,
|
||||
False, atoms);
|
||||
|
@@ -220,7 +220,7 @@ translate_key_event (ClutterBackend *backend,
|
||||
ClutterEvent *event,
|
||||
XEvent *xevent)
|
||||
{
|
||||
char buffer[6];
|
||||
char buffer[256+1];
|
||||
int n;
|
||||
|
||||
CLUTTER_NOTE (EVENT, "Translating key %s event",
|
||||
@@ -239,18 +239,17 @@ translate_key_event (ClutterBackend *backend,
|
||||
0);
|
||||
|
||||
/* unicode_value is the printable representation */
|
||||
n = XLookupString (&xevent->xkey, buffer, sizeof (buffer), NULL, NULL);
|
||||
if (n == NoSymbol)
|
||||
{
|
||||
event->key.unicode_value = (gunichar)'\0';
|
||||
}
|
||||
else
|
||||
n = XLookupString (&xevent->xkey, buffer, sizeof (buffer) - 1, NULL, NULL);
|
||||
|
||||
if (n != NoSymbol)
|
||||
{
|
||||
event->key.unicode_value = g_utf8_get_char_validated (buffer, n);
|
||||
if ((event->key.unicode_value == -1) ||
|
||||
(event->key.unicode_value == -1))
|
||||
event->key.unicode_value = (gunichar)'\0';
|
||||
if ((event->key.unicode_value != -1) &&
|
||||
(event->key.unicode_value != -2))
|
||||
return;
|
||||
}
|
||||
|
||||
event->key.unicode_value = (gunichar)'\0';
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
Reference in New Issue
Block a user