kc3-lang/libxkbcommon/bench/rules.c

Branch : - branch - android master - tag -

• Show log

  Commit

• Author : Pierre Le Marre
  Date : 2024-09-30 06:13:38
  Hash : 7c4c718b
  Message : Allow only the first group in symbols sections when using RMLVO Currently `xkb_keymap_num_layouts` may return a greater number than the number of layouts configured using RMLVO, because we allow symbols sections to define various groups per key. This is unintuitive and kind of buggy: groups should be added via rules by setting an explicit `:n` modifier. Fix: when parsing a keymap using RMLVO resolution: - Get the expected layouts count from the resulting KcCGST. - Drop the groups after the first one in included symbols sections. This will ensure that a symbol section can only define one group per key. Notes: - Compiling a keymap string directly is unaffected. - RMLVO resolution may still produce more groups than the input layouts. Indeed, some legacy rules in xkeyboard-config rely on this to insert automatically a US layout before the given non-Latin one, resulting in two layouts while only one was given.

• bench/rules.c

• /*
   * Copyright © 2012 Ran Benita <ran234@gmail.com>
   *
   * Permission is hereby granted, free of charge, to any person obtaining a
   * copy of this software and associated documentation files (the "Software"),
   * to deal in the Software without restriction, including without limitation
   * the rights to use, copy, modify, merge, publish, distribute, sublicense,
   * and/or sell copies of the Software, and to permit persons to whom the
   * Software is furnished to do so, subject to the following conditions:
   *
   * The above copyright notice and this permission notice (including the next
   * paragraph) shall be included in all copies or substantial portions of the
   * Software.
   *
   * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
   * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   * DEALINGS IN THE SOFTWARE.
   */
  
  #include "config.h"
  
  #include <time.h>
  
  #include "../test/test.h"
  #include "xkbcomp/xkbcomp-priv.h"
  #include "xkbcomp/rules.h"
  #include "bench.h"
  
  #define BENCHMARK_ITERATIONS 20000
  
  int
  main(int argc, char *argv[])
  {
      struct xkb_context *ctx;
      int i;
      struct xkb_rule_names rmlvo = {
          "evdev", "pc105", "us,il", ",", "ctrl:nocaps,grp:menu_toggle",
      };
      struct bench bench;
      char *elapsed;
  
      ctx = test_get_context(0);
      assert(ctx);
  
      xkb_context_set_log_level(ctx, XKB_LOG_LEVEL_CRITICAL);
      xkb_context_set_log_verbosity(ctx, 0);
  
      bench_start(&bench);
      for (i = 0; i < BENCHMARK_ITERATIONS; i++) {
          struct xkb_component_names kccgst;
  
          assert(xkb_components_from_rules(ctx, &rmlvo, &kccgst, NULL));
          free(kccgst.keycodes);
          free(kccgst.types);
          free(kccgst.compat);
          free(kccgst.symbols);
      }
      bench_stop(&bench);
  
      elapsed = bench_elapsed_str(&bench);
      fprintf(stderr, "processed %d rule files in %ss\n",
              BENCHMARK_ITERATIONS, elapsed);
      free(elapsed);
  
      xkb_context_unref(ctx);
      return 0;
  }