Edit

kc3-lang/libxkbcommon/test/data/rules/special_indexes

Branch :

  • Browse

    Commit

  • Author : Pierre Le Marre
    Date : 2024-09-24 15:23:16
    Hash : cdafba4f
    Message : rules: Add support for index ranges There is a lot of repetition in the current rules files provided by xkeyboard-config, because the MLVO mappings need to match on the exact layout/variant index. This also prevents to increase the number of maximum groups, because it does not scale. We introduces the following new special layout/variant indexes: - “single”: matches a single layout; same as with no index. - “first”: matches the first layout/variant, no matter how many layouts are in the RMLVO configuration. It allows to merge `layout` and `layout[1]` patterns. - “later”: matches all but the first layout. This is an index range. - “any”: matches layout at any position. This is an index range. We also introduces the new `%i` expansion, which correspond to the index of the matched layout in a mapping with an index range. Example: layout[later] = symbols my_layout = +my_symbols:%i * = +%l[%i]:%i Let’s have a look at concrete examples from xkeyboard-config: ! model layout = symbols * * = pc+%l%(v) ! model layout[1] = symbols * * = pc+%l[1]%(v[1]) ! model layout[2] = symbols * * = +%l[2]%(v[2]) ! model layout[3] = symbols * * = +%l[3]%(v[3]) ! model layout[4] = symbols * * = +%l[4]%(v[4]) ! layout option = symbols * grp:toggle = +group(toggle) ! layout[1] option = symbols * grp:toggle = +group(toggle):1 ! layout[2] option = symbols * grp:toggle = +group(toggle):2 ! layout[3] option = symbols * grp:toggle = +group(toggle):3 ! layout[4] option = symbols * grp:toggle = +group(toggle):4 With this commit we can now simplify it into: ! model layout[first] = symbols * * = pc+%l[%i]%(v[%i]) ! model layout[later] = symbols * * = +%l[%i]%(v[%i]):%i ! layout[any] option = symbols * grp:toggle = +group(toggle):%i The latter rule will work even if we increase XKB_MAX_GROUPS, whereas the former would require to add the missing entries for the new groups. In order to maintain consistent rules, we now disallow layout and variant to have different indexes. For example, the following mapping are now invalid: - layout variant[1] - layout[1] variant[2] - layout[1] variant - layout[first] variant[1] - layout[first] variant - layout variant[any] - etc.

  • test/data/rules/special_indexes
  • ! model         = keycodes
      my_model      = my_keycodes
      *             = default_keycodes
    
    ! layout[single] variant    = symbols // valid
      layout_a       my_variant = symbols_a+extra_variant
    
    ! layout[single] = symbols
      layout_a       = symbols_A
    
    ! layout        = symbols
      layout_b      = symbols_B
      layout_c      = symbols_C:%i // valid, but unusual
      layout_d      = symbols_D
      layout_e      = symbols_E
      *             = %l[%i]%(v[%i]) // valid, but unusual
    
    ! layout[first] = symbols
      layout_a      = symbols_a:1
      layout_b      = symbols_b:1
      layout_c      = symbols_c:1
      layout_d      = symbols_d:%i // valid, but unusual
      layout_e      = symbols_e:1
      *             = %l[%i]%(v[%i]) // valid, cannot be easily expressed otherwise
    
    ! layout[first] = symbols
      layout_e      = %+l // different output if single or multiple layouts
    
    ! layout[later] = symbols
      layout_a      = +symbols_x:%i
      layout_b      = +symbols_y:%i
      *             = +%l[%i]%(v[%i]):%i
    
    ! layout[any]   = symbols
      layout_c      = +symbols_z:%i
    
    ! layout[any] variant[any] = symbols
      *           extra        = +foo:%i|bar:%i
    
    ! layout[1] variant = symbols // invalid mapping
      *         *       = +symbols_AAA:%i
    
    ! layout variant[1] = symbols // invalid mapping
      *      *          = +symbols_BBB:%i
    
    ! layout[1] variant[2] = symbols // invalid mapping
      *         *          = +symbols_CCC:%i
    
    ! layout[any] variant = symbols // invalid mapping
      *           *       = +symbols_DDD:%i
    
    ! layout variant[any] = symbols // invalid mapping
      *      *            = +symbols_EEE:%i
    
    ! layout[any] variant[1] = symbols // invalid mapping
      *           *          = +symbols_FFF:%i
    
    ! layout[any] variant[first] = symbols // invalid mapping
      *           *              = +symbols_GGG:%i
    
    ! model         = types
      my_model      = my_types
      *             = default_types
    
    ! model         = compat
      my_model      = my_compat
      *             = default_compat
    
    ! option        = symbols
      my_option     = +extra_option