Keyboard.c: greatly simplify the code in nxagentKeyboardProc

nx-X11/programs/Xserver/hw/nxagent/Keyboard.c

@@ -828,20 +828,17 @@ XkbError:
 
         nxagentKeycodeConversionSetup();
 
-        if (xkb == NULL || xkb->geom == NULL)
+        if (xkb && xkb->geom)
         {
-          #ifdef TEST
-          fprintf(stderr, "nxagentKeyboardProc: No current keyboard.\n");
-          if (xkb == NULL)
-          {
-            fprintf(stderr, "nxagentKeyboardProc: xkb is null.\n");
+            XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
         }
+#ifdef TEST
         else
         {
-            fprintf(stderr, "nxagentKeyboardProc: xkb->geom is null.\n");
+            fprintf(stderr, "nxagentKeyboardProc: No current keyboard.\n");
         }
-          fprintf(stderr, "nxagentKeyboardProc: Going to set rules and init device.\n");
-          #endif
+#endif
+
         #ifdef DEBUG
         fprintf(stderr, "nxagentKeyboardProc: Going to set rules and init device: "
                         "[rules='%s',model='%s',layout='%s',variants='%s',options='%s'].\n",
@@ -857,24 +854,9 @@ XkbError:
           goto XkbError;
         }
 
-          goto XkbEnd;
-        }
-
-        XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
-
-        #ifdef DEBUG
-        fprintf(stderr, "nxagentKeyboardProc: Going to set rules and init device: "
-                        "[rules='%s',model='%s',layout='%s',variants='%s',options='%s'].\n",
-                        rules, model, layout, variants, options);
-        #endif
-
-        XkbSetRulesDflts(rules, model, layout, variants, options);
-        XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap,
-                                    nxagentBell, nxagentChangeKeyboardControl);
-
-        if (!nxagentKeyboard || strcmp(nxagentKeyboard, "query") == 0)
+        if (xkb && xkb->geom)
         {
-          goto XkbError;
+            XkbDDXChangeControls(pDev, xkb->ctrls, xkb->ctrls);
         }
 
         if (nxagentOption(Shadow) == 1 && pDev && pDev->key)