From 090ac268b91c3b07f90d9d4ebe481bfe649836df Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 13 Jun 2016 19:32:43 +0200 Subject: [PATCH] Revert "backend-x11: Ensure the Xkb group index remains properly set" This reverts commit 2857fdbdb887fcaa2e2f25d268c34ae039646e78. --- src/backends/x11/meta-backend-x11.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c index a645bbd..dbcd13f 100644 --- a/src/backends/x11/meta-backend-x11.c +++ b/src/backends/x11/meta-backend-x11.c @@ -82,7 +82,6 @@ struct _MetaBackendX11Private gchar *keymap_layouts; gchar *keymap_variants; gchar *keymap_options; - int locked_group; }; typedef struct _MetaBackendX11Private MetaBackendX11Private; @@ -298,23 +297,15 @@ handle_host_xevent (MetaBackend *backend, if (event->type == priv->xkb_event_base) { - XkbEvent *xkb_ev = (XkbEvent *) event; + XkbAnyEvent *xkb_ev = (XkbAnyEvent *) event; - if (xkb_ev->any.device == META_VIRTUAL_CORE_KEYBOARD_ID) + if (xkb_ev->device == META_VIRTUAL_CORE_KEYBOARD_ID) { - switch (xkb_ev->any.xkb_type) + switch (xkb_ev->xkb_type) { case XkbNewKeyboardNotify: case XkbMapNotify: keymap_changed (backend); - break; - case XkbStateNotify: - if (xkb_ev->state.changed & XkbGroupLockMask) - { - if (priv->locked_group != xkb_ev->state.locked_group) - XkbLockGroup (priv->xdisplay, XkbUseCoreKbd, priv->locked_group); - } - break; default: break; } @@ -785,7 +776,6 @@ meta_backend_x11_lock_layout_group (MetaBackend *backend, MetaBackendX11 *x11 = META_BACKEND_X11 (backend); MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11); - priv->locked_group = idx; XkbLockGroup (priv->xdisplay, XkbUseCoreKbd, idx); } -- 2.7.4