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