From ec9b99fb8cda7025aea00aa6d4871f04e41cceab Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Thu, 10 Apr 2025 12:26:46 -0400 Subject: [PATCH] Revert "x11 backend: Don't let muffin reset the keyboard layout any time" This reverts commit e6bcb95cc2b005223c60e8b3157f0e9f1fb56d86. Layouts will no longer be handled by libgnomekbd. --- src/backends/x11/cm/meta-backend-x11-cm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/backends/x11/cm/meta-backend-x11-cm.c b/src/backends/x11/cm/meta-backend-x11-cm.c index fb1cdf86c..e5ebd68f2 100644 --- a/src/backends/x11/cm/meta-backend-x11-cm.c +++ b/src/backends/x11/cm/meta-backend-x11-cm.c @@ -360,10 +360,9 @@ meta_backend_x11_cm_handle_host_xevent (MetaBackendX11 *backend_x11, case XkbStateNotify: if (xkb_ev->state.changed & XkbGroupLockMask) { - // TODO: Restore this, ditch libgnomekbd - // if (x11_cm->locked_group != xkb_ev->state.locked_group) - // XkbLockGroup (xdisplay, XkbUseCoreKbd, - // x11_cm->locked_group); + if (x11_cm->locked_group != xkb_ev->state.locked_group) + XkbLockGroup (xdisplay, XkbUseCoreKbd, + x11_cm->locked_group); } break; default: