kc3-lang/libxkbcommon/test/keymap.c

• Show log

  Commit

• Hash : 860cfc03
  Author :
  Date : 2020-04-05T00:07:57
  

  keymap: don't forget about fallback mappings in xkb_keymap_key_get_mods_for_level() If the active set of modifiers doesn't match any explicit entry of the key type, the resulting level is 0 (i.e. Level 1). Some key types don't explicitly map Level 1, taking advantage of this fallback. Previously, xkb_keymap_key_get_mods_for_level didn't consider this, and only reported masks for explicit mappings. But this causes some glaring omissions, like matching "a" in the "us" keymap returning not results. Since every mask which isn't explicitly mapped falls back to 0, we can't return the all. Almost always the best choice for this is the empty mask, so return that, when applicable. Fixes https://github.com/xkbcommon/libxkbcommon/issues/140. Reported-by: https://github.com/AliKet Signed-off-by: Ran Benita <ran@unusedvar.com>

Download

• test/keymap.c

• /*
   * Copyright © 2016 Intel Corporation
   *
   * 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.
   *
   * Author: Mike Blumenkrantz <zmike@osg.samsung.com>
   */
  
  #include "config.h"
  
  #include <assert.h>
  #include <stdio.h>
  #include <stdlib.h>
  
  #include "test.h"
  
  int
  main(void)
  {
      struct xkb_context *context = test_get_context(0);
      struct xkb_keymap *keymap;
      xkb_keycode_t kc;
      const char *keyname;
      xkb_mod_mask_t masks_out[4] = { 0, 0, 0, 0 };
      size_t mask_count;
      xkb_mod_mask_t shift_mask;
      xkb_mod_mask_t lock_mask;
      xkb_mod_mask_t mod2_mask;
  
      assert(context);
  
      keymap = test_compile_rules(context, "evdev", "pc104", "us,ru", NULL, "grp:menu_toggle");
      assert(keymap);
  
      kc = xkb_keymap_key_by_name(keymap, "AE09");
      assert(kc != XKB_KEYCODE_INVALID);
      keyname = xkb_keymap_key_get_name(keymap, kc);
      assert(streq(keyname, "AE09"));
  
      kc = xkb_keymap_key_by_name(keymap, "COMP");
      assert(kc != XKB_KEYCODE_INVALID);
      keyname = xkb_keymap_key_get_name(keymap, kc);
      assert(streq(keyname, "COMP"));
  
      kc = xkb_keymap_key_by_name(keymap, "MENU");
      assert(kc != XKB_KEYCODE_INVALID);
      keyname = xkb_keymap_key_get_name(keymap, kc);
      assert(streq(keyname, "COMP"));
  
      kc = xkb_keymap_key_by_name(keymap, "AC01");
      assert(kc != XKB_KEYCODE_INVALID);
  
      // AC01 level 0 ('a') requires no modifiers on us-pc104
      mask_count = xkb_keymap_key_get_mods_for_level(keymap, kc, 0, 0, masks_out, 4);
      assert(mask_count == 1);
      assert(masks_out[0] == 0);
  
      shift_mask = 1 << xkb_keymap_mod_get_index(keymap, "Shift");
      lock_mask = 1 << xkb_keymap_mod_get_index(keymap, "Lock");
      mod2_mask = 1 << xkb_keymap_mod_get_index(keymap, "Mod2");
  
      // AC01 level 1 ('A') requires either Shift or Lock modifiers on us-pc104
      mask_count = xkb_keymap_key_get_mods_for_level(keymap, kc, 0, 1, masks_out, 4);
      assert(mask_count == 2);
      assert(masks_out[0] == shift_mask);
      assert(masks_out[1] == lock_mask);
  
      kc = xkb_keymap_key_by_name(keymap, "KP1");
  
      // KP1 level 0 ('End') requires no modifiers or Shift+Mod2 on us-pc104
      mask_count = xkb_keymap_key_get_mods_for_level(keymap, kc, 0, 0, masks_out, 4);
      assert(mask_count == 2);
      assert(masks_out[0] == 0);
      assert(masks_out[1] == (shift_mask | mod2_mask));
  
      // KP1 level 1 ('1') requires either Shift or Mod2 modifiers on us-pc104
      mask_count = xkb_keymap_key_get_mods_for_level(keymap, kc, 0, 1, masks_out, 4);
      assert(mask_count == 2);
      assert(masks_out[0] == shift_mask);
      assert(masks_out[1] == mod2_mask);
  
      // Return key is not affected by modifiers on us-pc104
      kc = xkb_keymap_key_by_name(keymap, "RTRN");
      mask_count = xkb_keymap_key_get_mods_for_level(keymap, kc, 0, 0, masks_out, 4);
      assert(mask_count == 1);
      assert(masks_out[0] == 0);
  
      xkb_keymap_unref(keymap);
      xkb_context_unref(context);
  }
  

Download