Revert "x11 backend: Don't let muffin reset the keyboard layout any time"

mtwebster · mtwebster · commit ec9b99fb8cda · 2025-07-18T10:40:11.000-04:00
This reverts commit e6bcb95. Layouts will no longer be handled by libgnomekbd.
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -360,10 +360,9 @@ meta_backend_x11_cm_handle_host_xevent (MetaBackendX11 *backend_x11,`
`360`	`360`	`case XkbStateNotify:`
`361`	`361`	`if (xkb_ev->state.changed & XkbGroupLockMask)`
`362`	`362`	`{`
`363`		`- // TODO: Restore this, ditch libgnomekbd`
`364`		`- // if (x11_cm->locked_group != xkb_ev->state.locked_group)`
`365`		`- // XkbLockGroup (xdisplay, XkbUseCoreKbd,`
`366`		`- // x11_cm->locked_group);`
	`363`	`+ if (x11_cm->locked_group != xkb_ev->state.locked_group)`
	`364`	`+ XkbLockGroup (xdisplay, XkbUseCoreKbd,`
	`365`	`+ x11_cm->locked_group);`
`367`	`366`	`}`
`368`	`367`	`break;`
`369`	`368`	`default:`