Compare commits

..
3134 Commits
Author SHA1 Message Date
Pierre Le Marre 2ee4532453 rules: Add special layout index multiple
It is the dual of `single`: it matches layouts at any position, but only if
there are *at least 2 layouts*.
2026-07-28 15:31:01 +02:00
Pierre Le Marre f905fc3cb2 doc: Create predefined keysyms page
Since the keysyms header has a fixed syntax, use a Python script
to dynamically transform the C header into a Doxygen-annotated file.
2026-07-26 20:07:36 +02:00
Pierre Le Marre 91ee615ec5 script: Add keysyms age export
Extract the first library version in which each keysym was introduced.
2026-07-26 20:07:36 +02:00
Pierre Le Marre 0a4518fc23 scripts: Improve keysyms name handling
Use the new common keysyms parser
2026-07-26 20:07:36 +02:00
Pierre Le Marre 6c3c713d80 scripts: Add common keysym parser 2026-07-26 20:07:36 +02:00
Pierre Le Marre 8267918e3b scripts: Format imports 2026-07-26 20:07:36 +02:00
Pierre Le Marre 1e11d3afe4 Bump version to 1.14.0-beta1 2026-07-22 13:26:53 +02:00
Pierre Le Marre 588a96c584 doc: Fix typos 2026-07-22 12:27:29 +02:00
Pierre Le Marre 4bc4d78f52 tools: Add --version
All tools have `--help` but lack `--version`, except base `xkbcli`.

Add `--version` to meet user expectations.
2026-07-22 09:22:15 +02:00
Pierre Le Marre b7486ecdb6 doc: Fix issue with x11 group 2026-07-22 09:21:54 +02:00
Pierre Le Marre 6828fc3d52 doc(faq): How to handle more than 4 layouts 2026-07-21 17:33:40 +02:00
Pierre Le Marre fb8d5c80c2 doc(header): Dedicated keymap serialization group 2026-07-21 17:33:40 +02:00
Pierre Le Marre 25954d1e69 tools(compile-keymap): Add --layouts-mask
Enable to select the layouts indices to serialize.
2026-07-21 17:33:40 +02:00
Pierre Le Marre fe3a0f0cc6 test(keymap): Check layouts subsets 2026-07-21 17:33:40 +02:00
Pierre Le Marre ec70c859fd Add xkb_keymap_serialize()
Enable to have more control over serializing or its result than
`xkb_keymap_get_as_string()` or `xkb_keymap_get_as_string2()`.
In particular, it allows to choose which layouts are serialized.

Added:
- `xkb_keymap_serialize()`
- `struct xkb_keymap_serialize_config`
- `struct xkb_keymap_serialize_result`
2026-07-21 17:33:40 +02:00
Pierre Le Marre 5e3023edb2 log: Make various error codes public 2026-07-21 12:24:14 +02:00
Pierre Le Marre c71489ace8 doc: Fix @since and @returns 2026-07-21 12:24:14 +02:00
Pierre Le Marre 1f64d47721 doc: Make doxygen display reserved fields 2026-07-21 12:24:14 +02:00
Pierre Le Marre 584dadb595 state: Simplify xkb_state_components_update:reserved 2026-07-21 12:24:14 +02:00
Pierre Le Marre 4ddc6a4bc9 Fix ABI check
Follow-up of: c19d79047b

Fix the case where the caller a newer struct where a previous
`reserved` field was converted to a meaningful field.
2026-07-21 10:50:58 +02:00
Pierre Le Marre ef43d71d96 state: Replace enums with uint32_t in public structs
Use `uint32_t` instead of enums in public structs, because the enum
size is not reliable for size-controlled ABI.

Fixed:
- `struct xkb_state_components_update`
- `struct xkb_layout_policy_update`
2026-07-21 10:50:58 +02:00
Pierre Le Marre 5b9421afc2 clang-tidy: Remove noisy warnings 2026-07-21 10:50:58 +02:00
Pierre Le Marre b4c83aa185 Add internal xkb_keymap_key_effective_layout() 2026-07-20 12:59:55 +02:00
Pierre Le Marre c19d79047b Harden ABI check 2026-07-20 12:59:55 +02:00
Pierre Le Marre aaa09eb737 x11: Fix possible memory leak 2026-07-20 12:59:55 +02:00
Pierre Le Marre bd92f5b69b xkbcomp: Fix unlikely segfault 2026-07-20 12:59:55 +02:00
Pierre Le Marre c5ffd17540 xkbcomp: Fix explicit key types serialization
When requiring explicit key values, the type of each group should be
explicit, even if identical.
2026-07-20 12:59:55 +02:00
Pierre Le Marre e310fb5919 Constify keymap parameters
`struct xkb_keymap *keymap` → `const xkb_keymap *keymap`.
2026-07-18 22:15:40 +02:00
Pierre Le Marre 516b639098 Move ABI check to a dedicated file 2026-07-18 22:15:40 +02:00
Pierre Le Marre 1f9148a2be test(tools): Fix tools parsing 2026-07-18 22:15:40 +02:00
Pierre Le Marre 4b838a4b34 tools(compile-keymap): Add --{input,output}-strict
- Added `--input-strict` (parser) and `--output-strict` (serializer).
- Changed `strict` to enable strict mode for both parser and serializer.
2026-07-18 22:10:38 +02:00
Pierre Le Marre 870c4bc4e1 Add XKB_KEYMAP_SERIALIZE_STRICT_MODE 2026-07-18 22:10:38 +02:00
Pierre Le Marre 6ef4857633 tools(compile-keymap): Added detailed --explicit-* flags 2026-07-18 22:04:08 +02:00
Pierre Le Marre 1af397616e tools(dump-keymap*): Drop the --explicit-values flag
Duplicating the options of compile-keymap in the various dump-keymap
tools is time-consuming with little benefit: it suffices to pipe the
output to xkbcli-compile-keymap to get the full set of options.

From now, do not duplicate these options and remove the one that were
not yet published, for consistency.
2026-07-18 22:04:08 +02:00
Pierre Le Marre a91c9ae55d Refactor explicit flag for keymap serialization 2026-07-18 22:04:08 +02:00
Pierre Le Marre 4167131d71 log: Add XKB_ERROR_LAYOUT_COUNT_LIMIT_EXCEEDED 2026-07-18 21:58:32 +02:00
Pierre Le Marre 9be26ced3a log: Add XKB_ERROR_UNSUPPORTED_KEYMAP_SERIALIZATION_FLAGS 2026-07-18 21:58:32 +02:00
Pierre Le Marre d3290b0a88 log: Add XKB_ERROR_UNSUPPORTED_KEYMAP_FORMAT 2026-07-18 21:58:32 +02:00
Pierre Le Marre 53e0cfd305 test(x11comp): Print keymap on error 2026-07-16 15:03:28 +02:00
Pierre Le Marre 3bd9b00a5a xkbcomp: Enable serializing modifiers masks in modmaps
Before this commit, key modifier map with multiple modifiers and/or
with extended real modifiers could not be serialized properly,
resulting in parsing/serializing rountrip failure.

Fixed by properly serializing the `modifier_map` entries as allowed by
the corresponding keymap format.

Due to backward compatibility with the X11 ecosystem, serializing to the
v1 keymap format is subject to the following restrictions:

- Non-core modifiers are not supported.
- Multiple modifiers per key is not supported, unless using keysyms in the
  original `modifier_map` entry.
2026-07-16 15:03:28 +02:00
Pierre Le Marre 1f4fab2ca8 xkbcomp: Enable parsing modifiers masks in modmaps
Before this commit, `modifier_map` entries were limited to use a
*single*, *core* real modifier. However:

- XOrg xserver does support multiple modifiers per key modmap.
- XOrg xkbcomp can produce such keymap when different `modifier_map`
  entries resolve to the same key but at least one keysym is involved.
- xkbcommon nor XOrg xkbcomp can roundtrip parsing/serializing
  if some keys have a modmap with multiple modifiers: in such case,
  the keys appear in multiple single modifier entries and only the
  latest entry is kept, resulting in an incomplete modmap after
  roundtrip.
- xkbcommon supports extended real modifiers but cannot use them
  in `modifier_map` entries.

This commit enables to use real modifier *mask expression* when
parsing in the v2 keymap format:

    modifier_map Shift { … };
    // New: numeric equivalent of the previous entry
    modifier_map 0x001 { … };
    // New: modifier mask expression
    modifier_map Mod1+Mod2 { … };
    // New: numeric equivalent of the previous entry
    modifier_map 0x018 { … };
    // New: non-X11 core modifiers
    modifier_map 0x100 { … };
    // New: multiple non-X11 core modifiers
    modifier_map 0xf00 { … };
    // New: Mix of X11 core and non core modifiers
    modifier_map Mod2+0x100 { … };
    // New: Numeric equivalent of the previous entry
    modifier_map 0x110 { … };

Serializing will be done in a later commit.
2026-07-16 15:03:28 +02:00
Pierre Le Marre fa332f6c41 tools(compile-keymap): Always print error message and --test result
- Inform user on any error.
- Make test result explicit with by printing either an error message
  or "Success!" to stderr.
2026-07-15 06:46:34 +02:00
Pierre Le Marre 269ce532bb tools(compile-keymap): Handle errors explicitly 2026-07-15 06:46:34 +02:00
Pierre Le Marre 1cffdce931 chore: Fix typo 2026-07-15 06:46:34 +02:00
Pierre Le Marre cb528a2667 chore: Minor group parsing improvement 2026-07-15 06:46:34 +02:00
Pierre Le Marre a1ebd076f3 tools: Add support for sticky-keys-no-simultaneous 2026-07-12 20:05:41 +02:00
Pierre Le Marre 4bedfb9354 state: Implement A11Y TwoKeys
The `TwoKeys` X11 tag alters the `StickyKeys` feature and is
described as:

    If the XkbAX_TwoKeys flag is set, XKB automatically turns
    StickyKeys off if the user presses two or more keys at once.
    This serves to automatically disable StickyKeys when a user
    who does not require sticky keys is using the keyboard.

    Source: https://www.x.org/releases/current/doc/kbproto/xkbproto.html#:~:text=XkbAX_TwoKeys

The implementation in xkbcommon follow the one in XOrg, albeit some
renaming:

- Rename `XKB_A11Y_LATCH_TO_LOCK` to `XKB_A11Y_STICKY_KEYS_LATCH_TO_LOCK`.
- Added `XKB_A11Y_STICKY_KEYS_NO_SIMULTANEOUS_KEYS` to the
  `xkb_a11y_flags` enumeration.
- As in XOrg, the detection is limited to the case that at least one
  modifier key is pressed. While it does not strictly implement the
  XKB specification, neither does XOrg. The pros is that it does not
  require to track the state of the individual keys.
- A future implementation may fully implement the spec by tracking
  individual keys; such implementation would enable a new API to
  query keys states.
2026-07-12 20:05:41 +02:00
Pierre Le Marre ee2b8e13f0 xkbcomp: Remove noisy warning
Do not warn when parsing an implicit default keymap, because we
currently do not handle multiple keymaps per file.
2026-07-12 19:30:51 +02:00
Pierre Le Marre 9ba7d323db xkbcomp: Add support for section flag "deprecated"
Needed to ease deprecation in xkeyboard-config.
2026-07-12 19:30:51 +02:00
Pierre Le Marre 2dc4cf47c1 xkbcomp: Enable support for unknown section flags
Enable support for unknown sections flags in lax mode. This is needed
for forward-compatibility.
2026-07-12 19:30:51 +02:00
Pierre Le Marre 128bd98d66 test: Refactor log
- Improve memory use
- Move helper functions to a dedicated header, enabling reuse in next
  commits
2026-07-12 19:30:51 +02:00
Pierre Le Marre 7106807d19 chore: Fix clang-tidy warnings 2026-07-12 18:41:13 +02:00
Pierre Le Marre 33b360c263 Replace rand() with random()
See: https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/rules/miscellaneous-msc/msc30-c/
2026-07-12 18:41:13 +02:00
Pierre Le Marre 22af7c5ac1 Replace atof() with strtod()
See: https://clang.llvm.org/extra/clang-tidy/checks/bugprone/unchecked-string-to-number-conversion.html
2026-07-12 18:41:13 +02:00
Pierre Le Marre 48be8f2e41 Replace atoi() with strtoul()
See: https://clang.llvm.org/extra/clang-tidy/checks/bugprone/unchecked-string-to-number-conversion.html
2026-07-12 18:41:13 +02:00
Pierre Le Marre 6bb2076bf2 xkbcomp: Fix invalid group index in include statements
Replace `atoi` with `parse_dec_to_uint32_t` so that parsing is faster,
stricter and handle errors instead of silently discarding them.

NOTE: Some tests keymaps required and update because the XKB context
is shared between tests and atoms have new encodings.
2026-07-12 18:15:15 +02:00
Pierre Le Marre 95c36fb641 state: Document ABI versioning of xkb_state_update
Mention in the public API that possible padding bytes MUST be set to
0 with `memset()`.

Ensure there is no *implicit* padding so that we can avoid using
`memset()` internally.
2026-06-15 17:35:06 +02:00
Pierre Le Marre db8dc5ad75 doc: Document -* option for interactive tools 2026-06-05 18:21:41 +02:00
Pierre Le Marre 505d41d114 tools: Fix printing LEDs in interactive tools 2026-06-05 18:21:41 +02:00
Pierre Le Marre 9443d747e3 tools: Print controls state in interactive tools 2026-06-05 18:21:41 +02:00
Pierre Le Marre 6462b8caa8 doc: Improve unrecognized RMLVO value error 2026-06-01 13:30:17 +02:00
Pierre Le Marre aea993c713 doc: Add links to the error index 2026-06-01 13:30:17 +02:00
Pierre Le Marre 96de0918ef doc: Add 1.13.2 release notes 2026-05-30 11:01:19 +02:00
Pierre Le Marre 116535a1e2 rules: Fix out-of-bounds read 2026-05-29 07:50:14 +02:00
Pierre Le Marre e5fc4ae855 xkbcomp: Fix default section tag detection
Before this commit, detection of the `default` tag of XKB section
was broken: it wrongly matched the first section with at least one tag,
independently of the tag value. This resulted in possibly including the
wrong section when the include statement does not use an explicit
section name, e.g. `include "fr"` instead of `include "fr(basic)"`.

Thanksfully, xkeyboard-config has always the `default` section at the
top of the files, so only custom configurations could be affected.

- Fixed typo: `&&` → `&` introduced by
  9b0b8c6863.
- Added corresponding test.
2026-05-29 07:27:56 +02:00
Pierre Le Marre 19033ebb63 test(xkeyboard-config): Add --from-introspection
Enable to use xkbcommon YAML instrospection files instead of
XML registry files.

This enables to check files not registered in the XKB registry.
2026-04-27 15:53:06 +02:00
Pierre Le Marre 9e1915ba76 test(xkeyboard-config): Enable layout names with path
Enable e.g. `digital_vndr/lk`
2026-04-27 15:53:06 +02:00
Pierre Le Marre 31eda2e93b doc: Fix articles typos 2026-04-24 11:42:16 +02:00
Pierre Le Marre 765032109f doc: Improve README 2026-04-24 11:42:16 +02:00
Pierre Le Marre 2599ffaad4 doc: Improve custom configuration guide
- Rename `user-configuration.md` to `custom-configuration.md`, since
  it also applies to system-wide configuration.
- Add a quick start
- Add further internal links
- Security first
- Fix implicit definitions
- Fix typos
2026-04-24 11:42:16 +02:00
Pierre Le Marre 151c367afb doc: Clarify how to modify system-wide configuration
Before this commit, only user-configuration was documented, while in
fact the instructions can be applied for system-wide configuration
by modifying `/etc/xkb` directory (or similar) rather than
`~/.config/xkb` (or similar).
2026-04-23 10:56:56 +02:00
Pierre Le Marre e6d592e8e1 keysyms: Update using latest xorgproto
xorgproto commit: fcb7e9a1a0b593a44740d83b0babddd331fea830
Relevant MR: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/112

Added:
- `XKB_KEY_XF86ActionOnSelection`
- `XKB_KEY_XF86ContextualInsert`
- `XKB_KEY_XF86ContextualQuery`

Also fixed typo `xorgproto` in `NEWS.md`.
2026-04-23 10:25:11 +02:00
Pierre Le Marre 470e49039f ci: Auto-generate parser files only on some setups
- Ensure pre-generated parser files work everywhere.
- Ensure pre-generated parser files update works on Linux.
  For some reason the Windows CI fails on the same task and I could
  not figure out why, so I removed it.
- Ensure pre-generated files are up-to-date.
2026-04-22 13:22:35 +02:00
Pierre Le Marre 4aaea71fca build: Include pre-generated parser files and manual regeneration target
This change introduces pre-generated `parser.c` and `parser.h` files
into the source tree and adds a manual mechanism to regenerate them.

- Added the initial version of the generated `parser.c` and `parser.h`
  to allow out-of-the-box compilation without a yacc dependency.
- Added the meson option `enable-parser-auto-generation` (enabled by
  default) to choose between auto-generated and pre-generated parser
  files.
- Implemented the `src/xkbcomp/update-parser` custom target (not built
  by default) to allow developers to manually sync the pre-generated
  parser files after a `parser.y` update.
- Added a `yacc-wrapper` script to ensure Bison runs from the project
  root and adds a license header. This also guarantees that `#line`
  directives in generated files use relative paths, keeping the source
  tree sanitized and portable.

This approach prevents “Bison lock-in” while maintaining the ability
to update the grammar as needed.
2026-04-22 13:22:35 +02:00
Pierre Le Marre 1f2274c13f build: Remove a noisy Windows warning 2026-04-21 13:09:48 +02:00
Pierre Le Marre 1b9284d405 Fix implicit interger conversions 2026-04-21 13:09:48 +02:00
Pierre Le Marre 779a9c8b9e Fix static analyzer warnings 2026-04-20 20:55:27 +02:00
Pierre Le Marre c57de7897e ci: Use meson != 1.11.0 on Windows
Meson 1.11.0 has a bug that prevents the build.

Relates-to: https://github.com/mesonbuild/meson/issues/15702
Fixed-by: https://github.com/mesonbuild/meson/pull/15706
2026-04-17 14:42:25 +02:00
Pierre Le Marre 24ef8a24fa registry: Add DTD error logging for libxml2 < 2.14
Fixed missing logging of libxml2 errors when validating the DTD for
libxml2 < 2.14.

Relates-to: https://bugs.kde.org/show_bug.cgi?id=518963
2026-04-17 14:42:25 +02:00
Pierre Le Marre 61d92c12e0 registry: Fix header probing
The libxml2 header probing did not specify the libxml2 dependency,
resulting in failure or success depending of the system.

The system include path is `/usr/include/libxml2/libxml`. Some systems
like openSUSE Tumbleweed have a symlink `/usr/include/libxml` →
`/usr/include/libxml2/libxml`, but some other do not (e.g. ArchLinux).

Fixed by specifying the libxml2 dependency in the header probing.
2026-04-17 14:42:25 +02:00
Pierre Le Marre c1f8f18a90 doc: Improve xkbcommon.h
- Fixed typos
- Fixed missing namespaces
- Fixed Doxygen tags
- Clarified documentation
- Added parameter directions
2026-04-12 13:53:20 +02:00
Pierre Le Marre 7f92aabb8b tools: Improve xkbcli-interactive-* error handling
- Better error messages for xkb_machine_options
- Fix handling of state initialization errors on Wayland
2026-04-11 18:56:57 +02:00
Pierre Le Marre 57719f4170 doc: Fix xkbcommon.h typos 2026-04-11 18:05:11 +02:00
Pierre Le Marre 89dc9a23b3 tests: Use xkb_error_code 2026-04-11 18:05:11 +02:00
Pierre Le Marre 9a88455fb7 tools: Refactor xkbcli-interactive-* to use xkb_machine_builder
- Added `xkb_machine_options` as a keymap-independent precursor to
  `xkb_machine_builder`
- Fix xkbcli-interactive-evdev
- Fix xkbcli-interactive-wayland
- Fix xkbcli-interactive-x11
2026-04-11 18:05:11 +02:00
Pierre Le Marre 847ae79ca7 state: Add xkb_machine_builder_get_keymap()
Same as `xkb_machine_get_keymap()` but for the builder.
2026-04-11 18:05:11 +02:00
Pierre Le Marre 573630da32 state: Refactor xkb_machine_options into a builder
Before this commit, `xkb_machine_options` did not depend on a keymap,
postponing various checks to the call of `xkb_machine_new()`.

The issue is that non-trivial errors of `xkb_machine_options_*()`
functions are not triggered at call site.

- Refactored `xkb_machine_options` into `xkb_machine_builder` with an
  explicit dependency on the corresponding keymap.
- Fixed tests & bench.

⚠️  Tools will be fixed in next commits.
2026-04-11 18:05:11 +02:00
Pierre Le Marre a4fa133a7b doc: Fix @file missing annotations 2026-04-10 14:59:31 +02:00
Pierre Le Marre 6b68a0fe4b doc: Fix xkb_state-related API 2026-04-10 14:59:31 +02:00
Pierre Le Marre dc93732f1b state: Implement state modes
- Created `xkb_state_mod_internal` enum for state mode to handle
  client + legacy + `xkb_machine` use cases.
- Added `XKB_ERROR_UNEXPECTED_STATE_MODE`.
- Refactored `xkb_state` to be a minimal common state.
- Added private `xkb_client_state` as a wrapper to `xkb_state`
  for strong typing.
- Added `xkb_server_state` to handle legacy server state.
  Inherits from `xkb_state`.
- Refactored `xkb_machine` to inherits from `xkb_server_state`.
- Added tests.
2026-04-10 14:59:31 +02:00
Pierre Le Marre 497b23ef11 state: Introduce state modes API
Curently `xkb_state` is used for both client and server applications
for historical reasons. However, `xkb_state` contains much more data
than necessary for clients and may confuse users with the mixed
client/server API.

This commit introduces state *modes* to select the appropriate API:
- The `xkb_state_mode` enumeration provides 3 modes:
  - `XKB_STATE_MODE_CLIENT`: the client-only API mode, with a reduced
    memory footprint, updatable only via `xkb_state_update_mask()`.
  - `XKB_STATE_MODE_SERVER_QUERY`: the state companion to `xkb_machine`
    API mode, with a reduced memory footprint, updatable only via
    `xkb_state_update_event()`.
  - `XKB_STATE_MODE_SERVER`: the server-only API mode, updatable only
    via `xkb_state_update_key()`, `xkb_state_update_synthetic()` and
    the legacy `xkb_state_update_latched_locked()`.
  Each mode restricts the usable API to its use case.
- The new constructor `xkb_state_new_with_mode()` enables to select
  explicitly the state mode.

  NOTE: The implementation will be done in the next commits.
2026-04-10 14:59:31 +02:00
David Seifert dada5092e3 Make -Wstrict-prototypes -Wold-style-definition clean
```
--- before
+++ after
@@ -43,7 +43,7 @@
 Dependency xkeyboard-config-2 found: YES 2.47 (cached)
 Has header "unistd.h" : YES
 Has header "dirent.h" : YES
-Checking if "__builtin_expect" links: NO
+Checking if "__builtin_expect" links: YES
 Compiler for C supports arguments -Werror=attributes: YES
 Checking if "counted_by attribute for pointers" compiles: NO
 Header "unistd.h" has symbol "eaccess" : YES
@@ -63,7 +63,7 @@
 Checking for function "gnu_get_libc_version" : YES
 Header "locale.h" has symbol "newlocale" : YES
 Checking if "newlocale fails on invalid locales" runs: YES
-Checking if "-Wl,--version-script" links: NO
+Checking if "-Wl,--version-script" links: YES
 Program scripts/map-to-def found: YES (/home/soap/git/libxkbcommon/scripts/map-to-def)
 Program bison found: YES 3.8.2 3.8.2 (/usr/bin/bison)
 Found pkg-config: YES (/usr/bin/pkg-config) 2.5.1
```
2026-04-08 19:45:25 +02:00
Petr Sumbera 48500df716 test: accept Solaris invalid-option diagnostics
Keep checking EXIT_INVALID_USAGE for invalid options, but stop requiring
the exact GNU-style stderr text "unrecognized option".

On Solaris the same failure may report "illegal option", "unknown option",
or only usage/help text, while still returning the expected exit code.
2026-04-01 17:41:13 +02:00
Pierre Le Marre 09a3b1eb31 feature: Refactor xkb_has_feature
Change the name to follow the same pattern of the rest of the API and
the signature to use `uint32_t` instead of `int`:

```diff
  bool
- xkb_has_feature(enum xkb_feature feature, int value);
+ xkb_feature_supported(enum xkb_feature feature, uint32_t value);
```

Enumeration values are always non-negative in practice, and flags-style
enumerations can have members with the high bit set, which causes
undefined behavior with signed `int`. Negative sentinel values such as
-1 are accommodated by the well-defined unsigned wraparound cast.
`uint32_t` is thus both semantically more accurate and safer than `int`.
2026-03-28 12:55:48 +01:00
Pierre Le Marre 4aecb071d6 features: Refactor xkb_feature to a decimal segmented namespace
Assign values in the `xkb_feature` enumeration according to a
segmented decimal namespace that organizes enumerators by module
and sub-module. The namespace is purely organizational: values are
opaque constants and are never meant to be parsed or decomposed at
runtime.

Values follow the pattern `AABCD`:

| Numeric pattern | Segment    | Description                                                  |
| --------------- | ---------- | ------------------------------------------------------------ |
| AA000           | Module     | Top-level object; unallocated slots are independent spares   |
| 00B00           | Sub-module | Functional category; primary slots at ×200, companions +100  |
| 000CD           | Feature    | Fine-grained index within a sub-module; related pairs at +20 |

Current module assignments:

  Slot    Module
  ──────────────────────────
     0    Core / global
     1    Error
     2    (reserved for error or context-related object)
     3    Context
     4    (reserved for context-related object)
     5    Logging
   6-8    (reserved for logging or core keymap-related objects)
     9    Keysym
 10-17    (reserved for core keymap-related objects and keymap builders)
    18    RMLVO
 19-20    (reserved for core keymap-related objects and keymap builders)
    21    Keymap
 22-23    (reserved for keymap and state -related objects)
    24    Keyboard state components
    25    Keyboard state machine (reserved)
    26    (reserved for state-related object)
    27    Keyboard events / input
 28-29    (spare)
    30    Compose table
    31    Compose state
    32    (spare)

Cross sub-modules:

  Slot    Sub-module
  ──────────────────────────
     0    General / components / properties
   100    General / components / properties
   200    Creation / parsing
   300    Update
   400    Serialization
   500    (spare / module-specific)
   600    Iterator
   700    (spare / module-specific)
   800    Query
   900    (spare / module-specific)

The current values are meant to leave enough room for future additions.

Compose is much more independent than the rest and has no foreseen
developments, so it is put at the very end to leave room for keymap and
state handling.
2026-03-28 12:55:48 +01:00
dependabot[bot] 9e36230747 build(deps): bump actions/upload-artifact from 4 to 7
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 7.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v7)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-03-24 19:39:34 +01:00
dependabot[bot] fe899ba29e build(deps): bump actions/checkout from 5 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-03-24 19:31:39 +01:00
dependabot[bot] ebd8d6b2b8 build(deps): bump actions/setup-python from 5 to 6
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5 to 6.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-03-24 19:31:20 +01:00
Pierre Le Marre 5f134a1f2c ci: Deactivate x11 tests on macOS
X11 tests are failing on X11 with no clear reason. Deactivate them
until a fix is found.
2026-03-24 19:07:32 +01:00
Pierre Le Marre 0a6430a0fa ci: Do not install setxkbmap on macOS
setxkbmap seems removed from Homebrew.
Installing from MacPorts does not seem to work either.
2026-03-24 13:13:28 +01:00
Pierre Le Marre d134addd90 ci: Fix permission issue on macOS 2026-03-24 13:13:28 +01:00
Pierre Le Marre 2075d6a63d ci: Fix typo in macOS workflow 2026-03-24 13:13:28 +01:00
Pierre Le Marre 194051e8f6 doc: Mention package creation and xkbcli info 2026-03-24 13:13:28 +01:00
Pierre Le Marre fab946bdcd build: Fix Windows def files
The DLLs are versioned with the major version, so the DEF files
must point to the suffixed DLLs (e.g. `LIBRARY xkbcommon-0`).
This ensures the linker resolves symbols to the correct filename.

Note that this issue pre-dated the build files refactor starting
at 32de22deff.
2026-03-24 13:13:28 +01:00
Pierre Le Marre 33b0217b99 build: Move doc definitions to doc/meson.build
Relocates doc definitions to the `doc` subdirectory.
This makes the meson.build files easier to navigate.
2026-03-24 13:13:28 +01:00
Pierre Le Marre aa537dec2b build: Move fuzzing definitions to fuzz/meson.build
Relocates fuzzing definitions to the `fuzz` subdirectory.
This makes the meson.build files easier to navigate and keeps
target definitions close to their respective source files.
2026-03-24 13:13:28 +01:00
Pierre Le Marre d6bd993915 build: Move tools definitions to tools/meson.build
Relocates tools definitions to the `tools` subdirectory.
This makes the meson.build files easier to navigate and keeps
target definitions close to their respective source files.
2026-03-24 13:13:28 +01:00
Pierre Le Marre caff097a11 build: Move test definitions to test/meson.build
Relocates test suite definitions to the `test` subdirectory.
This makes the meson.build files easier to navigate and keeps
target definitions close to their respective source files as
the number of test cases grows.
2026-03-24 13:13:28 +01:00
Pierre Le Marre a8ee7dcce8 build: Move bench definitions to bench/meson.build
Encapsulates benchmark targets using subdir().

This is the first of four commits that splits the monolithic
`meson.build` into subdirectory files using `subdir()`. Each
subdirectory will own its own build definitions, making each
meson.build file easier to navigate and reducing coupling
between unrelated sections.
2026-03-24 13:13:28 +01:00
Pierre Le Marre a24e10ab46 build: Rename meson_options.txt to meson.options
Use the preferred file name
2026-03-24 13:13:28 +01:00
Pierre Le Marre be5baf9aeb build: Format using builtin meson format
Use `meson format --inplace`
2026-03-24 13:13:28 +01:00
Pierre Le Marre ab881a56dd build: Remove unused variables and normalize path separators 2026-03-24 13:13:28 +01:00
Pierre Le Marre 5add4e3f50 build: Use static library for common test source files
Consolidates shared test code into a static library to reduce
unnecessary recompilation across multiple test executables.
2026-03-24 13:13:28 +01:00
Pierre Le Marre 2ed82de762 build: Use static library for common tools source files
Consolidates shared tools code into a static library to reduce
unnecessary recompilation across multiple tools executables.
2026-03-24 13:13:28 +01:00
Pierre Le Marre 50f797c8f4 build: Remove redundant include_directories
Targets depending on `tools_dep` or `test_dep` now rely on automatic
dependency propagation instead of explicit directory listings.
2026-03-24 13:13:28 +01:00
Pierre Le Marre 658f69f657 build: Use set10() consistently for boolean feature flags
`configh_data.set('HAVE_X', 1)` was used for some features while
`set10()` was used for others. set10() is the correct choice for
boolean probes: it always emits either `#define HAVE_X 1` or
`#define HAVE_X 0`, making `config.h` self-documenting and safe
for use with `#if` regardless of whether the flag was detected.

Also refactors the `has_extensions_directories` logic to use local
boolean variables instead of reading back from `configh_data`.
2026-03-24 13:13:28 +01:00
Pierre Le Marre 270eb628fd build: remove header files from source lists
Meson does not compile header files — listing them in sources: has no
effect on the build. Header dependencies are tracked automatically via
the compiler's dependency files (-MMD/-MF), so any .c file that
includes a changed header will be recompiled correctly without the
header being listed explicitly.

Removing them makes the source lists shorter and unambiguous: every
entry is a file that actually gets compiled. It also avoids the false
impression that listing a header somewhere "registers" it with the build
system in a meaningful way.
2026-03-24 13:13:28 +01:00
Pierre Le Marre 32de22deff state: Refactor xkb_state API with error code
Change the return type from `int` to `enum xkb_error_code` of:
- xkb_state_update_synthetic()
2026-03-20 21:09:21 +01:00
Pierre Le Marre 1f0205e808 state: Refactor xkb_machine API with error code
Change the return type from `int` to `enum xkb_error_code` of:
- xkb_machine_process_key()
- xkb_machine_process_synthetic()
2026-03-20 21:09:21 +01:00
Pierre Le Marre 2a6146f385 state: Refactor ABI check for state updates
Checks were incomplete and error-prone:
- moved to a dedicated function;
- added tests.
2026-03-20 21:09:21 +01:00
Pierre Le Marre 8f896b63cf state: Refactor xkb_machine_options API with error code
Change the return type from `int` to `enum xkb_error_code` of:
- xkb_machine_options_update_a11y_flags()
- xkb_machine_options_remap_mods()
- xkb_machine_options_update_shortcut_mods()
- xkb_machine_options_remap_shortcut_layout()

Also rename some errors:
- `XKB_ERROR_UNSUPPORTED_GROUP_INDEX` to
  `XKB_ERROR_UNSUPPORTED_LAYOUT_INDEX`, because the public API use
  “layout” instead of “group”.
- `XKB_ERROR_INVALID_A11Y_FLAG` to
  `XKB_ERROR_UNSUPPORTED_A11Y_FLAGS`, because the issue may be a
  lib version mismatch.
2026-03-20 21:09:21 +01:00
Pierre Le Marre 0f42ce2d52 Add the enum xkb_error_code to the feature test API 2026-03-20 21:09:21 +01:00
Pierre Le Marre 5af43232c0 Add public enum xkb_error_code for richer return type
Created the enumeration `xkb_error_code` that will be used as a richer
return type in the 1.14 API. Since we already have error codes in the
`xkb_message_code` enumeration, the relevant codes are now shared
with the `xkb_error_code` codes.

`xkb_message_code` is not made public because:
- Only few of its codes are currently used as return values.
- Although the codes and their corresponding ID are meant to be
  immutable, we are not quite there yet, because some messages
  have semantic issues or lack a proper namespace. Such entries should
  be kept private until they stabilize.

So the safest path is to have two enumerations:
- `xkb_error_code` is public and does follow ABI/API stability rules.
- `xkb_message_code` is internal and is a superset of `xkb_error_code`,
  so that we have a unique type for use cases such as the
  `check-messages` tool. `xkb_message_code` is modified so that
  the public codes are now suffixed with `_`.
2026-03-20 21:09:21 +01:00
Pierre Le Marre 0e04f19541 doc: Fixes + enhancements 2026-03-19 18:13:23 +01:00
Pierre Le Marre 67ea914614 state: Refactor XKB_KEYBOARD_CONTROL_NONE
Rename XKB_KEYBOARD_CONTROL_NONE to XKB_KEYBOARD_CONTROL_NO_FLAGS
for consistency with other flag enums.
2026-03-19 18:13:23 +01:00
Pierre Le Marre 910460b4fe state: Remove unreleased bloated API
xkb_state_update() and xkb_machine_process_state_update() make some
functions redundant. Clean up the unreleased one.

Removed:
- xkb_state_update_enabled_controls()
- xkb_machine_update_latched_locked()
- xkb_machine_update_enabled_controls()
- xkb_machine_state_update_control()
2026-03-19 18:13:23 +01:00
Pierre Le Marre 9638c704d9 state: Add xkb_state_update_synthetic()
Merge all out-of-band state updates into a single function
to get a real atomic update.
2026-03-19 18:13:23 +01:00
Pierre Le Marre 071925baf4 state: Add xkb_machine_process_synthetic()
Merge all out-of-band state updates into a single function
to get a real atomic update.

Build the update request from public types, designed to make the
ABI forward-compatible:

- `enum xkb_layout_out_of_range_policy`
- `struct xkb_layout_policy_update`
- `struct xkb_state_components_update`
- `struct xkb_state_update`
- `xkb_machine_process_synthetic()`
2026-03-19 18:13:23 +01:00
Pierre Le Marre 58362c55fb state: Refactor xkb_machine_process_key()
Re-order the arguments so that inputs are before outputs.
2026-03-19 18:13:23 +01:00
Pierre Le Marre 0f411256e1 state: Refactor xkb_state_update_from_event
Rename xkb_state_update_from_event to xkb_state_update_event: shorter
and follow the same naming pattern of other `xkb_state_update_*`
functions.
2026-03-19 18:13:23 +01:00
Pierre Le Marre 2c9de7df4b state: Refactor xkb_events_new()
Rename to `xkb_events_new_batch()` in order to clarify that the
intended use is sync. We may implement an async `xkb_events_new_queue()`
in a latter release.
2026-03-19 18:13:23 +01:00
Pierre Le Marre b263e1a070 state: Refactor xkb_server_state to xkb_machine
`xkb_server_state` name is problematic.

Both `xkb_server_state` and (historically) `xkb_state` are in fact
Mealy machines. Their inputs are raw key events and their outputs
are `xkb_event`. `xkb_state` is additionally an observable state
of both machines, with associated query functions.

`xkb_server_state` obsoleted the server API of `xkb_state`, i.e.
its state machine API. The modern API is therefore:

- state machine: `xkb_server_state`
- observable state: `xkb_state`
- input: pair (`xkb_keycode_t`, `enum xkb_key_direction`)
- output: `xkb_event`

`xkb_server_state` / `xkb_state` is just confusing since there is no
`xkb_client_state`. Also keeping “state” as a suffix for the new
server API does not help to claim that the server-side API of
`xkb_state`  is deprecated.

This commit renames `xkb_server_state` and its corresponding functions
to `xkb_machine`:

- It makes its role obvious: a state machine, with all the event
  processing logic.
- It pairs well with the existing `xkb_state`, which primary goal
  is for querying state in clients.
- It is shorter.
- While generic, its meaning is clear in the XKB context.

Use the verb “process” instead of “update” in the API to denote
transition updates of the state machine, while the “update” verb
will be used for state machine *configuration* changes.

Thus `xkb_server_state_update_key()` is renamed to
`xkb_machine_process_key` for transitions based only on input changes,
while a future `xkb_machine_process_state_update()` will deal with
out-of-bound state changes.

Note that we will not update the Mealy machine with *explicitly* both
(input, state) entries.
2026-03-19 18:13:23 +01:00
Pierre Le Marre 11ff31a5b9 state: Rename xkb_accessibility_flags to xkb_a11y_flags
Make naming consistent across enum, enum constants and functions.
2026-03-19 18:13:23 +01:00
Pierre Le Marre 6e4f0fb9e7 state: Rename xkb_state_accessibility_flags to xkb_accessibility_flags 2026-03-16 11:07:46 +01:00
Pierre Le Marre f24b421b7f state: Re-encode keyboard controls
There is no requirement to keep X11 encoding. Let’s keep the overlays
codes continuous.
2026-03-16 11:07:46 +01:00
Pierre Le Marre 9ba7f85481 state: Rename XKB_OUT_OF_RANGE_LAYOUT_SATURATE to XKB_OUT_OF_RANGE_LAYOUT_CLAMP 2026-03-16 11:07:46 +01:00
Pierre Le Marre d79683f7e3 state: Rename xkb_server_options_shortcuts_*
- `xkb_server_options_shortcuts_update_mods()` →
  `xkb_server_options_update_shortcut_mods()`
- `xkb_server_options_shortcuts_set_mapping()` →
  `xkb_server_options_remap_shortcut_layout()`
2026-03-16 11:07:46 +01:00
Pierre Le Marre c96ce9b523 state: Rename xkb_server_options_mods_set_mapping to xkb_server_options_remap_mods 2026-03-16 11:07:46 +01:00
Pierre Le Marre afda56fb9c state: Rename server_state_options* to server_options 2026-03-16 11:07:46 +01:00
Pierre Le Marre b980ebb175 doc: Fix headers
- Variables names/description
- Formatting
- Links
2026-03-16 11:07:46 +01:00
Pierre Le Marre 65f1bf4153 state: Rename xkb_event_iterator* to xkb_events*
Shorter and less confusing about its function: it is rather a queue.
2026-03-16 11:07:46 +01:00
Pierre Le Marre c70544c425 state: Rename xkb_state_machine* to xkb_server_state*
More precise naming and make its intended use clear.
2026-03-16 11:07:46 +01:00
Pierre Le Marre ab97442060 bench: Improve key-proc
- Added state machine benchmark
- Enable to use a keymap from stdin
- Use volatile variables to avoid computations are optimized away.
2026-03-14 12:36:43 +01:00
Pierre Le Marre 977b1e9657 keysyms: Update using latest xorgproto
xorgproto commit: 04482cdee458445eab7c6a0b6d4ea64b74387401
Relevant MR: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/110

Added:
- `XKB_KEY_dead_apostrophe`
- `XKB_KEY_SSHARP`
- `XKB_KEY_leftsingleanglequotemark`
- `XKB_KEY_rightsingleanglequotemark`

Changed:
- `ISO_Group_Shift` is now the canonical name of the corresponding keysym.
  Previously it was `Mode_switch`, which refers to a core X group
  mechanism obsoleted by XKB.

Updated the tests accordingly.
2026-03-13 21:40:17 +01:00
Pierre Le Marre 0e1b342e8d keysyms: Add xkb_utf8_to_keysym() 2026-03-13 20:12:28 +01:00
Pierre Le Marre ae9ad139aa tools: Added support for overlays 2026-03-13 19:12:58 +01:00
Pierre Le Marre 61d0b0cff1 doc: Keyboard overlays support 2026-03-13 19:12:58 +01:00
Pierre Le Marre b6c0081d58 xkbcomp: Raise overlays max to 8 in v2 keymap format
Only 2 overlays may be limitating. Let’s increase the maximum to
*8*, which seems reasonable. Note that the maximum is limited
by `KeyInfo` size; currently we could go up to 16 overlays without
incresing its size, but that seems unnessary for an already niche
feature. So keep the last free byte available for future features.

- Added keymap format-specific overlay limit.
- Added `XKB_KEYBOARD_CONTROL_OVERLAY{3,8}` to the
  `xkb_keyboard_control_flags` enumeration.
2026-03-13 19:12:58 +01:00
Pierre Le Marre 0e4ea90ff7 state: Enable keyboard overlays
- Added state handling of overlays.
- Added `XKB_KEYBOARD_CONTROL_OVERLAY{1,2}` to xkb_keyboard_control_flags
  enumeration.
2026-03-13 19:12:58 +01:00
Pierre Le Marre 80639f0a67 xkbcomp: Enable overlapping overlays in v2 keymap format
X11 limits at most 1 overlay per key. However, it is possible to
handle *overlapping* overlays by setting the effective key overlay
to the *latest* corresponding activated overlay control.

E.g. if a key has both overlays 1 and 2 defined, then:
- Activate overlay 1: effective overlay is 1
- Activate overlay 2: both overlays are now active, latest
  is 2 so effective key overlay is 2.
- Deactivate overlay 1: effective key overlay is still 2.
- Activate overlay 1: effective key overlay is now 1.
- Deactivate overlay 1: effective key overlay is now 2.

This commit only deals with *parsing* and *serializing*.

Overlapping overlays are store in a sparse array.
2026-03-13 19:12:58 +01:00
Pierre Le Marre 88fd67baac xkbcomp: Add support for serializing X11 overlays 2026-03-13 19:12:58 +01:00
Pierre Le Marre fe0b364bfc xkbcomp: Add support for parsing X11 overlay controls
Added the keyboard controls `Overlay1` and `Overlay2` using their
corresponding X11 mask.
2026-03-13 19:12:58 +01:00
Pierre Le Marre eaf25bccd1 xkbcomp: Add support for parsing X11 overlays
Keyboard overlays allow a key to report a different keycode when an
overlay control is active, a feature present in the X11 XKB
implementation.

This commit only implements key overlay *parsing*. It also fixes an
issue in the Macintosh US layout.

Next commits will implement the features required to bring libxkbcommon
closer to feature parity with X11 XKB implementation.
2026-03-13 19:12:58 +01:00
Pierre Le Marre f9eda207b4 perf: Optimize structures
Added a script using `pahole` to check holes in the lib types.

Results on Linux x86-64:

| Type                | Size before | Size after | Diff |
| ------------------- | ----------- | ---------- | ---- |
| struct xkb_keymap   | 1440        | 1432       |  -8  |
| struct xkb_key      | 48          | 32         |  -16 |
| typedef LedNameDef  | 48          | 40         |  -8  |
| typedef SymbolsInfo | 872         | 864        |  -8  |
| typedef KeyInfo     | 56          | 48         |  -8  |
| typedef GroupInfo   | 32          | 24         |  -8  |
| struct rule         | 176         | 168        |  -8  |

Statistics from memusage using xkbcli compile-keymap:

Layout: `us`

|        | heap total | heap peak | stack peak |
| ------ | ---------- | --------- | ---------- |
| Before | 725048     | 328662    | 35296      |
| After  | 688304     | 293598    | 35280      |
| Diff   | -5,07 %    | -10,67 %  | -0,05 %    |

Layout: `de`

|        | heap total | heap peak | stack peak |
| ------ | ---------- | --------- | ---------- |
| Before | 779386     | 328790    | 35296      |
| After  | 741394     | 293726    | 35280      |
| Diff   | -4,87 %    | -10,66 %  | -0,05 %    |
2026-03-12 20:37:48 +01:00
Pierre Le Marre d7e32aacad doc: Key behaviors 2026-03-12 20:37:48 +01:00
Pierre Le Marre 645951d300 tools: Fix displaying layout with no name 2026-03-12 20:37:48 +01:00
Pierre Le Marre 75b7da3f86 tools: Fix info on macOS 2026-03-12 20:37:48 +01:00
Pierre Le Marre 548cb04061 build: Make counted_by check more robust
Follow-up of b495d38b8e: use
`-Werror=attributes` to ensure that the feature is really available,
instead of ignoring compiler warnings.
2026-03-12 20:37:48 +01:00
Pierre Le Marre 16d4925ad9 state: Enable out-of-range layout policy configuration
Enable the configuration of out-of-range layout handling using the
following new API:
- `state_machine::xkb_state_machine_update_control()`
- `enum xkb_keyboard_control_param`, with values:
  - `XKB_KEYBOARD_CONTROL_OUT_OF_RANGE_LAYOUT_POLICY`
  - `XKB_KEYBOARD_CONTROL_OUT_OF_RANGE_LAYOUT_REDIRECT`
- `enum xkb_out_of_range_layout_policy`, with values:
  - `XKB_OUT_OF_RANGE_LAYOUT_WRAP`: wrap into range using integer
    modulus (default, as before).
  - `XKB_OUT_OF_RANGE_LAYOUT_SATURATE`: clamp into range, i.e.
    invalid indices are corrected to the closest valid bound (0 or
    highest layout index).
  - `XKB_OUT_OF_RANGE_LAYOUT_REDIRECT`: redirect to a specific
    layout index.
2026-03-04 12:42:13 +01:00
Pierre Le Marre c13a11b713 state: Refactor out_of_range_group_action
Fix the awkward enum name xkb_range_exceed_type and prepare to
make it a public API.
2026-03-04 12:42:13 +01:00
Pierre Le Marre 777deaca4a state: Refactor keyboard controls
This is in preparation for non-boolean keyboard controls.
2026-03-04 12:30:20 +01:00
Pierre Le Marre 38984f8b84 state: Refactor xkb_state_machine
Remove the `extra` field layer.
2026-03-04 12:30:20 +01:00
Pierre Le Marre 86c7f177df xkbcomp: Remove keymap field enabled_ctrls
Controls should be set in the state, not the keymap.
2026-03-04 12:30:20 +01:00
Pierre Le Marre 7a3b2b22f8 ci: Fix macOS
- Install missing setxkbmap using MacPorts.
- Update renamed formula.
- Deactivate x11comp test for now, because it has a strange error
  with a duplicated "SHIFT+ALT" key type.
2026-03-04 12:04:07 +01:00
Pierre Le Marre e11229f380 test: Add x11 & flaky suites
Mark x11comp test as flaky because it has sometimes an issue with
duplicated types, depending on the OS and xserver version.
2026-03-04 12:04:07 +01:00
Pierre Le Marre 78b1c5ad76 keysyms: Rename private names header
Make it follow the same pattern as the other keysym-related files.
2026-03-02 16:35:21 +01:00
Pierre Le Marre cfc04de49f keysyms: Update using latest xorgproto
xorgproto commit: a0e67bb76fedb66f8f68d2634f37046e97002363
Relevant MR: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/109
2026-03-02 16:35:21 +01:00
Pierre Le Marre 2b918f4e84 keysyms: Add missing UTF conversions for numeric phone keys
xorgproto commit: 2e582f23e85e3ebf793d62fb2e5862ff9d9a2917
Relevant MR: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/109
2026-03-02 16:35:21 +01:00
Pierre Le Marre fab6fe1ea9 tools: Do not enter interactive when custom keymap failed to compile 2026-02-27 20:42:37 +01:00
Pierre Le Marre 6fbec09ba1 tools: Add option for strict mode to interactive-evdev 2026-02-27 20:42:37 +01:00
Pierre Le Marre 644a51b51d tools: Add option for strict mode on X11 2026-02-27 20:42:37 +01:00
Pierre Le Marre 0bb6cededc tools: Add option for strict mode on Wayland 2026-02-27 20:42:37 +01:00
Pierre Le Marre 30d10391fe tools: Add option for strict mode to compile-keymap 2026-02-27 20:42:37 +01:00
Pierre Le Marre 952de81972 test: Add lenient parsing tests 2026-02-27 20:42:37 +01:00
Pierre Le Marre 47222963df xkbcomp: Make parser lenient towards unknown declaration statements
Simply ignore them. Note that it only supports the pattern
`STMT_TYPE ID = …;`, where `ID` is a terminal and not a general
expression. Otherwise it would be more complex to handle due to
overlapping patterns.
2026-02-27 20:42:37 +01:00
Pierre Le Marre b3de0a2cac xkbcomp: Make parser lenient towards unknown compound statements
Simply ignore them. Note that it only supports the pattern
`STMT_TYPE [ID] { […] };`, where `ID` is a terminal and not a general
expression. Otherwise it would be more complex to handle due to
overlapping patterns.
2026-02-27 20:42:37 +01:00
Pierre Le Marre bcca19b7fa xkbcomp: Make parser lenient towards unknown fields
Simply ignore them.
2026-02-27 20:42:37 +01:00
Pierre Le Marre d28231ca78 xkbcomp: Make parser lenient towards unknown global vars
Simply ignore them.
2026-02-27 20:42:37 +01:00
Pierre Le Marre 99b76d8e4a xkbcomp: Make parser lenient towards invalid actions
It enables handling:
- unknown actions: turn it into a `NoAction()`;
- unknown arguments: ignore them;
- invalid argument values: invalidate the whole action,
  converting it to `NoAction()`.
2026-02-27 20:42:37 +01:00
Pierre Le Marre 479da6d906 xkbcomp: Make parser lenient towards field type mismatch
It enables to turn a boolean flag into e.g. a more general enum.
2026-02-27 20:42:37 +01:00
Pierre Le Marre 8034a9f3bc xkbcomp: Prepare parser to be lenient by default
Make the XKB parser *lenient by default* to enable *forward*-compatibility.

The primary motivation is the evolution of the keymap format v2, which
has a living specification.

Added `XKB_KEYMAP_COMPILE_STRICT_MODE` flag to the `xkb_keymap_compile_flags`
enumeration.
2026-02-27 20:42:37 +01:00
Pierre Le Marre 6777dbdc79 xkbcomp: Fix key type parsing
`ok` should be set only on failure, not at each iteration.
2026-02-27 20:42:37 +01:00
Pierre Le Marre e385ce5bab xkbcomp: Fix interpret parsing
`ok` should be set only on failure, not at each iteration.
2026-02-27 20:42:37 +01:00
Pierre Le Marre 0664818011 Fix clang-tidy warnings 2026-02-27 15:57:28 +01:00
Pierre Le Marre e777480eb9 state: Fix use after free 2026-02-27 15:57:28 +01:00
Ran Benita b495d38b8e Make use of counted_by gcc/clang attribute
This is kind-of nice self-documentation, and can be utilized for static
analysis and dynamic buffer overflow protection (such as
`-fsanitize=bounds` and `__builtin_dynamic_object_size` used by
`_FORTIFY_SOURCE=3`).

Clang<19.1.0 and GCC<=15.2 only support `counted_by` on flexible array
members, not pointer fields as used in xkbcommon, therefore we need a
configure check that annotating pointer fields is supported, not merely
that the attribute exists.

Clang (unlike GCC) currently requires that the count field come before
the pointer field. They have a flag to
`-fexperimental-late-parse-attributes` to enable this, but since it's
experimental I don't want to pass it. So we need to reorder some fields.

Another needed code adaption is to ensure that the length field is
always correctly set *before* the array is accessed. So e.g. the
sequence "alloc buffer, assign, set length field" is changed to "alloc
buffer, set length field, assign", otherwise the dynamic bounds check
during assignment fails.

I have verified that it works well with `-fsanitize=undefined` by
inserting some out-of-bounds access to `keymap->keys` and seeing that it
goes undetected before and detected after.

See:
https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html#index-counted_005fby-variable-attribute
https://www.gnu.org/software/libc/manual/html_node/Source-Fortification.html#Fortification-of-function-calls
https://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html#index-_005f_005fbuiltin_005fdynamic_005fobject_005fsize
https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html#index-fsanitize_003dbounds

Signed-off-by: Ran Benita <ran@unusedvar.com>
2026-02-24 06:51:30 +01:00
Ran Benita 24e896535e utils: remove darray.h include from utils.h
The next commit wants to use utils.h in darray.h.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2026-02-24 06:51:30 +01:00
Pierre Le Marre 266a3202dc ci: Use _FORTIFY_SOURCE=3 2026-02-24 06:51:30 +01:00
Pierre Le Marre c770599396 ci: Use Ubuntu 24.04 2026-02-23 11:36:38 +01:00
Pierre Le Marre f32c31f54b tools: Add support for repeated key events 2026-02-23 08:50:27 +01:00
Pierre Le Marre be2eaf6a99 state: Add repeated key state
Added `xkb_key_direction::XKB_KEY_REPEATED` to improve state handling
when the compositor is in charge of key repetition. This mirrors the
`wl_keyboard::key_state::repeated` Wayland value.

When a key is repeated, all filters will consume the event if it is
the same key, or ignore the event. The key actions are not triggered
again. All filters will produce only a single key repeat event if it
is the key that triggered it, except `RedirectKey()` which may also
produce surrounding state change events (e.g. when using `mods` or
`clearMods` parameters). Tweaks (mods, shortcuts) also need to be
applied again.

Also improved the tooling to handle/display key repetition correctly.
2026-02-23 08:50:27 +01:00
Pierre Le Marre 70c5d441ec ci: Fix cmd comment 2026-02-23 08:29:09 +01:00
Pierre Le Marre 30979ab919 tools: Add option to force all values serialization
Added `--explicit-values` to `xkbcli {compile-keymap,dump-keymap*}`.
2026-02-23 08:29:09 +01:00
Pierre Le Marre ea1c36e104 xkbcomp: Enable to force explicit values at serialization
Added the option `XKB_KEYMAP_SERIALIZE_EXPLICIT`
to make all values explicit.
2026-02-23 08:29:09 +01:00
Pierre Le Marre 1e67f8553a xkbcomp: Add explicit/implicit info for symbols & actions
This will be use to improve serializing in later commits.
2026-02-23 08:29:09 +01:00
Pierre Le Marre 2b19c1e180 xkbcomp: Enable relative group ±0 in actions
While seemingly dummy, it is useful:
- to write the explicit default value;
- to enable valid result from a computation;
- to be consistent with the handling of relative values from other
  variables.
2026-02-23 08:29:09 +01:00
Pierre Le Marre f676eba54a xkbcomp: Add RedirectKey(keycode=auto)
Before this commit, `RedirectKey()` without the `keycode` parameter was
accepted but obviously ineffectual, except for secondary effects such as
breaking latches.

A better default is to use the keycode of the key where the action is
located, e.g.:

```c
key <1> { [RedirectKey()] };
```

is *automatically* converted to:

```c
key <1> { [RedirectKey(keycode=<1>)] };
```

Note that the previous example is for illustration only: real use of
`RedirectKey()` with an implicit keycode would also involve `mods` or
`clearMods` parameters.

The default keycode parameter value can be set explicitly using the new
`auto` special value:

```c
key <1> { [RedirectKey(keycode=auto)] };
```
2026-02-23 08:29:09 +01:00
Pierre Le Marre 0dcfcfc27b xkbcomp: Fix segfault in RedirectKey() serialization 2026-02-21 22:33:25 +01:00
Pierre Le Marre 627136536c state: Do not apply RedirectKey filter if keycode is undefined 2026-02-21 22:33:25 +01:00
Ronan Pigott 6ec367a2de tools: Add zsh completion for RMLVO components
To spare parsing YAML output in zsh code, these completers rely on yq to parse
the xkbcli output.

If yq is not installed, the completion will fallback to a more rudimentary
version using only sed for parsing.
2026-02-21 04:27:45 +01:00
Ronan PigottandPierre Le Marre 7cc3896864 tools: Add zsh completions
Co-authored-by: Ronan Pigott <ronan@rjp.ie>
Co-authored-by: Pierre Le Marre <dev@wismill.eu>
2026-02-21 04:27:45 +01:00
Pierre Le Marre 1169593e0b xkbcomp: Fix fallback interpret
The interpret fallback should be:

```c
interpret VoidSymbol+AnyOfOrNone(none) {
	action= NoAction();
};
```

not:

```c
interpret VoidSymbol+AnyOfOrNone(none) {
        repeat= True;
};
```
2026-02-20 15:39:53 +01:00
Pierre Le Marre f9415696c8 test: Check headers compatibility with C++
Do not rely only on (my) discipline to ensure headers compatibility with
C++.

Fixed current incompatibility.
2026-02-18 10:56:32 +01:00
Pierre Le Marre 4db1784e50 test: Add missing CLI tests 2026-02-17 17:21:29 +01:00
Pierre Le Marre 8908cbb3e7 tools: Improve wayland logging 2026-02-17 17:21:29 +01:00
Pierre Le Marre 9901ce9576 tools: Added --consumed-mode to all interactive tools
Added to `interactive-{wayland,x11} and fixed in `interactive-evdev`.
2026-02-17 17:21:29 +01:00
Pierre Le Marre 6f2917727d tools: Enable parsing keymap from stdin in interactive-evdev
With this commit all the interactive tools can parse a keymap from
stdin.
2026-02-17 17:21:29 +01:00
Pierre Le Marre 5f5ec4a01f tools: Improve arguments documentation 2026-02-17 17:21:29 +01:00
Pierre Le Marre 7949954233 tools: Improve usage() using keymap format labels
- Added `xkb_v1` and `xkb_v2` as canonical labels, in order to match
  Wayland’s `wl_keyboard::keymap_format` enumeration.
- Enumerations values are not user-friendly: prefer canonical labels.
2026-02-17 17:21:29 +01:00
Pierre Le Marre 1e5438cfc7 tools: Enable modifiers tweak in interactive-x11
Added `--modifiers-mapping`.
2026-02-14 17:59:54 +01:00
Pierre Le Marre 4c68eeaf47 tools: Enable modifiers tweak in interactive-evdev
Added `--modifiers-mapping`.
2026-02-14 17:59:54 +01:00
Pierre Le Marre 0e758e33d2 tools: Enable modifiers tweak in interactive-wayland
Added `--modifiers-mapping`.
2026-02-14 17:59:54 +01:00
Pierre Le Marre 8d3bec83da state: Enable modifiers tweak
Added `xkb_state_machine_options_mods_set_mapping()` to enable
remapping modifiers combos, e.g. to make `Control+Alt` map to
`LevelThree` (`AltGr`).

This helps improving *compatibility* across platforms.
2026-02-14 17:59:54 +01:00
Pierre Le Marre 6b55556699 state: Refactor shortcuts tweak
Use state change events around key events rather than tweaking
the global state. This makes easier to compose with other tweaks.
2026-02-14 17:59:54 +01:00
Pierre Le Marre 6a90803372 test: Move state-machine tests to dedicated file
This avoids to concentrate all tests in a single file:
- smaller file, easier to navigate
- better test parallelization
2026-02-14 17:59:54 +01:00
Pierre Le Marre b2c1eefb65 doc: Improve FAQ entries for shortcuts 2026-02-14 13:46:46 +01:00
Pierre Le Marre d8f20bef54 doc: Fix typos 2026-02-14 13:46:46 +01:00
Pierre Le Marre 8881ec04a6 test: Fix RedirectKey() handling 2026-02-14 13:46:46 +01:00
Pierre Le Marre c75a54c54d state: Refactor xkb_event_iterator_new()
The iterator is just a container and should not be linked to
a particular state machine, so that it can be reused when a
state machine is destroyed.

Also, add a `flags` parameter to enable to configure the iterator
in the future.
2026-02-14 13:46:46 +01:00
Pierre Le Marre 0382ac976c features: Refactor enum xkb_feature
Reserve ranges so that values may be grouped by topic.
2026-02-14 13:46:46 +01:00
Pierre Le Marre 55f31ef295 state: Fix restrict in public header
`restrict` is not useful in this case and is not a valid C++ keyword,
so remove it.
2026-02-12 05:56:30 +01:00
Pierre Le Marre bdd102b4c2 tools: Enable shortcuts tweaks in interactive-x11
Added --shortcuts-mask and --shortcuts-mapping.
2026-02-09 10:20:14 +01:00
Pierre Le Marre 9a624ddc9d tools: Enable shortcuts tweaks in interactive-evdev
Added --shortcuts-mask and --shortcuts-mapping.
2026-02-09 10:20:14 +01:00
Pierre Le Marre 103e4c8135 tools: Enable shortcuts tweaks in interactive-wayland
Added --shortcuts-mask and --shortcuts-mapping.
2026-02-09 10:20:14 +01:00
Pierre Le Marre e80897665c state: Enable shortcuts tweaks
Currently each toolkit (Gtk, Qt, etc.) implements its strategy to deal
with keyboard shortcuts on non-Latin layouts. There are some edge
cases where this does not work:
- Punctuation is usually not remapped. E.g. the standard Israeli
  layout cannot remap its key <AD01> “slash” to the US layout “q”.
- If one have multiple Latin layouts, shorcuts may be positioned
  differently. E.g. US Qwerty and French Azerty have different
  positions for Ctrl+Q, while the user might want all shortcuts to
  be positioned independently of the layout.

This commit enables tweaking keyboard shortcuts by adding the option
to switch to a different layout when some modifiers are active, typically
`Control`, `Alt` or `Super`. The target layout can be set individually
for each source layout, although the most common use case would probably
be the same target for all layouts.

The tweak consists of computing a *base* layout such that the *effective*
layout is the corresponding target layout.

Added to the keymap compile options API:
- `xkb_state_machine_options_shortcuts_update_mods()`
- `xkb_state_machine_options_shortcuts_set_mapping()`
2026-02-09 10:20:14 +01:00
Rudi Heitbaum 5673e96af5 test: retain const qualifier from pointer
Since glibc-2.43:

For ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr,
strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return pointers
into their input arrays now have definitions as macros that return a
pointer to a const-qualified type when the in put argument is a pointer
to a const-qualified type.

https://lists.gnu.org/archive/html/info-gnu/2026-01/msg00005.html

Resolves the following warnings:
    ../test/utils-text.c: In function 'uncomment':
    ../test/utils-text.c:82:18: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
       82 |     char *next = strstr(start, prefix);
          |                  ^~~~~~
    ../test/utils-text.c:94:14: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
       94 |         next = strchr(start, 0x0a);
          |              ^
    ../test/utils-text.c: In function 'split_lines':
    ../test/utils-text.c:122:14: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
      122 |         next = strchr(start, 0x0a);
          |              ^

Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
2026-02-09 08:51:56 +01:00
Pierre Le Marre 6c67e3d41d test: Fix excessive padding 2026-02-07 13:33:10 +01:00
Pierre Le Marre cbc5d721cf doc: Fix @ref in xkb_feature 2026-02-07 13:33:10 +01:00
Pierre Le Marre 598c86b202 doc: RedirectKey() 2026-02-07 13:33:10 +01:00
Pierre Le Marre 7ea72b4268 state: Add support for RedirectKey()
`RedirectKey()` supports requires to use the state event API.
2026-02-07 13:33:10 +01:00
Pierre Le Marre a3baadbc5d x11: Add support for RedirectKey 2026-02-07 13:33:10 +01:00
Pierre Le Marre b134e83702 xkbcomp: Add support for RedirectKey serializing 2026-02-07 13:33:10 +01:00
Pierre Le Marre 942841965c xkbcomp: Add support for RedirectKey parsing 2026-02-07 13:33:10 +01:00
Pierre Le Marre 1884a1a989 Add support for First and Last group indices and masks
`First` is always equal to 1 and `Last` depends on the layouts count.

It enables to define e.g. a proper interpretation entry of the keysym
`ISO_Last_Group`:

```c
interpret ISO_Last_Group {
    action= LockGroup(group=Last);
};
```

Note that contrary to `First`, `Last` cannot be used as an *array*
index, except in the corner case when using the RMLVO API with only
*one* group – with more groups the index gets rejected because multiple
groups per key are disallowed in xkb_symbols sections.

E.g. `symbols[Last]` is discarded (RMLVO API) or raises an error (buffer
API) in most cases. Indeed, only the RMLVO API enables to know the
number of groups *before* parsing *all* the symbols, so enabling this
feature for other APIs would require parsing the symbols twice, which is
overkill.

These constants are parsed but never used for serialization, in order to
maintain compatibility with xkbcomp and older libxkbcommon versions.
2026-02-07 12:18:06 +01:00
Pierre Le Marre b846b3ded5 xkbcomp: Refactor to enable access to the keymap in actions parsers
Keymap access in actions parsers enables:
- upcoming `RedirectKey()` implementation
- `Last` group index implementation

Instead of just passing the keymap, we use a keymap *augmented* with
compilation-specific data, which is intended to be extended in further
commits.
2026-02-07 12:18:06 +01:00
Pierre Le Marre e213e2e52d tools: Added xkbcli info
Added new tool `xkbcli info` to print information about libxkbcommon
configuration, for debugging purposes.

The output is in YAML 1.2 format.
2026-02-07 12:17:11 +01:00
Pierre Le Marre f8101e52b0 ci: Check enums
Ensure we do not miss new enums/values.
2026-02-05 16:33:22 +01:00
Pierre Le Marre b86157a022 Add xkb_has_feature()
- `xkb_has_feature()`: test feature availability. This is useful when
  the library is dynamically linked.
- `enum xkb_feature`: enumerate all the testable feature. Only
  enumerations are implemented for now.
- `xkbcommon-features.h`: new public header.
2026-02-05 16:33:22 +01:00
Pierre Le Marre 144465c873 state: Reject invalid xkb_state_match flags 2026-02-05 16:33:22 +01:00
Pierre Le Marre 94b40fc1b3 state: Minor refactor 2026-02-04 13:35:41 +01:00
Pierre Le Marre c0a02d85d0 state: Fix derived state components update in filter
Fixed `xkb_filter_ctrls_func()` which wrongly updated derived state
components via calling `clear_all_latches_and_locks()`.
2026-02-04 13:35:41 +01:00
Pierre Le Marre b49a98cbbb doc: Fix interactive tools help 2026-02-04 13:35:41 +01:00
Pierre Le Marre 809b8efbc8 doc: Improve xkb_mod_mask_t description
While `xkb_mod_mask_t` is used for both real and virtual modifiers
throughout the code base, the modifiers *encoding* is considered opaque.

Thus the public API only uses `xkb_mod_mask_t` as a mask of *real* modifiers,
i.e. a mask of modifier *encodings*.

Fixed the documentation of `xkb_mod_mask_t` to clarify this point.
2026-02-04 13:35:41 +01:00
Pierre Le Marre 7769eaf02b test: Fix Python formatting 2026-02-04 09:47:49 +01:00
Pierre Le Marre e5229cadcd Update pre-commit hooks 2026-02-04 09:47:49 +01:00
Pierre Le Marre f16c083bd8 keymap: Rename long key/alias names in keymap format v1
Rename keys and aliases with names longer than 4 characters when
serializing using `XKB_KEYMAP_FORMAT_TEXT_V1`, to ensure compatibility
with the X11 ecosystem.

The new name is one of the following 2 forms:
- If key name and keycode ≤ 0xfff: prefix character + hexadecimal keycode
- If alias or keycode > 0xfff: prefix character + hexadecimal incrementing
  counter.

Prefixes are chosen in the set “!#$%&'()*+,-./0” and avoid any name
conflict.

In the very unlikely case that renaming fails due to unavailable prefixes,
the original name is kept so that Wayland clients can still parse the
keymap.
2026-01-26 12:46:31 +01:00
Pierre Le Marre 37d9cb697d Fix fprintf format issues 2026-01-22 17:28:45 +01:00
Pierre Le Marre 15665c3919 Fix message code type 2026-01-22 17:28:45 +01:00
Pierre Le Marre d01ced70a0 tools: Add dummy fallback if termios is not available 2026-01-22 17:28:45 +01:00
Pierre Le Marre 36eb33960e bench: Add fallbacks for CLOCK_PROCESS_CPUTIME_ID 2026-01-22 17:28:45 +01:00
Pierre Le Marre 53e1a3ddd8 test: Remove unused headers 2026-01-22 17:28:45 +01:00
Pierre Le Marre a8b6ce733c build: Require meson ≥ 1.4.0
This enables using empty pkg-config variables.
2026-01-20 08:42:54 +01:00
Pierre Le Marre ccb63bf7b5 registry: Reject unsupported flags 2025-12-10 18:30:39 +01:00
Pierre Le Marre 877640cbf1 compose: Reject unsupported state flags 2025-12-10 18:30:39 +01:00
Pierre Le Marre f17047fe07 compose: Reject unsupported compile flags 2025-12-10 18:30:39 +01:00
Pierre Le Marre 46c2655f46 Miscellaneous flag checks refactors 2025-12-10 18:30:39 +01:00
Pierre Le Marre f70366fe8e keymap: Refactor flags check 2025-12-10 18:30:39 +01:00
Pierre Le Marre 3d7db8657a rules: Reject unsupported RMLVO builder flags 2025-12-10 18:30:39 +01:00
Pierre Le Marre e89ea6f531 context: Reject unsupported flags 2025-12-10 18:30:39 +01:00
Pierre Le Marre 78de790696 doc: Fix typo 2025-12-03 17:06:07 +01:00
Pierre Le Marre ae0879fd47 xkbcomp: Fix segfault when copying aliases to keymap 2025-12-03 17:02:18 +01:00
Pierre Le Marre ee666a02f9 ci: Enable on releases/** branches 2025-12-03 17:02:18 +01:00
Ran Benita 36b86d9150 keysym: slightly optimize keysym_name_perfect_hash
Doing a single loop is a bit faster.

This speeds up bench/compose.c by ~4% for me (compose is a heavy user of
`xkb_keysym_from_name`, the benchmark spends about ~40% in its fast
path).

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-12-01 14:46:47 +01:00
Ran Benita 78d4a03943 rules: use SVAL macro to init some svals
A bit shorter and allows to change the field order.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-11-28 15:58:15 +01:00
Ran Benita 9a193a29d8 meson: set _FORTIFY_SOURCE=3 in tests
Enable a few more checks in tests.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-11-28 15:58:15 +01:00
Ran Benita 9d9b726dc1 test: include test-config.h in all tests
For the next commit, but also seems good for consistency.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-11-28 15:58:15 +01:00
Ran Benita b3a5892955 ci: change buildtype to debugoptimized
- The default is `debug` which is not realistic.
- I find that compilers tend to give more warnings in an optimized
  build.
- In an upcoming commit I'm going to set `_FORTIFY_SOURCE=3` in tests
  which wants optimizations according to glibc docs.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-11-28 15:58:15 +01:00
Ran Benita acdf07c87a tools: check result of realpath
This function can error.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-11-28 15:58:15 +01:00
Pierre Le Marre 99e9b0fc55 tools: Fix some memory issues in interactive tools
- Fix NULL deference
- Fix use-after-free
- Fix dangling pointers
2025-11-19 20:42:03 +01:00
Pierre Le Marre 574dd0de77 state: Fix derived state initialization
Before this commit there was no proper derived state initialization: its
values were simply zeroes. It works in most cases, since only LEDs would
be affected and xkeyboard-config does not ship configurations[^1] that
would activate LEDs in such conditions:
- effective group = 1;
- match some keyboard controls.

Fixed by always calling `xkb_state_update_derived()` at state creation,
in order to properly initialize the derived state.

[^1]: Well, there is only one: the `Mouse Keys` indicator. But it was not
supported by previous version of libxkbcommon.
2025-11-19 10:21:26 +01:00
Pierre Le Marre 7c16237839 state: Add private API xkb_state_machine_get_state
This is intended for testing.
2025-11-19 10:21:26 +01:00
Pierre Le Marre 199cdb793b doc: Fixes for the xkb_state_machine API 2025-11-18 19:47:35 +01:00
Pierre Le Marre 51465b34f6 state: Fix missing events update 2025-11-18 19:47:35 +01:00
Pierre Le Marre b06a7253db state: Remove the xkb_state_options API
The `xkb_state_machine` API has more potential than the `xkb_state` API
for *server* applications.

So remove the `xkb_state_options` API in favor of the corresponding
`xkb_state_machine_options` API, so that we can focus on a single
server-side API.
2025-11-18 19:47:35 +01:00
Pierre Le Marre 317d924d1d tools: Disable state options API
Prepare for the removal of the state options API:
- do not use the API
- make `--controls` requires `--legacy-state-api=false`
- keep the state *machine* options API
2025-11-18 19:47:35 +01:00
Pierre Le Marre e511eab17a tools: Enable optional value to --legacy-state-api in interactive-*
Enable to use `--legacy-state-api` in the following forms:
- `--legacy-state-api=true|false`
- `--legacy-state-api`: equivalent to `--legacy-state-api=true`

It avoids introducing another flag, e.g. `--no-legacy-state-api` or
`--event-state-api`.
2025-11-18 19:47:35 +01:00
Pierre Le Marre 24db270ffe doc: Illustrate how to check if a key is defined or bound
Added documentation to illustrate how to query if a key is defined or
bound using `xkb_keymap_key_get_name()` and `xkb_keymap_num_layouts_for_key()`.

These tricks were not visible because of the missing documentation for
their return types.
2025-11-18 14:02:26 +01:00
Pierre Le Marre 1b19efe2f0 keymap: Add a key iterator API
Added an iterator API over keymaps keys:
- `enum xkb_keymap_key_iterator_flags`
- `xkb_keymap_key_iterator_new()`
- `xkb_keymap_key_iterator_destroy()`
- `xkb_keymap_key_iterator_next()`

It has the following pros over `xkb_keymap_key_for_each()`:
- lazy (i.e. on-demand);
- enable early termination;
- flags to control the iterator’s behavior, e.g. ascending/descending
  order.
2025-11-18 14:02:26 +01:00
Pierre Le Marre e7961fb891 tools: Add support for state event API to interactive-x11
The legacy state API can be used instead with by passing the new flag
--legacy-state-api.
2025-11-17 19:42:04 +01:00
Pierre Le Marre ed45075086 tools: Add support for state event API to interactive-wayland
The legacy state API can be used instead with by passing the new flag
`--legacy-state-api`.
2025-11-17 19:42:04 +01:00
Pierre Le Marre c7739c7c74 tools: Add support for state event API to interactive-evdev
The legacy state API can be used instead with by passing the new flag
`--legacy-state-api`.
2025-11-17 19:42:04 +01:00
Pierre Le Marre 30a842e2eb state: Add state event API
Added the **state event API:**
- `struct xkb_state_machine` (new):
  - `xkb_state_machine_new()`
  - `xkb_state_machine_ref()`
  - `xkb_state_machine_unref()`
  - `xkb_state_machine_get_keymap()`
  - `xkb_state_machine_update_latched_locked()`
  - `xkb_state_machine_update_controls()`
  - `xkb_state_machine_update_key()`
- `struct xkb_event_iterator` (new):
  - `xkb_event_iterator_new()`
  - `xkb_event_iterator_destroy()`
  - `xkb_event_iterator_next()`
- `struct xkb_event` (new):
  - `xkb_event_get_type()`
  - `xkb_event_get_keycode()`
  - `xkb_event_get_changed_components()`
  - `xkb_event_serialize_controls()`
  - `xkb_event_serialize_mods()`
  - `xkb_event_serialize_layout()`
- `struct xkb_state`:
  - `xkb_state_update_from_event()`
2025-11-17 19:42:04 +01:00
Pierre Le Marre 2239f09e7d state: Rename state accessibility options 2025-11-17 19:42:04 +01:00
Pierre Le Marre f5c51fc198 state: Refactor to prepare for state event API
Move some definitions so that the next commit has a nicer diff.
2025-11-17 19:42:04 +01:00
Pierre Le Marre 6de7eb462d tools: Refactor keymap update in interactive-x11 2025-11-17 13:54:44 +01:00
Pierre Le Marre 42c4490cc9 doc: Doxygen fixes + miscellaneous improvements 2025-11-12 08:32:41 +01:00
Pierre Le Marre 2384117f79 tools: Fix uninitialized variables in interactive-* 2025-11-12 08:32:41 +01:00
Pierre Le Marre c0fcc553fb tools: Add --no-state-report to all interactive tools 2025-11-12 08:32:41 +01:00
Pierre Le Marre 864fdf8b1d ci: Bump macOS runner image 2025-11-12 08:30:53 +01:00
Pierre Le Marre a368b8a1bb state: Fix xkb_state_serialize_controls() type
Let’s make clear that the state is not modified by this function.
Unfortunately it is too late to change the other serialization
functions.
2025-11-11 15:45:45 +01:00
Pierre Le Marre 30bb491225 doc: Improve controls actions + misc 2025-11-11 15:45:45 +01:00
Pierre Le Marre e7e9863207 tools: Add --controls values to interactive tools
This enables to configure keyboard controls. The argument value is a
comma-separated list of the following optional values:
- `sticky-keys`
- `latch-to-lock`
- `latch-simultaneous`

Each entry can be preceded by +/- to respectively enable or disable the
corresponding option, e.g. `--controls=+sticky-keys,-latch-to-lock`. It
ensures that defaults can be explicitly overridden.
2025-11-09 08:45:05 +01:00
Pierre Le Marre cfc1ac6da1 tests: Controls updates & sticky keys behavior 2025-11-09 08:45:05 +01:00
Pierre Le Marre 4a79b0f6eb state: Add A11Y flag LATCH_SIMULTANEOUS_KEYS
It enables to configure the behavior of latches when operated with
simultaneous keys, rather than rely only on the keymap format.
2025-11-09 08:45:05 +01:00
Pierre Le Marre c0dc2f1f45 state: Implement StickyKeys
- Added `XKB_STATE_A11Y_FLAG_LATCH_TO_LOCK` member to the
  `xkb_state_accessibility_flags` enum
- Added `XKB_KEYBOARD_CONTROL_A11Y_STICKY_KEYS` member to the
  `xkb_keyboard_controls` enum
- Added support in X11 API
2025-11-09 08:45:05 +01:00
Pierre Le Marre 50507d5ece tools: Add --controls to interactive-x11 2025-11-09 06:35:30 +01:00
Pierre Le Marre 7c9cdc5c6c tools: Add --controls to interactive-wayland 2025-11-09 06:35:30 +01:00
Pierre Le Marre 48ef91b3c4 tools: Add --controls to interactive-evdev
This enables to configure keyboard controls. The argument value is a
comma-separated list of an optional list of controls.

Each entry can be preceeded by +/- to respectively enable or disable the
corresponding option, e.g. `--controls=+xxx,-yyy`. It ensures that
defaults can be explicitly overriden.

This is a preparatory work: no option is currently implemented.
2025-11-09 06:35:30 +01:00
Pierre Le Marre 7b3939f708 tools: Print controls changes 2025-11-09 06:35:30 +01:00
Pierre Le Marre 41209bdce5 state: Rename private Controls 2025-11-09 06:35:30 +01:00
Pierre Le Marre a31585f9d4 state: Implement LockControls() 2025-11-09 06:35:30 +01:00
Pierre Le Marre 377f10c589 state: Implement SetControls() 2025-11-09 06:35:30 +01:00
Pierre Le Marre cd5c52be1f state: Add support for global keyboard controls
Added API to change global controls of the keyboard state:
- new enumeration `xkb_keyboard_controls`; we do not expose the
  existing `xkb_action_controls` because it features controls whose
  effects we do not (and probably will not) support
- new function `xkb_state_update_controls()`
- new function `xkb_state_serialize_controls()`
- new members `XKB_STATE_CONTROLS` in the `xkb_state_component`
  enumeration.
2025-11-09 06:35:30 +01:00
Pierre Le Marre b01024832c state: Add state accessibility flags
Introduce the following public API to enable state configuration:
- `enum xkb_state_accessibility_flags`
- `xkb_state_options_update_a11y_flags()`

This only adds the initial API but does not bring any option yet.

This API is intended for *server* applications only.
2025-11-09 06:35:30 +01:00
Pierre Le Marre 1fb2a8f823 state: Add options API
Introduce the following public API to enable state configuration:
- `struct xkb_state_options`
- `xkb_state_options_new()`
- `xkb_state_options_destroy()`
- `xkb_state_new2()`

This only adds the initial API but does not bring any option yet.

This API is intended for *server* applications only.
2025-11-08 08:26:27 +01:00
Pierre Le Marre 3049d31069 Bump version to 1.13.0 2025-11-05 10:40:57 +01:00
Pierre Le Marre 02d9646689 test: Fix for setups with XKB extension directories 2025-11-05 09:13:28 +01:00
Pierre Le Marre cb8ecea787 rules: Do not print error for missing .pre and .post rules files
These files are optional!
2025-11-05 09:13:28 +01:00
Pierre Le Marre a6c55838c9 build: Expose default XKB directories through pkg-config 2025-11-04 11:08:33 +01:00
Pierre Le Marre c8fcf8b7a0 registry: Add support for XKB extensions directories 2025-11-04 11:08:33 +01:00
Pierre Le Marre 081f757174 context: Add support for XKB extensions directories
libxkbcommon introduced flexibility by enabling multiple XKB lookup
paths. However, there is no easy way to distribute packages that provide
XKB data: such packages usually resort to modify the root XKB directory,
which is very fragile.

This can be solved by adopting the `.d` directory approach used in e.g.
`/etc`.

Added another XKB path lookup mechanism: the XKB extensions directories.
There are 2 root extensions directories, both optional:
- `XKB_CONFIG_UNVERSIONED_EXTENSIONS_PATH`, defaulting to
  `<xkeyboard-config-root>` - version suffix + `.d`, e.g.
  `/usr/share/xkeyboard-config.d`. It is intended as the default
  extensions path.
- `XKB_CONFIG_VERSIONED_EXTENSIONS_PATH`, defaulting to
  `<xkeyboard-config-root>` + `.d`, e.g. `/usr/share/xkeyboard-config-2.d`.
  It is intended for backward compatibility.

`XKB_CONFIG_VERSIONED_EXTENSIONS_PATH` has higher priority than
`XKB_CONFIG_UNVERSIONED_EXTENSIONS_PATH`.

When appending the default include paths, after the extra path but before
the canonical XKB root, for each directory above: its subdirectories are
appended in lexicographic order to the include paths; unversioned
subdirectories are appended only if there is no corresponding versioned
subdirectory.

Example: given the following setup:
- `XKEYBOARD_CONFIG_ROOT` = `/usr/share/xkeyboard-config-2`
- `/usr/share/xkeyboard-config-2.d` tree:
  - `p1` (installed by package p1)
    - `rules/evdev.xml`
    - `symbols/a`
  - `p2` (installed by package p2)
    - `rules/evdev.xml`
    - `symbols/b`
- `/usr/share/xkeyboard-config.d` tree:
  - `p1` (installed by package p1)
    - `rules/evdev.xml`
    - `symbols/a`
  - `p3` (installed by package p3)
    - `rules/evdev.xml`
    - `symbols/c`

then the include path list may be:
1. `~/.config/xkb`
2. `~/.xkb`
3. `/etc/xkb`
4. `/usr/share/xkeyboard-config-2.d/p1`
5. `/usr/share/xkeyboard-config-2.d/p2`
6. `/usr/share/xkeyboard-config.d/p3`
7. `/usr/share/xkeyboard-config`

In this example:
- Package p1 distributes a layout with specific compatibility files for
  xkeyboard-config v2 and fallback files for v3+. In this case the
  versioned files have priority, so the unversioned
  `/usr/share/xkeyboard-config.d/p1` path is not included.
- Package p2 distributes only a layout specific to xkeyboard-config v2.
- Package p3 distribute a layout for any xkeyboard-config version.
2025-11-04 11:08:33 +01:00
Pierre Le Marre e9573310fe rules: Add new lookup mechanism: pre & post
Before this commit, the only way to extend rules was to override the
default rules files by creating a file with the same name in an include
directory with a higher priority than the default rules file. However,
this prevented to *compose* any rules extension by other mean than
explicit includes/inlining all rules in the higher priority rules files.

This commit introduces a new lookup mechanism that enables to extend
rules without altering the main rules file and facilitate *rules
composition*. The main motivation is to support composing custom rules
with the upcoming XKB *extensions mechanism*. This is done by enabling
*partial* rules files `<rules>.pre` and `<rules>.post`.

The previous lookup mechanism:
1. Find the rules file `<rules>`
2. Fail if not found
3. Otherwise resolves the rules
4. Fail if any required component is missing
5. Otherwise return the resolved KcCGST names

is replaced with:
1. Find the main rules file `<rules>`
2. Fail if not found
3. For each include directory:
   1. Try to find the *partial* rules file `<rules>.pre` in the directory
   2. If none is found, continue to the next directory
   3. Otherwise resolve the rules from `<rules>.pre` by appending the
      resolved components to the previous result

   This may combine *multiple* `<rules>.pre` files.
4. resolve the rules from `<rules>` by appending to the previous result;
5. same as step 3, but with the rules file `<rules>.post`.

Thus the final rule set is equivalent to:

    ! include <include path 1>/rules/<rules>.pre  // only if defined
    …
    ! include <include path n>/rules/<rules>.pre  // only if defined
    ! include <rules>                             // main rules file
    ! include <include path 1>/rules/<rules>.post // only if defined
    …
    ! include <include path n>/rules/<rules>.post // only if defined

Example: given the following tree:
- `~/.config/xkb/rules`
  - `evdev.post`
- `/etc/xkb/rules`
  - `evdev.pre`
  - `evdev.post`
- `/usr/share/xkeyboard-config-2/rules`
  - `evdev`

the new mechanism is equivalent to parsing the following rules file:

    // .pre rules
    include %E/evdev.pre // only .pre file

    // main rules
    include %S/evdev

    // .post rules
    include %H/.config/xkb/evdev.post // higher priority than /etc/xkb
    include %E/evdev.post
2025-11-04 09:40:01 +01:00
Pierre Le Marre 3f65403fcf doc: Add migration instructions for multiple groups per key 2025-11-04 05:27:55 +01:00
Pierre Le Marre 46c4357c4b doc: Improve FAQ 2025-11-04 05:27:55 +01:00
Pierre Le Marre 244f3a81c7 keysyms: Update using latest xorgproto
xorgproto commit: f973f7db89571f61e96cb0a55f416d3e67a75663
Relevant MR: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/102
2025-11-03 06:51:27 +01:00
Pierre Le Marre 52fe6980b6 how-to-type: Fixed Compose lookup with non-canonical keysym
This fixes the lookup of the following entry from the standard `en_US`
Compose file:

    <Multi_key> <minus> <minus> <minus>	: "—"	U2014 # EM DASH

Before this commit the sequence was found with `U2014` but not with
“—” nor `emdash`.

Fixed by looking at the entry’s UTF-8 string as well.
2025-10-31 15:11:11 +01:00
Pierre Le Marre 924b3cb0a4 context: Add default include paths only if necessary
Default includes paths are delayed and added only if necessary.

It is more efficient for most clients, which only get the keymap from
the server: it avoids unnecessary allocations and file system queries.

It also avoid the corner case where a containerized app lack access to
the XKB directories.

There might be an issue in case the environment variables relevant to
the include paths change between the context initialization and the
call to `xkb_context_include_path_append_default()`. However this seems
very unlikely and would have already triggered issues when the `%`-
expansion is used.
2025-10-29 16:32:02 +01:00
Pierre Le Marre 01bdcc82e5 context: Improve error message for failed default include paths 2025-10-29 16:32:02 +01:00
Pierre Le Marre f4f732790c Bump version to 1.12.3 2025-10-29 07:49:13 +01:00
Rosen Penev 464f9d8fee tools: fix redefinition warning
MINGW headers define this.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2025-10-29 05:52:51 +01:00
Ronan Pigott 9784fa3102 xkbcli-interactive-wayland: adjust the resource destroy order
Let's make sure we destroy our wayland resource objects in a nice order to avoid
any errors at shutdown time. Fixes errors like:

$ xkbcli interactive-wayland
[...]
[destroyed object]: error 6: surface was destroyed before its role object
2025-10-28 07:50:59 +01:00
Ronan Pigott ddbbdd362b xkbcli: fix keymap-dump on wayland
Previously we would try to commit an incomplete xdg_surface. This is illegal in
xdg_shell and results in a "not constructed" xdg_wm_base error. Shift the
ifdef's around a bit so that only the actually relevant code for the keymap-dump
utility is compiled.
2025-10-28 07:50:59 +01:00
Rosen Penev 5ce931ca11 utils: limit ssize_t definition to MSVC
MINGW defines this.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2025-10-28 07:31:02 +01:00
Pierre Le Marre 99e39b6759 keymap: Fix Windows-only assertion 2025-10-28 07:30:35 +01:00
Rosen Penev ceb7dc228b github CI: windows: test with clang-cl too
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2025-10-28 06:51:18 +01:00
Rosen Penev 318beed787 github CI: windows: use choco for winflexbison3
Simpler to let choco handle this instead of hardcoding everything.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2025-10-28 06:51:18 +01:00
Pierre Le Marre 45a118d532 x11: Ensure LED and modifier counts are valid 2025-10-23 08:39:38 +02:00
Pierre Le Marre 54d188c736 build: Restrict Compose fallback test in cross-compiling
Do not perform the test if the build machine cannot run host binaries.
Instead fallback to detect if the `newlocale` lib is *known* to fail on
missing locales, as we expect.
2025-10-23 08:39:20 +02:00
Pierre Le Marre bdf069f960 Bump version to 1.12.2 2025-10-20 19:00:04 +02:00
Pierre Le Marre 8b30b24b2c doc: Minor syntax fixes 2025-10-20 19:00:04 +02:00
Pierre Le Marre 227995625d compose: No fallback if no missing locale detection
Do not use `newlocale()` if it accepts missing locales. It happens with
muslc, while glibc works as expected.

It fixes the incorrect behavior of the fallback introduced in
135b3204a1.
2025-10-20 17:14:23 +02:00
Pierre Le Marre f6429933b7 context: Add legacy X11 include path for misconfigured setups
Some setups use the assumption that the canonical XKB root is always
the legacy X11 one, but this is no longer true since xkeyboard-config
2.45, where the X11 path is now a mere symlink to a dedicated data
directory for xkeyboard-config.

Fixed by using a fallback to the legacy X11 path for misconfigured
setups where the canonical XKB root is not available.

This fallback can still be skipped if the environment variable
`XKB_CONFIG_ROOT` is deliberately set to an empty string.
2025-10-20 17:13:12 +02:00
Pierre Le Marre c11c19faff context: Comment handling of empty include paths 2025-10-20 13:58:31 +02:00
Pierre Le Marre 6d64fc5b20 context: Raise the log level of include path addition to info
This information is quite important to investigate bugs and should not
require the bloat of the debug log level.

Also report include paths additions attempts in registry.
2025-10-20 13:58:31 +02:00
Pierre Le Marre d2d40ec858 context: Minor refactor 2025-10-20 13:58:31 +02:00
Pierre Le Marre 9dd5543657 context: Fix NULL include path
- Fix an unlikely addition of a NULL include path in case of
  a failed allocation.
- Fix displaying this NULL value.
2025-10-20 13:58:31 +02:00
Pierre Le Marre 3c0eb068fc Bump version to 1.12.1 2025-10-17 16:47:02 +02:00
Pierre Le Marre 33dc98443d doc: Advise XKB_CONTEXT_NO_DEFAULT_INCLUDES for clients 2025-10-17 16:47:02 +02:00
Pierre Le Marre 3666f2e0e0 xkbcli-list: Minor improvements 2025-10-17 16:47:02 +02:00
Pierre Le Marre 6822fa0ef7 x11: Fix parsing key types level names
Fixed handling missing or incomplete key types level names.
2025-10-17 14:41:28 +02:00
Pierre Le Marre 939bf0e1c4 xkbcomp: Never drop X11 canonical key types
There are 4 mandatory *canonical key types* in the XKB protocol:
- `ONE_LEVEL`
- `TWO_LEVEL`
- `ALPHABETIC`
- `KEYPAD`

They are always present in the keymap generated from xkeyboard-config.
But since 31900860c6 we drop unused key
types by default, which may happen for the types hereinabove with e.g.
4+ level layouts like `es`.

In theory these types are automatically filled by libX11 if missing,
but there are some bugs in the X11 ecosystem that prevents the keymap
to be properly uploaded in the X server, leading to errors when
retrieving it with libxkbcommon-x11. See:
https://gitlab.archlinux.org/archlinux/packaging/packages/libxkbcommon/-/issues/3

The following fixes were filed to fix the issues:

- https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/292
- https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2082
- https://github.com/xkbcommon/libxkbcommon/pull/871

However it’s not clear when new versions of libX11 and xserver will be
released. So this commit is a hack to ensure that we do not drop the
XKB canonical key types, as an effort to reduce breakage.

WARNING: contrary to `xkbcomp`, we do not supply these types if they
are missing, because a keymap that uses them (explicitly `type="…"` or
implicitly with automatic types) without providing them is considered
buggy. The only exception is if no key type is provided, a default one-
level type `ONE_LEVEL` is provided and assigned to all keys.
2025-10-17 14:39:31 +02:00
Pierre Le Marre fcc95275dd xkbcomp: Rename fallback key type to ONE_LEVEL
This is the name of this canonical key type in the XKB protocol.
2025-10-17 14:39:31 +02:00
Jan Alexander Steffens (heftig) d1a1a17a14 interactive-wayland: Prevent buffer use after free
The tool would crash on the second call to `buffer_create` calling
`wl_buffer_destroy` on a dangling `inter->buf`.

Fixes: e13faebb2a
2025-10-11 19:44:33 +02:00
Pierre Le Marre f4e247e50d Bump version to 1.12.0 2025-10-10 10:12:13 +02:00
Pierre Le Marre 837dbb46ee Fix C11 syntax
Label followed by declaration requires C23.
2025-10-09 18:19:37 +02:00
Pierre Le Marre 6876e99da3 keymap: Fixed action comparison
Before this commit there were 2 issues in action comparison:
- Private actions comparison wrongly compared pointers;
- Custom action types were mistakenly interpreted as errors and thus
  always failed comparison.

Also added assertions on the action type enum so that the relevant code
must be updated when the enum changes.
2025-10-09 16:58:13 +02:00
Pierre Le Marre b9b244e20b keymap: Add function to compare keymaps
- Added private API `xkb_keymap_compare()`
- Added corresponding tests
2025-10-09 16:58:13 +02:00
Pierre Le Marre d1cd0d5f4b test: Fix tools options parsing
a83a482c71 introduced the new tools
`xkbcli-{interactive,dump-keymap}`, along with their corresponding tests.

However, these tools cannot be tested because they hardcode the paths of
the `xkbcli-{interactive,dump-keymap}-{wayland,x11}` tools they call to
the *install* directory, while we need to use those of the *build*
directory.

It seems that it got unnoticed thanks to:
- the special settings in the CI: unset `*DISPLAY` environment variables;
- a local installation of the development version in the developer’
  setup.
2025-10-08 21:25:29 +02:00
Pierre Le Marre 584e0690c2 keysyms: Update using latest xorgproto
xorgproto commit: 81931cc0fd4761b42603f7da7d4f50fc282cecc6
Relevant MR: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/103
2025-10-08 14:24:24 +02:00
Pierre Le Marre d0e6214c8b build: Enable using default XKB root from recent xkeyboard-config
The *default* XKB root directory is now set from the *most recent*
xkeyboard-config installed package, in case [multiple versions] are
installed in parallel. It also try to use the package-specific XKB root
(if available) rather than the X11 root, respectively defined by the
pkg-config variables `xkb_root` (xkeyboard-config ≥ 2.45) and `xkb_base`.

If no such package is found, it fallbacks to the historical X11
directory, as previously.

[multiple versions]: https://xkeyboard-config.freedesktop.org/doc/versioning/
2025-10-08 10:15:24 +02:00
Pat Brisbin 5e3011cebe Fix invalid macro in xkbcli-how-to-type.1
`.Be` is not a valid macro. I believe the intent was to end the list
opened with `.Bl`. The macro for that is `.El`, as used elsewhere.

https://mandoc.bsd.lv/man/mdoc.7.html#Displays_and_lists
2025-10-06 14:51:45 +02:00
Pierre Le Marre 7c9f8668e9 tools: Add option drop unused bits 2025-10-01 13:56:50 +02:00
Pierre Le Marre 31900860c6 keymap: Make serialization of unused items optional
When compiling a keymap from text, some items may be unnecessary in the
final keymap, i.e. they do not affect the keymap behavior:
- unused key types;
- unused keysym interpretations.

Deactivate the serialization of these items *by default* and add a new
flag to enable it for debugging.
2025-10-01 13:56:50 +02:00
Pierre Le Marre 6e45c83c11 tools: Add option to disable pretty-printing 2025-09-26 12:52:52 +02:00
Pierre Le Marre e3ef7a4751 keymap: Warn for numeric keysyms only at high verbosity
Now that the default serialization uses the numeric format for keysyms,
the warning should be enabled only at maximum verbosity.
2025-09-26 12:52:52 +02:00
Pierre Le Marre 345f0c6755 keymap: Make pretty-printing optional
This greatly improves the keymap serialization: 1.22× speedup and
about 5% less allocations. The resulting keymap is also a bit faster
to parse.

Another improvement is that it eases keysym names migrations (removal
and additions) by using only keysym numeric values. This requires some
care, i.e. `NoSymbol` must be serialized with its name and not its
value 0x0, because xkbcomp and libxkbcommon < 1.12 would interpret the
numeric value as `XKB_KEY_0`.
2025-09-26 12:52:52 +02:00
Pierre Le Marre 9131711a31 keymap: Add xkb_keymap_get_as_string2()
Enable to configure the keymap serialization.
2025-09-26 12:52:52 +02:00
Pierre Le Marre 1bbd317f81 test: Improve Xorg xkbcomp handling
- More robust call to xkbcomp.
- Enable to test roundtrip with user-provided keymap.
2025-09-25 15:56:38 +02:00
Pierre Le Marre 181bc9eca7 xkbcomp: Fix numeric keysym parsing
Keysyms written as single decimal digits are interpreted in the range
`XKB_KEY_0`..`XKB_KEY_9`, consistent with the general interpretation
`<name>` -> `XKB_KEY_<name>`, e.g.:

- `1` → `XKB_KEY_1`
- `a` → `XKB_KEY_a`

However, before this commit integers in the range 0..9 in *any format*
were treated as digit keysyms, which is wrong if the number is written
with 2+ characters. E.g. the following were wrongly treated as the
keysym digit `XKB_KEY_1`: `01`, `0x1`.

Fixed by introducing a new token type to handle this corner case.

This is a preparatory work to enable serializing keysyms as numbers.
2025-09-24 20:21:10 +02:00
Pierre Le Marre b09aa7c6d8 xkbcomp: Drop the key name LUT after compilation
Since it is not usual to lookup for keys by their names, we can drop it
to save allocations (about 2KiB on usual keymaps).

We use an union of the LUT with the aliases array and try to reuse the
memory allocated by the LUT. We only do so if the space is trivially
available: either before the first alias entry or after the last entry,
which is possible in practice, so that we get the best performance. Else
we allocate a new array.
2025-09-24 13:33:36 +02:00
Pierre Le Marre 4421a358f9 xkbcomp: Use keycode name LUT for xkb_symbols
Replace linear search with O(1).

On my setup I get 1.05x speedup compared to previous commit and
1.09x speedup compared to 44fad8a067
(no keycode name LUT).
2025-09-24 13:33:36 +02:00
Pierre Le Marre 7974155420 xkbcomp: Enable aliases to override keys
Contrary to Xorg’s xkbcomp, keys and aliases share the same
namespace. So we need to resolve name conflicts as they arise,
while xkbcomp will resolve them just before copying aliases into
the keymap.

The following example:

    xkb_keycodes {
        <A> = 8;
        <B> = 9;
        alias <B> = <A>;
    };

will resolve in libxkbcommon to:

    xkb_keycodes {
        <A> = 8;
        alias <B> = <A>;
    };

while in Xorg’s xkbcomp:

    xkb_keycodes {
        <A> = 8;
        <B> = 9;
    };

The former does result in the intended mapping.

In practice, there is no such conflict in xkeyboard-config.

Another corner case is that now an alias can override a key even if
proved invalid aftwerwards, e.g.:

    xkb_keycodes {
        <A> = 1;
        <B> = 2;
        alias <B> = <C>; /* Override key, even if invalid entry */
    };

results in:

    xkb_keycodes {
        <A> = 1;
    };

This should be considered a bug in either the keycodes or rules files,
not libxkbcommon.
2025-09-24 13:33:36 +02:00
Pierre Le Marre b833d193e6 xkbcomp: Use keycode name LUT for xkb_keycodes
Replace linear search of keycode names with O(1).

Given that:

- the number of atoms is usually < 1k;
- the keycode section usually appears first;

then the first atoms will be mostly the keycodes and their aliases,
so we can achieve O(1) lookup of the key names by using a simple
atom → keycode array.

The LUT will be used also to process `xkb_symbols` for further speedup.

On my setup I get a 1.039x speedup at the costs of less than 1%
additional allocations.
2025-09-24 13:33:36 +02:00
Pierre Le Marre 1eb34399d5 xkbcomp: Enable using the whole keycode range
In 502e9e5bff we restricted the supported
keycode range in order to avoid memory exhaustion and inefficient storage
in sparse arrays. This solution enabled keycodes up to 0xfff, which
seemed good enough at the time.

However there are huge keycodes in use in the wild, e.g. in WebOS.
So let’s enable the whole keycode range by using 2 methods of storage:
- “Low” keycodes (≤ 0xfff): stored contiguously as before at indexes
  [0..num_keys_low); fast O(1) access.
- “High” keycodes (> 0xfff): stored noncontiguously at indexes
  [num_keys_low..num_keys); slow access via binary search.
2025-09-24 13:33:36 +02:00
Pierre Le Marre f1376a2a3e context: Fix xkb_atom_t definition
`xkb_atom_t` is in fact an index in a `darray`, so ensure the types
match. This is unlikely to have any impact on modern systems.
2025-09-24 13:33:36 +02:00
Pierre Le Marre 3203a010ab tools: Add internal introspection
This tool enables simple analysis of XKB files with a YAML or DOT output:
- resolve XKB paths;
- list sections of a file;
- list the includes of each section;
- optionally process each include recursively.

Additionally, the RDF Turtle output enables to query using the powerful
SPARQL language.

The tool is for internal use only for now, so that we can test it in
various use cases before deciding if making it public.
2025-09-18 09:58:55 +02:00
Pierre Le Marre 4d396f6d34 tools: Added KcCGST output in YAML 2025-09-18 09:58:55 +02:00
Pierre Le Marre 38a2081f7c utils: Add strcpy_safe
This is a safe version of strcpy.
2025-09-18 09:58:55 +02:00
Pierre Le Marre 0a874a3a9c include: Enable to return the resolved path 2025-09-18 09:58:55 +02:00
dependabot[bot] 74dcc84a0e build(deps): bump actions/upload-pages-artifact from 3 to 4
Bumps [actions/upload-pages-artifact](https://github.com/actions/upload-pages-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-pages-artifact/releases)
- [Commits](https://github.com/actions/upload-pages-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-pages-artifact
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-16 05:04:33 +00:00
dependabot[bot] c2b2b70200 build(deps): bump actions/checkout from 4 to 5
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-16 05:03:22 +00:00
Pierre Le Marre 44fad8a067 keysyms: Update to Unicode 17.0
See: https://www.unicode.org/versions/Unicode17.0.0/
2025-09-14 13:09:48 +02:00
Pierre Le Marre de06f29feb keysyms: Enable to use UCD files instead of ICU
This enables to use a local Unicode Character Database instead of ICU via
Python.

Useful when ICU is not available or when it does not support the latest
Unicode version.

Data are available at: https://www.unicode.org/Public/<UNICODE_VERSION>/ucd
2025-09-14 13:09:48 +02:00
Pierre Le Marre 8a5a33937d keysyms: Minor header fixes 2025-09-14 13:09:48 +02:00
Pierre Le Marre cb53e79e9f keysyms: Update keysym data 2025-09-14 13:09:48 +02:00
Pierre Le Marre 48ba7aef6b doc: Fix figure markup 2025-09-02 12:20:03 +02:00
Pierre Le Marre 39481fec98 doc: Improve include paths 2025-09-02 12:20:03 +02:00
Pierre Le Marre 4b6fc7d895 doc: Improve User-configuration 2025-09-02 12:20:03 +02:00
Pierre Le Marre 934d4fd8ff logging: Improve tools & benches 2025-08-21 20:11:21 +02:00
Pierre Le Marre 870427760f logging: Encode verbosity values in an enum
This enables to provide semantics and to ensure we use the values
uniformly in the code base.

While one could expect that verbosity `0` silences the logging, it
is actually our default verbosity level for a long time. So this
commit does not change that in order to avoid possible breakage.

Silencing the logging is achieved by using a negative value for the
verbosity level.
2025-08-21 20:11:21 +02:00
Pierre Le Marre 135b3204a1 compose: Add fallback for custom locales
Before this commit, loading a Compose file based on the locale would fail
if the locale is not in the X11 Compose locale registry. While there are
workarounds (e.g. `~/.XCompose` file or `$XCOMPOSEFILE`), it does not
work if the corresponding file has `include "%L"`.

This commit adds the fallback `en_US.UTF-8` in case the locale is
installed but not registered in the X11 Compose locale registry. The
choice is motivated by the fact that most locales use `en_US.UTF-8`
anyway.

Ideally we should have a mechanism to extend the Compose locale registry
at the *system* level. Mechanisms at the user level (e.g. custom Compose
file, environment variable) are deemed sufficient.

We could still improve it by first trying to fallback to the locale
without the country bits, but there is no function to do such function
in the stdlib and we do not want to mess with locales manually.

Unfortunately is not possible to test it in our test suite. One can
still check it works following these instructions:

1. Create a custom locale, e.g. `en_XX.UTF-8`. `glibc-i18ndata` or
   similar package may be required to get the required files in
   `/usr/share/i18n/`.

   `sudo localedef -i en_US -f UTF-8 en_XX.UTF-8`
2. `xkbcli compile-compose --verbose --locale en_XX.UTF-8`
2025-08-17 10:31:10 +02:00
Pierre Le Marre 3449f69fcb doc: Add new message XKB_ERROR_INVALID_COMPOSE_LOCALE 2025-08-17 10:31:10 +02:00
Pierre Le Marre 4bfae8dedf doc: Add example to get the list of keys triggering a modifier
Also add the corresponding test, so that we keep the doc in sync.
2025-08-15 17:41:56 +02:00
Pierre Le Marre 5aef5b6d9a test: Fix invalid YAML output in xkeyboard-config script 2025-08-14 10:20:40 +02:00
Pierre Le Marre 28ea23d25c doc: Update wayland-devel links
The mailing list has been migrated to Mailman 3.
2025-08-10 21:19:20 +02:00
Pierre Le Marre 0f9cefb1fe Bump version to 1.11.0 2025-08-08 19:59:47 +02:00
Pierre Le Marre 9cdf3af020 doc: Miscellaneous enhancements
- Fix minor tag typos
- Add more links to the README
2025-08-08 19:59:47 +02:00
Pierre Le Marre 3ffb7e7398 doc: Add text format sections to release notes 2025-08-08 19:59:47 +02:00
Pierre Le Marre eb8697e2d0 doc: Clarify keymap format use in protocols 2025-08-08 19:59:47 +02:00
Pierre Le Marre 13ae4a2698 tools: Add Compose support to how-to-type
- Enable Compose support by default; disable it with `--disable-compose`
- Some filters are used to avoid combinatorial explosion
2025-08-08 18:52:28 +02:00
Pierre Le Marre b5d969dd78 compose: Move constants to dedicated header 2025-08-08 18:52:28 +02:00
Pierre Le Marre 7394a3c709 tools: Fix how-to-type modifier mask test 2025-08-06 21:15:34 +02:00
Pierre Le Marre 39726caccd Add xkb_keymap_mod_get_mask2()
Retrospectively, `xkb_keymap_mod_get_mask()` should have used a
modifier index rather that a modifier name in its type. Since we
already published a version with this API, it’s too late to change
that, so instead add a new function `xkb_keymap_mod_get_mask2()`.
2025-08-06 21:15:34 +02:00
Pierre Le Marre 055c536275 tools: Do not use a window for dump-keymap-wayland
Previously a window would appear for a very short time, which is
unpleasant and potentially dangerous for people sensitive to flashes.
2025-08-06 14:19:40 +02:00
Pierre Le Marre 6df451246c tools: Add --keymap to xkbcli-how-to-type
It enables to load the keymap from a file or stdin instead of resolving
RMLVO names. Piping is also interesting for using with `dump-keymap-*`
tools.
2025-08-06 12:58:21 +02:00
Pierre Le Marre 09e93fa054 tools: Enable custom keymap with interactive-{x11,wayland}
Added the `--keymap` option to enable providing the keymap to use
instead of the one from the display server. Implies `--local-state`.

Note that the other RMLVO options do not need to be implemented, since
one can simply pipe a keymap from `xkbcli compile-keymap`.

The `--keymap` option is also useful for users that do not have the
input permissions to access evdev API.
2025-08-06 12:58:21 +02:00
Pierre Le Marre 0aa5474147 tools: Add --local-state for interactive-{x11,wayland}
Enable to use a *local* state machine and ignore server updates for
modifiers/groups. Only key press/release and new keymap events are used.
2025-08-06 12:58:21 +02:00
Pierre Le Marre 885f81290d tools: Fix memory leak in interactive-wayland 2025-08-06 12:58:21 +02:00
Pierre Le Marre 9cc19e4e4c tools: Fix missing --verbose doc + misc 2025-08-06 12:58:21 +02:00
Pierre Le Marre 9d4885dfb9 tools: Improve how-to-type keysym parsing
- Fixed incorrect numeric keysym parsing due to `errno` not being
  reset.
- Added parsing keysym as fallback when `--keysym` is omitted.
- Added arguments tests.
- Fixed tools test Python types.
- Updated documentation.
2025-08-04 16:37:45 +02:00
Pierre Le Marre 5f6f44c927 test: Add missing tools arguments checks 2025-08-04 16:37:45 +02:00
Pierre Le Marre 29579ad468 tools: Add --verbose to all tools
Added `--verbose` to:
- `xkbcli interactive-wayland`
- `xkbcli interactive-x11`
- `xkbcli compile-compose`
- `xkbcli how-to-type`
2025-08-04 16:37:45 +02:00
Pierre Le Marre 6fac73f3de log: Fix NULL string
Fixed regression introduced in 05d13d5f41.
2025-08-04 16:37:45 +02:00
Pierre Le Marre 1e0c579077 keysyms: Fix XF86MediaSelectAuxiliary typo 2025-08-04 16:37:45 +02:00
Pierre Le Marre f5d079f591 tools: Improve interactive events output
Improved the output of events for `xkbcli interactive-*` tools:
- Added `--multiline` to enable multiline event output, which provides
  more details and does not have formatting limitations.
- Added `--uniline` to enable uniline event output. While this is the
  current default, future versions may switch to multiline display.
2025-08-04 12:40:16 +02:00
Pierre Le Marre cce63b9034 tools: Print interactive state changes
`xkbcli interactive-*` tools: print detailed state change events.
2025-08-04 12:40:16 +02:00
Pierre Le Marre d8caabf53f tools: Print interactive key release event
`xkbcli interactive-*` tools:
- Print key release events. This is particularly useful when analyzing
  the output sent by another person, in order to know the exact key
  sequence.
2025-08-04 12:40:16 +02:00
Pierre Le Marre e9fd95a5a3 keysyms: Update using latest xorgproto
xorgproto commit: 7fc33fe6d9cf0abc9b62ee976e5cb7ddcd050d1f
Relevant MR: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/93
2025-07-23 10:47:55 +02:00
Pierre Le Marre a83a482c71 tools: Add variants with automatic session type detection
Added:
- `xkbcli-interactive`
- `xkbcli-dump-keymap`
2025-07-22 11:52:46 +02:00
Pierre Le Marre d60b321336 Make the ref counting invariants explicit with assertions 2025-07-16 19:45:44 +02:00
Pierre Le Marre 9381822646 Add xkb_rmlvo_builder_ref() 2025-07-16 19:45:44 +02:00
Pierre Le Marre dc63e5f827 Ensure config.h is always included first
While `config.h` may not be necessary in every file, it ensures
consistency and makes code refactoring safer.
2025-07-11 17:18:44 +02:00
Pierre Le Marre b21a58d0cb Add support for all level indices to LevelN constants
Note that serialization must use numbers instead of names for levels > 8,
to ensure backward compatibility.
2025-07-01 20:43:50 +02:00
Pierre Le Marre e73d1a4d21 Add support for all layout indices to GroupN constants
This commit enables to use the pattern `Group<INDEX>` for any valid
group index `<INDEX>`.

Note that the original code in xkbcomp allows constants up to
`Group8`, but then will fail if the resulting group is > 4.
There does not seem to be any use case for this for such “feature”;
it seems rather to be a relic from times were the 4-groups limit
was not hopelessly fixed in X.

So for consistency in our code base, starting with this commit we now
disallow `Group5`..`Group8` for keymap format v1, since it is limited
to 4 groups.

Also fixed a regression in the serialization of group action, when
the group is relative.
2025-07-01 20:43:50 +02:00
Pierre Le Marre 64b1b9d799 utils: Optimize istreq_prefix 2025-07-01 20:43:50 +02:00
Pierre Le Marre 9600981a2b bench: Add --keymap to compile-keymap
`--keymap` enables using a keymap file rather than resolving RMLVO.
2025-07-01 20:43:50 +02:00
Pierre Le Marre 84914512c0 chore: Rename indexes to indices
Before this commit there was a mix between the two forms.
While “indexes” is correct, “indices” is more usual and also
the historical form used in this project.
2025-07-01 18:53:45 +02:00
Pierre Le Marre 5837380753 keysym: Do not convert UTF-32 to deprecated keysyms
Before this commit, some code points could be converted to deprecated
keysym. This is incorrect, because the relevant keysyms are all
deprecated because their mapping to Unicode is uncertain!

Ensure that `xkb_utf32_to_keysym()` never returns deprecated keysyms,
because there is either another non-deprecated keysym or in last resort
we always have the correct keysym available in the Unicode keysym range.
2025-06-27 19:06:30 +02:00
Pierre Le Marre 05d13d5f41 include: Fix infinite loop
Fixed including an absolute path with no default map triggering an
infinite loop.
2025-06-26 18:51:19 +02:00
Pierre Le Marre 1de49d1676 doc: Fix headers markup
- Fixed a lot of broken internal links.
- Improved the markup of code items.
- Fixed a few typos.
2025-06-25 18:11:03 +02:00
Pierre Le Marre 447b773960 test: Add examples for breaking latches using VoidAction()
Consider the following use cases:
1. If `Caps_Lock` is on the second level of some key, and `Shift` is
   latched, pressing the key locks `Caps` while also breaking the `Shift`
   latch, ensuring that the next character is properly uppercase.
2. On the German E1 layout, `ISO_Level5_Latch` is on the third level
   of `<AC04>`. So if a level 3 latch is used to access it, the level 5
   must break the previous level 3 latch, else both latches would be
   active: the effective level would be 7 instead of the intended 5.

Both uses cases can be implemented using existing features:
- multiple actions per level;
- `VoidAction()`: to break latches.
2025-06-25 12:07:46 +02:00
Pierre Le Marre c4f4ba41c6 state: Fix modifier and group latch
Prior to this commit, the sequences:

- 1. latch A ↓
  2. latch B ↓
  3. latch B ↑
  4. latch A ↑
- 1. latch A ↓
  2. latch B ↓
  3. latch A ↑
  4. latch B ↑

would result in only B being latched, because the XKB protocol specifies
that latches are triggered only if keys are *sequentially* tapped, i.e.
a strict sequence of press and release of each key.

It seems an unnecessary limitation:

- `SlowKeys` and `XkbAX_TwoKeys` are the proper accessibility features
  to control accidental key presses, not latches nor `StickyKeys`.
- Latches are also used outside their original accessibility role.
  A user may activate multiple latch keys simultaneously:
  - same hand: two latch keys being close to each other;
  - different hand: two keys being activated independently.

Changed the latching behavior so that the rules used to break a latch
are the same than those used to prevent it. Depressing and releasing two
latching keys simultaneously will now activate both latches, as expected.

Since this is a breaking change, it is enabled only by the keymap format
`XKB_KEYMAP_FORMAT_TEXT_V2`.
2025-06-25 10:43:58 +02:00
Pierre Le Marre 3d00222e58 keymap: Add option unlockOnPress for LatchMods()
It mirrors the feature of `SetMods()`, so that `StickyKeys` can be
implemented.
2025-06-22 09:37:44 +02:00
Pierre Le Marre d192b3b621 keymap: Add option unlockOnPress for SetMods()
It enables e.g. to deactivate `CapsLock` *on press* rather than on
release, as in other platforms such as Windows.

It fixes a [18-year old issue] inherited from the X11 ecosystem, by
extending the [XKB protocol key actions].

As it is incompatible with X11, this feature is available only using the
keymap text format v2.

[18-year old issue]: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/74
[XKB protocol key actions]: https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Key_Actions
2025-06-22 09:37:44 +02:00
Pierre Le Marre ee87f6ed95 state: Fix broken latch not honoring clearLocks=no
Before this commit, breaking a latch (modifier & group) would always
clear locks, even if `clearLocks=no`.
2025-06-22 08:08:00 +02:00
Pierre Le Marre 94d8e341b8 state: Fix LatchMods mutation to SetMods or LockMods
Previously we use inlined version of the corresponding filter functions
of the `SetMods()` and `LockMods()` actions, but they were incomplete
and did not set some fields (`priv`, `refcnt`) properly. Also, it is
error-prone: it requires discipline to keep it in sync.

E.g. before this commit, converting to `LockMods()` would always try to
unlock `CapsLock` due to the wrong value of the `priv` field.

Fixed by using the corresponding filter functions directly, so that we
always mutate the filter properly, as in `xkb_filter_group_latch_func`.
2025-06-21 13:44:37 +02:00
Peter Hutterer 7a7a3b3867 keymap: Canonically map unmapped virtual modifiers
Traditionally, *virtual* modifiers were merely name aliases for *real*
modifiers (X *core* modifiers), e.g. `NumLock` was usually mapped to
`Mod2` (see `modifier_map` statement). Virtual modifiers that were never
mapped to a real ones had no effect on the keymap state.

xkbcommon already supports the concept of “pure” virtual modifiers, i.e.
virtual modifiers that are *encoded* using the full 32-bit range, not
just the first 8 bits corresponding to the real modifiers.

But until this commit, one had to declare such mapping *explicitly*:
e.g. `virtual_modifiers M = 0x100;`. This has at least two drawbacks:
- Numerical values may look quite arbitrary and are not user-friendly.
  It’s OK in the resulting compiled keymap, but it requires careful sync
  between sections when developing KcCGST files.
- If the modifier is *also* mapped *implicitly* using the traditional
  `vmodmap`/`modifier_map`, then both mappings are OR-combined.

This patch enables to automatically map unmapped virtual modifiers to
their *canonical* mapping, i.e. themselves: their corresponding virtual
and real modifier masks are identical: `1u << mod_index`.

Since this feature is incompatible with X11, this is guarded by requiring
at least keymap text format **v2**.

Note that for now, canonical virtual modifiers cannot be used in an
interpret action’s `AnyOf()`. An interpret action for a canonical virtual
modifier must be `AnyOfOrNone()` to take effect:

    virtual_modifiers APureMod, …;

    interpret a+AnyOfOrNone(all) {
      virtualModifier= APureMod;
      action= SetMods(modifiers=APureMod);
    };

The above adds a virtual modifier `APureMod` for keysym `a`. It will be
canonical iff it is not mapped implicitly.
2025-06-19 21:05:11 +02:00
Pierre Le Marre d351abeef7 test: Use explicit keymap format for test_compile_file() 2025-06-19 21:05:11 +02:00
Pierre Le Marre 56a32cc8ea xkbcli-interactive-wayland: xdg-decoration-unstable-v1
Use if available, to get window decoration.

Also resize the window bigger enough to make its title readable.
2025-06-19 08:55:34 +02:00
Pierre Le Marre e13faebb2a xkbcli-interactive-wayland: Fix memory leak 2025-06-19 08:55:34 +02:00
Pierre Le Marre 69c3d25737 keymap: Add parameter latchOnPress for LatchMods()
Some keyboard layouts use `ISO_Level3_Latch` or `ISO_Level5_Latch` to
define “built-in” dead keys:
- they do not rely on the installation of custom Compose file;
- they do not clash with other layouts.

However, layout projects usually want the exact same behavior on all OS,
but the XKB latch behavior (often misunderstood) also acts as a *set*
modifier, which is not expected.

The usual behavior of a dead key on Linux, macOS and Windows is:
- latch on press;
- deactivate as soon as another (non-modifier) key is pressed.

Added the parameter `latchOnPress` to `LatchMods()` to enable the
aforementioned behavior.

As it is incompatible with X11, this feature is available only using the
keymap text format v2.

[XKB protocol key actions]: https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Key_Actions
2025-06-18 12:28:40 +02:00
Pierre Le Marre c58c7df1ba Serialize multiple actions per level to VoidAction() in v1 format
When using `XKB_KEYMAP_FORMAT_TEXT_V1`, multiple actions per level are now
serialized using `VoidAction()`, in order to maintain compatibility with X11.
2025-06-18 11:51:19 +02:00
Pierre Le Marre 4f2fa7183b dump: Fix typo
Fixed copy-paste error. It worked for now, as both struct have the
same first fields, but it is obviously semantically incorrect and
not future-proof.
2025-06-17 17:14:28 +02:00
Pierre Le Marre ee50e0c922 keymap: Add option unlockOnPress for LockMods()
It enables e.g. to deactivate CapsLock on press rather than
on release, as in other platforms such as Windows.

The specification of `LockMods()` is changed to:

- On key *press*:
  - If `unlockOnPress` is true and some of the target modifiers were
    *locked* before the key press, then unlock them if `noUnlock` false.
  - Otherwise:
    - add target modifiers to *depressed* modifiers;
    - if `noLock` is false, add target modifiers to the *locked*
      modifiers.
- On key *release*:
  - If `unlockOnPress` is true and triggered unlocking on key press, do
    nothing.
  - Otherwise:
    - remove modifiers from the *depressed* modifiers, if no
      other key that affect the same modifiers is down;
    - if `noUnlock` is false and if any target modifiers was locked before
      the key press, *unlock* them.

It fixes a [12-year old issue] inherited from the X11 ecosystem,
by extending the [XKB protocol key actions].

As it is incompatible with X11, this feature is available only using the keymap
text format v2.

[12-year old issue]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/312
[XKB protocol key actions]: https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Key_Actions
2025-06-17 14:07:36 +02:00
Pierre Le Marre d9d82355b6 keymap: Add option lockOnRelease for LockGroup()
It enables to use e.g. the combination `Control + Shift` *alone* to
switch layouts, while keeping the use of `Control + Shift + other key`
(typically for keyboard shortcuts).

The specification of `LockGroup()` is changed to:
- On key *press*:
  - If `lockOnRelease` is set, then key press has no effect.
  - Otherwise:
  - if the `group` is absolute, key press sets the *locked* keyboard group to
      `group`;
  - otherwise, key press adds `group` to the *locked* keyboard group.

  In either case, the resulting *locked* and *effective* group is brought back
  into range depending on the value of the `GroupsWrap` control for the keyboard.
- On key *release*:
  - If `lockOnRelease` is not set, then key release has no effect.
  - Otherwise, if any other key was *pressed* after the locking key, then
    key release has no effect.
  - Otherwise, it has the same effect than a key press *without* `lockOnRelease`
    set.

This is really useful for people coming from other platforms, such as
Windows.

It fixes a [20-year old issue] inherited from the X11 ecosystem, by
extending the [XKB protocol key actions].

As it is incompatible with X11, this feature is available only using the keymap
text format v2.

[20-year old issue]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/258
[XKB protocol key actions]: https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Key_Actions
2025-06-17 14:07:36 +02:00
Pierre Le Marre c2896b320f messages: Add new error "incompatible-keymap-text-format" 2025-06-17 14:07:36 +02:00
Pierre Le Marre da2af4d37e xkbcli-list: Added layout-specific field for options 2025-06-17 13:42:33 +02:00
Pierre Le Marre 0106b35787 registry: Add rxkb_option_is_layout_specific()
Enable to query if an option accepts layout index specifiers to restrict
its application to the corresponding layouts.
2025-06-17 13:42:33 +02:00
Pierre Le Marre c4c531da09 rules: Add layout-specific options for RMLVO builder
Change the signature of `xkb_rmlvo_builder_append_layout()` to accept
an array of options.

Also add tests for layout-specific options.
2025-06-17 13:42:33 +02:00
Pierre Le Marre fab9d25b92 rules: Add support for layout-specific options
Enabled specifying a layout index for each option, so that it applies
only if the layout matches. The layout index is specified by appending
immediately after the option name the `!` specifier delimiter and then
the layout index, in decimal form and 1-indexed.

Note that `!` was chosen instead of the usual `:` specifier delimiter,
because some options contains `:`, e.g. `grp:menu_toggle`. `!` *cannot*
clash with component names, because `!` is a token in the rules files
and thus cannot be used as in component names. It is also vaguely similar
to `:`, compared to e.g. `@` or `#`.

Example: given the following rules:

    ! layout[any]   option  =  symbol
      *             opt1    =  +s1:%i
      l2            opt2    =  +s2:%i

it may result in the following configurations:

| Layout   | Option   | Symbols      |
| -------- | -------- | ------------ |
| `l1`     | `opt1`   | `+s1:1`      |
| `l2`     | `opt1`   | `+s1:1`      |
| `l1`     | `opt2`   | ``           |
| `l2`     | `opt2`   | `+s2:1`      |
| `l1,l2`  | `opt1`   | `+s1:1+s1:2` |
| `l1,l2`  | `opt1!1` | `+s1:1`      |
| `l1,l2`  | `opt1!2` | `+s1:2`      |
| `l1,l2`  | `opt2`   | `+s2:2`      |
| `l1,l2`  | `opt2!1` | ``           |
| `l1,l2`  | `opt2!2` | `+s2:2`      |
2025-06-17 13:42:33 +02:00
Pierre Le Marre 52a4d9b02c rules: Require layout or variant to enable %i expansion
Before this commit, the following rule would always match:

    ! model = symbols
      *     = s:%i

and set symbols to `s:1`, but the `:%i` is aimed to be used only when
the rules header specifies the layout or the variant.

Let’s be strict and disallow matching this kind of buggy rule. Emit
an error message so that we can detect it.
2025-06-17 13:42:33 +02:00
Pierre Le Marre ef6a550f6f Add xkb_keymap_new_from_rmlvo()
Use the new RMLVO builder API to compile keymaps.
2025-06-16 17:13:41 +02:00
Pierre Le Marre da5caabbcd Add RMLVO builder API
Before this commit, the API to work with RMLVO was quite minimal: it
only uses raw strings from the `xkb_rule_names` struct. However:

- it forces the users to deal with error-prone string formatting;
- it does not enforce tying together layouts and variants;
- it limits adding new features by requiring defining delimiter
  characters and the corresponding parsing.

Added the following API:

- `xkb_rmlvo_builder_new()`
- `xkb_rmlvo_builder_append_layout()`
- `xkb_rmlvo_builder_append_option()`
- `xkb_rmlvo_builder_unref()`

There is no intermediate `layout` nor `option` object, in order to
to keep the API simple. The only foreseen extension is enabling
configuring layout-specific options.
2025-06-16 17:13:41 +02:00
Pierre Le Marre 2906c7ec12 rules: Fix parsing group index
There was a typo that made parsing hexadecimal instead of the expected
decimal format.
2025-06-14 13:58:20 +02:00
Pierre Le Marre f7a61da70e doc: Update new layout count ranges 2025-06-11 20:04:08 +02:00
Pierre Le Marre ac9cd053f8 test: Check extended layout indexes 2025-06-11 20:04:08 +02:00
Pierre Le Marre 80b8d9d1f5 dump: Adapt groups count to keymap format 2025-06-11 20:04:08 +02:00
Pierre Le Marre 62fe73cba5 parser: Raise the layout limit to 32 2025-06-11 20:04:08 +02:00
Pierre Le Marre 717ce25815 test: Refactor rules-file and state
Split into dedicated functions fo better readability.
2025-06-11 19:52:42 +02:00
Pierre Le Marre 2535a3f9f2 rules: Convert macros into enums & inline functions
This provides semantics and better type-check.
2025-06-11 16:32:09 +02:00
Pierre Le Marre 7f39be25b2 test: Use explicit keymap output format for test_compile_output() 2025-06-10 17:18:16 +02:00
Pierre Le Marre 9f3078eb10 dump: Use explicit format 2025-06-10 17:18:16 +02:00
Pierre Le Marre 0f89ad97ea dump: Always use numeric group indexes
The upcoming raise of the maximum groups count will require to use
numeric group indexes instead of the syntax `GroupN` if groups > 8.

Let’s not bother with handling two cases (group count ≤ 8 or > 8) and
always serialize group indexes as numeric values.
2025-06-09 20:06:28 +02:00
Pierre Le Marre f338674350 test: Use explicit keymap format in test_compile_output() 2025-06-09 19:50:09 +02:00
Pierre Le Marre 2acf5ecafd test: Use explicit keymap format in test_compile_buffer() 2025-06-09 19:50:09 +02:00
Pierre Le Marre 6c5ea6fce2 test: Use explicit keymap format in test_compile_string() 2025-06-09 19:50:09 +02:00
Pierre Le Marre 79e9550930 test: Use explicit keymap format in test_compile_rules() 2025-06-09 19:50:09 +02:00
Pierre Le Marre 6d67bce5a1 doc: Towards and exhaustive compatibility page
We need to track the compatibility with X11 with as much details as
possible:
- Transparency;
- Facilitate answering issues by just pointing to the relevant page item;
- Efficient reference documentation for development.
2025-06-09 10:36:32 +02:00
Pierre Le Marre 27ba56aeaa doc: Add initial documention for XKB_KEYMAP_FORMAT_TEXT_V2 2025-06-07 15:07:05 +02:00
Pierre Le Marre 44c8deb229 Introduce keymap format v2 and make it the default for parsing
- Added `XKB_KEYMAP_FORMAT_TEXT_V2`.
- Made `xkb_keymap_new_from_names()` use the new keymap format.
- Made the tools default to the new keymap format for input.

This is in preparation for changes in the parsing & state handling.
For now it changes nothing.
2025-06-07 15:07:05 +02:00
Pierre Le Marre 82ea29157f tools: Add options to use explicit keymap format
The default output keymap format is `XKB_KEYMAP_USE_ORIGINAL_FORMAT`.
2025-06-07 15:07:05 +02:00
Pierre Le Marre 62712cfe98 bench: Add options to use an explicit keymap format 2025-06-07 15:07:05 +02:00
Pierre Le Marre 08149dae2d Add internal API to query and parse supported keymap formats 2025-06-07 15:07:05 +02:00
Pierre Le Marre 58397e9407 Deprecate xkb_keymap_new_from_names()
- Deprecate `xkb_keymap_new_from_names()` in favor of
  `xkb_keymap_new_from_names2()`
- Add new changelog fragment type `deprecated`.
- Change documentation to use the new function.
2025-06-07 15:07:05 +02:00
Pierre Le Marre 1a10f85889 Add xkb_keymap_new_from_names2
This is just `xkb_keymap_new_from_names()` with an explicit keymap
format.
2025-06-07 15:07:05 +02:00
Pierre Le Marre 16c079d6f8 chore: Rename is_absolute to is_absolute_path 2025-06-07 12:58:36 +02:00
Pierre Le Marre 39b4b6703c Support including keymap components using %-expansion and absolute path
Enable to use the same `include` features than *rules* files in
*keymap components*:
- *`%`-expansion*: `%H` home directory, `%S` sytem root and `%E` extra.
- absolute file paths.

This is useful if one wants to overwrite the system file with a user
config (i.e. same name, but in `~/.config/xkb`), but still include the
system file:

```
// File: ~/.config/xkb/symbols/de
xkb_symbols "basic" {
    include "%S/de(basic)"
    key <AB01> { [z, Z] };
    key <AD06> { [y, Y] };
}
````

Without the commit, using a mere `include "de(basic)"` would result in
an include loop.

Refactored by using the same code for rules and keymap components.
2025-06-07 12:58:36 +02:00
dependabot[bot] eb0a1457f4 build(deps): bump dawidd6/action-download-artifact from 9 to 10
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 9 to 10.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v9...v10)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-version: '10'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-06-01 18:10:59 +00:00
Pierre Le Marre 16ba1af050 ci: Fix xkeyboard-config install
Since xkeyboard-config 2.45 uses a symlink for:

    /usr/share/pkgconfig/xkeyboard-config.pc
    /usr/share/X11/xkb

but meson cannot overwrite < 2.45 which used a regular file and directory.

Fixed by first removing the files. This is still a hack and we should
use a proper package update.
2025-06-01 20:06:05 +02:00
Benjamin Gilbert bffbef88a4 build: Require Bison ≥ 3.6
Older versions don’t support `%define parse.error detailed`.

Fixes: a3f1a9d3ba ("xkbcomp/parser: enable Bison detailed syntax error")
2025-05-22 09:24:32 +02:00
Pierre Le Marre 7888474d02 Bump version to 1.10.0 2025-05-21 20:19:09 +02:00
Pierre Le Marre 324984f188 xkbcomp: Fix log for unknown default field 2025-05-17 08:18:47 +02:00
Pierre Le Marre 4e1fd49a5a scripts: Enable generating new range message codes 2025-05-17 08:18:47 +02:00
Pierre Le Marre c3744cd351 test: Fix Compose log 2025-05-17 08:18:47 +02:00
Pierre Le Marre 9b4fd82b2e test: Skip checked arithmetic if not available 2025-05-16 13:54:49 +02:00
Pierre Le Marre e9394b9fa9 utils: Use explicit cast to prevent warnings 2025-05-16 13:54:49 +02:00
Pierre Le Marre fb9fec1892 xkbcomp: Checked arithmetic
Use a polyfill for C23 checked arithmetic. This is a bit paranoid, as we
expect the user to use only 32 bit integers, so the signed 64 bit integer
we use to store the result should be more than enough.

Use jtckdint v1.0:
- repository: https://github.com/jart/jtckdint
- commit: 339450d13d8636f05dcb71ba36efddb226db481e
- removed all C++-specific code
2025-05-16 13:54:49 +02:00
Jules Bertholet 7a2aa9c9bb Always retain later Compose sequence in case of conflict
This ensures that it is always possible to override previous definitions,
for example when `include`ing the system Compose file.

Signed-off-by: Jules Bertholet <julesbertholet@quoi.xyz>
2025-05-16 13:53:02 +02:00
Pierre Le Marre 3a8bb1a109 compose: Fix sequence not fully overriden
Previously if a new sequence did not produce a keysym or a string, the
corresponding property was not overriden, possibly leaking the previous
entry.

- Fixed by always writting all the properties.
- Also try to reuse the previous string entry, if possible, so that we
  avoid allocating.
2025-05-16 13:45:32 +02:00
Pierre Le Marre 9da1a2eb24 doc: Add license in generated doc 2025-05-16 10:48:35 +02:00
Pierre Le Marre d018638dd4 doc: Improve CSS 2025-05-16 10:48:35 +02:00
Pierre Le Marre 61a1e646b8 doc: Reformat release notes and include them in the HTML doc 2025-05-16 10:48:35 +02:00
Pierre Le Marre bd55264255 doc: Use custom alias to fix HTML tags unsupported by Doxygen
Previous solution with `sed` is both overkilled and unreliable.
Prefer a hack using Doxygen’s buit-ins, although we are not sure
these are much more stable… 😓
2025-05-16 10:48:35 +02:00
Pierre Le Marre b5f7c843cf doc: Add script to fix HTML tags unsupported by Doxygen 2025-05-14 22:33:19 +02:00
Pierre Le Marre 06fbe1b231 doc: Promote xkbcli tools 2025-05-14 22:33:19 +02:00
Pierre Le Marre cedc54d08b doc: Modifier declaration and binding
Detailed explanation of:
- modifier declaration
- real/virtual modifier maps
- modifier key binding
- modifier encoding
- modifier portability
2025-05-14 19:12:16 +02:00
Pierre Le Marre 3eaf8ad260 doc: Add FAQ section for legacy X tools replacement 2025-05-14 19:11:04 +02:00
Pierre Le Marre 48a6faa7a3 tools: Remove internal interactive-evdev
This *internal* tool is no longer necessary, as its single special
feature, `--print-modmaps`, is now available in the *public*
`compile-keymap` tool.
2025-05-14 19:11:04 +02:00
Pierre Le Marre ae80b244bb tools: Add --modmaps option to compile-keymap
- Remove the `ENABLE_PRIVATE_APIS` guards on modmaps printing
  functions, since we use no private symbols.
- Copy the `--print-modmaps` options from `interactive-evdev` into
  `compile-keymap` and rename it to `--modmaps`. This enables a
  feature similar to `xmodmap -pm`.
2025-05-14 19:11:04 +02:00
Pierre Le Marre fb73f9f581 tools: Refactor modmaps printing functions
Simplify and make them print valid YAML.
2025-05-14 19:11:04 +02:00
Pierre Le Marre 2e07790ea9 tools: Remove modmaps fields in interactive entries
They are already printed before entering the interactive mode.
2025-05-14 19:11:04 +02:00
Pierre Le Marre b421c2cfc7 tools: Refactor compile-keymap
- Use explicit input and output format
- Perform more tests
2025-05-14 19:11:04 +02:00
Pierre Le Marre af5eacea48 test: Fix uninitialized variable
Warning from MSVC.
2025-05-13 09:18:43 +02:00
Pierre Le Marre 72ed9104c8 test: Use standard C rather than POSIX API
Windows does not use the same functions signatures and generates a lot
of warnings.
2025-05-13 09:18:43 +02:00
Pierre Le Marre 61d8ec6763 misc: Fix string format specifiers
Ensure better portability.
2025-05-13 09:18:43 +02:00
Pierre Le Marre 3031f6c324 misc: Always use unsigned with int
Better semantics & facilitate search.
2025-05-13 09:18:43 +02:00
Pierre Le Marre 01742b7783 misc: Ensure explicit conversion in gperf code 2025-05-13 09:18:43 +02:00
Pierre Le Marre b49a440916 tools: Minor refactor of how-to-type 2025-05-13 09:18:43 +02:00
Pierre Le Marre 556d00a016 keymap: Ensure proper type for layouts count 2025-05-13 09:18:43 +02:00
Pierre Le Marre 3bfc1bc1b4 misc: Ensure proper type for darray size 2025-05-13 09:18:43 +02:00
Pierre Le Marre 1d361b8f69 scanner: Ensure proper type for string length 2025-05-13 09:18:43 +02:00
Pierre Le Marre 13e7114d8b rules: Ensure proper type of MLVO and KcCGST indexes 2025-05-13 09:18:43 +02:00
Pierre Le Marre ac2aa2df99 keymap: Ensure proper type for LEDs count 2025-05-13 09:18:43 +02:00
Pierre Le Marre 903c16dad6 keymap: Ensure proper type for key types counts 2025-05-13 09:18:43 +02:00
Pierre Le Marre c3953a9602 keymap: Ensure proper type for key codes aliases 2025-05-13 09:18:43 +02:00
Pierre Le Marre 2617ebc595 keymap: Ensure proper type for modifiers count 2025-05-13 09:18:43 +02:00
Pierre Le Marre 41bb797d08 symbols: Ensure proper type for keysyms count 2025-05-13 09:18:43 +02:00
Pierre Le Marre f7c94bfcff symbols: Ensure proper type for levels count 2025-05-13 09:18:43 +02:00
Pierre Le Marre 2f4d30c2f6 context: Ensure proper type for include paths count 2025-05-13 09:18:43 +02:00
Pierre Le Marre 104575634a keymap: Ensure proper type for actions count 2025-05-13 09:18:43 +02:00
Pierre Le Marre 3911f786cc keymap: Ensure proper type for num_sym_interprets 2025-05-13 09:18:43 +02:00
Pierre Le Marre 8f5270c09f utils: Improve darray
- Introduce `darray_size_t`
- Document struct fields: the `alloc` field may be particularly confusing
2025-05-13 09:18:43 +02:00
Pierre Le Marre 7cf3d49b2c doc: Improve actions
- Improve parameters doc of supported actions
- Document some legacy actions
2025-05-11 22:17:45 +02:00
Pierre Le Marre 9951184e3e actions: Properly reset type to NoAction on error
If we do not reset the type, the action may lready have been initialized
to with a default action and thus will not be ignored.
2025-05-11 16:45:51 +02:00
Pierre Le Marre 22d272779d actions: Reject arguments if they are not expected
`NoAction`, `VoidAction` and `TerminateServer` do not accept arguments.
2025-05-11 16:45:51 +02:00
Pierre Le Marre d239a3f088 actions: Improve unsupported legacy X11 actions handling
- Display a warning
- Document drawbacks of degrading to `NoAction()`
2025-05-11 16:45:51 +02:00
Pierre Le Marre 137c5e9069 actions: Improve unknown action logging 2025-05-11 16:45:51 +02:00
Pierre Le Marre b4c8960033 actions: Add VoidAction(), mirroring NoSymbol/VoidSymbol.
Added `VoidAction()` action to match the keysym pair
`NoSymbol` / `VoidSymbol`.

It enables overriding a previous action and breaks latches.

This is a libxkbcommon extension. When serializing it will be converted to
`LockControls(controls=none,affect=neither)` for backward compatibility.
We cannot serialize it to `NoAction()`, as it would be dropped in e.g.
the context of multiple actions.
2025-05-11 15:43:39 +02:00
Pierre Le Marre 9191ccc94c test: Added further case to xkb_state_update_latched_locked
Test group lock wrap.
2025-05-09 17:51:24 +02:00
Pierre Le Marre 845d2fee22 xkbcomp: Fix affect field wrongly accepted in SetControls() action 2025-05-09 17:06:47 +02:00
Pierre Le MarreandRan Benita 551cca2aec state: Add server API for updating latched and locked mods & layout
Up to now, the “server state” `xkb_state` API only offered one entry
point to update the server state – `xkb_state_update_key`, which reflects
the direct keyboard keys state. But some updates come out-of-band from
keyboard input events stream, for example, a GUI layout switcher.

The X11 XKB protocol has a request which allows for such updates,
`XkbLatchLockState`[^1], but xkbcommon does not have similar
functionality. So server applications ended up using
`xkb_state_update_state` for this, but that’s a function intended for
client applications, not servers.

Add support for updating the latched & locked state of the mods and
layout. Note that the depressed states cannot be updated in this way --
XKB does not expect them to be updated out of band.

[^1]: https://www.x.org/releases/X11R7.7/doc/kbproto/xkbproto.html#Querying_and_Changing_Keyboard_State

Fixes: #310
Signed-off-by: Ran Benita <ran@unusedvar.com>
Co-authored-by: Ran Benita <ran@unusedvar.com>
Co-authored-by: Pierre Le Marre <dev@wismill.eu>
2025-05-09 14:27:20 +02:00
Pierre Le Marre 662ce93788 state: Avoid keycode lookup when key ref is available 2025-05-09 14:27:20 +02:00
Pierre Le Marre 7cd1180b66 modifiers: Add xkb_keymap_mod_get_mask()
Added a dedicated API to query modifier masks rather than relying on
a hack using `xkb_state_update_mask` and `xkb_state_serialize_mods`.
Furthermore, this hack may not work in the future if we remove virtual
mods resolution in `xkb_state_update_mask` to avoid corner-cases issues.
2025-05-09 00:51:23 +02:00
Pierre Le Marre 9fab39485c doc: Deprecate legacy modifiers names
The following modifiers names in `xkbcommon/xkbcommon-names.h` are now deprecated:
- `XKB_MOD_NAME_ALT`: use `XKB_VMOD_NAME_ALT` instead.
- `XKB_MOD_NAME_LOGO`: use `XKB_VMOD_NAME_SUPER` instead.
- `XKB_MOD_NAME_NUM`: use `XKB_VMOD_NAME_NUM` instead.
2025-05-09 00:28:48 +02:00
Pierre Le Marre 1b402b065d doc: Introduce the “deprecated” changelog fragment type 2025-05-09 00:28:48 +02:00
Pierre Le Marre 51c8c5b5e4 doc: Common modifiers & LEDs names 2025-05-09 00:28:48 +02:00
Ran Benita a3f1a9d3ba xkbcomp/parser: enable Bison detailed syntax error
It's not much, but instead of

xkbcommon: ERROR: [XKB-769] (unknown file):5:25: syntax error

we get

xkbcommon: ERROR: [XKB-769] (unknown file):5:25: syntax error, unexpected +, expecting INTEGER

which is at least a little helpful.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-05-08 17:12:40 +02:00
Ran Benita e6aec06740 build: drop support for byacc
It doesn't support `%define parse.error detailed` which we want to use.
If needed, we can probably bring back support using some macro hackery.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-05-08 17:12:40 +02:00
Pierre Le Marre e00a5e833d Add tests for pure virtual modifiers 2025-05-08 09:08:19 +02:00
Pierre Le Marre c2d3694b81 xkbcomp: Do not discard extra bits in vmod masks
Since we accept numeric values for the vmod mask in the keymap, we may
have extra bits set that encode *no* real/virtual modifier. Keep them
unchanged for consistency.

E.g. the following keymap:

    xkb_keymap {
        xkb_keycodes { <a> = 38; };
        xkb_symbols {
            virtual_modifiers X = 0xf0000000;
            key <a> { [ SetMods(mods = 0x00001100) ] };
        };
    };

would compile to:

    xkb_keymap {
        xkb_keycodes { <a> = 38; };
        xkb_symbols {
            virtual_modifiers X = 0xf0000000;
            // Internal state
            key <a> { [ SetMods(mods = 0xf0001000) ] };
            // Serialization
            key <a> { [ SetMods(mods = 0x00001100) ] };
        };
    };
2025-05-07 13:23:54 +02:00
Pierre Le Marre dddffd51be state: Fix virtual modifiers with non-real mod mapping
Currently there are 2 issues with the handling of virtual modifiers
in the keyboard state:
1. We assume that the input modifiers masks encode the indexes of all
  the modifiers of the keymap, but this is true only for the *real*
  modifiers (at least in xkbcommon and X11). Indeed, since the virtual
  modifiers *indexes* are implementation-specific, the input modifier
  masks merely *encode* the modifiers via their *mapping*.

  Consider the following keymap:

  ```c
  xkb_keymap {
    xkb_compat { virtual_modifiers M1 = 0x100; };
    xkb_types  { virtual_modifiers M2 = 0x200; };
  };
  ```

  Now to illustrate, consider the following 2 implementation variants
  of libxkbcommon (assuming indexes 0-7 are the usual real modifiers):
  1. Process `xkb_compat` then `xkb_types`.
     M1 and M2 have the respective indexes 8 and 9 and map to
     themselves (with the current assumption about mask denotation).
  2. Process `xkb_types` then `xkb_compat`.
     M1 and M2 have the respective indexes 9 and 8 and map to each
     other.

  With the current `xkb_state_update_mask`, implementation 2 will swap
  M1 and M2 (compared to impl. 1) at each update! Indeed, we can see that
  `xkb_state_serialize_mods` doesn’t roundtrip via `xkb_state_update_mask`.
2. We assume that modifier masks use only bits denoting modifiers in
  the keymap, but when parsing the keymap we accept explicit virtual
  modifiers mapping of arbitrary values.

  E.g. if `M1` is the only virtual modifier and it is defined by:

  ```c
  virtual_modifiers M1 = 0x80000000; // 1 << (32 - 1)
  ```

  then the 32th bit of a modifier mask input does *not* denote the
  32th virtual modifier of the keymap, but merely the encoding of the
  mapping of `M1`.

  So when calling `xkb_state_update_mask`, we may discard some bits of
  the modifiers masks and end up with an incorrect state.

These 2 issues may break interoperability with other implementations of
XKB (e.g. kbvm) and make pure virtual modifiers handling fragile.

We introduce the notion of *canonical state modifier mask*: the mask
with the smallest population count that denotes all bits used to encode
the modifiers in the keyboard state. It is equal to the bitwise OR of
real modifiers mask and all the virtual modifiers mappings.

This commit fixes the 2 issues by making *weaker* assumptions about the
input modifier masks:
1. Modifiers may map to arbitrary values, not only real modifiers.
2. Input modifier masks merely encode modifiers via their *mapping*:
   - *real* modifiers map to themselves;
   - *virtual* modifiers map to the bitwise OR of their *explicit*
     mapping (via `virtual_modifiers`) and their *implicit* mapping (via
     keys’ real and virtual modmaps).
   - modifiers indexes are implementation-specific.

   Since the implementation before this commit also resolved virtual
   modifiers to their mappings, we continue doing so, but using only the
   bits that are *not* set in the canonical state modifier mask, so that
   we enable roundtrip of `xkb_state_serialize_mods` via
   `xkb_state_update_mask`.
3. Input modifier masks do not denote modifiers indexes (apart from real
   modifiers), so it is safe to discard only the bits that are not set
   in the canonical state modifier mask.
2025-05-07 12:57:41 +02:00
Pierre Le Marre dd642359f8 Bump version to 1.9.2 2025-05-07 00:22:11 +02:00
Pierre Le Marre d5b779e142 keymap: Fix empty compat interpretation map serialization
X11’s `xkbcomp` requires at least one compat interpretation entry.
2025-05-06 23:56:12 +02:00
Pierre Le Marre 87f9ac761f keymap: Fix empty compat interpretation statement serialization
Statements such as `interpret VoidSymbol {};` can cannot be parsed by
X11’s `xkbcomp`.

Fixed by using a dummy action.
2025-05-06 23:56:12 +02:00
Pierre Le Marre ac42ce2948 test: Check xkeyboard-config xkbcommon → xkbcomp chaining 2025-05-06 23:56:12 +02:00
Pierre Le Marre 230b6a6a20 Fix key type map entry with unbound vmod not ignored
Currently we only ignore key type map entries with non-zero mods and
with a zero modifier mask. However, the XKB protocol states ([source]):

> Map entries which specify unbound virtual modifiers are not considered.

So we currently handle `map[Unbound]` key type map entries (all modifiers
unbound) but not `map[Bound+Unbound]` entries (mix of bound and unbound
modifiers).

Fixed by properly checking unbound modifiers on each key type map entry.

This also fixes a test that was accidentally passing.

[source]: https://www.x.org/releases/X11R7.7/doc/kbproto/xkbproto.html#:~:text=Map%20entries%20which%20specify%20unbound%20virtual%20modifiers,not%20considered
2025-05-06 15:04:10 +02:00
Pierre Le Marre f814874408 Define the mapping of real modifiers explicitly
When querying for a modifier mapping, we should treat all modifiers
equally. So simply store real modifier mapping as we do for the virtual
ones.

Also fixed useless boolean conversions.
2025-05-06 11:56:57 +02:00
Pierre Le Marre e1aca42e02 state: Minor refactor
- Move variable declaration close to their use.
- Make them constant whenever possible.
2025-05-05 14:41:14 +02:00
Pierre Le Marre 8bc60ee391 modifiers: Minor optimization
It has low impact, but it also adds better semantics.
2025-05-05 14:41:14 +02:00
Pierre Le Marre 7df431ac4d Bump version to 1.9.1 2025-05-02 19:57:46 +02:00
Pierre Le Marre cd512b8f38 x11: Fix capitalization transformation 2025-05-02 19:40:53 +02:00
Pierre Le Marre 9ffe3cfc37 doc: Create a FAQ page
- Initialize with multiple recurrent questions.
- Document how to get the vmod → rmod mapping.
  Rational: Some applications may need it to interface with legacy
  code.
2025-04-29 15:13:46 +02:00
Pierre Le Marre 411e9a6fbe ExprKeySym: add comment about error recovery 2025-04-29 13:07:31 +02:00
Pierre Le Marre 76683d92e0 symbols: Fix clang-tidy false positive 2025-04-29 13:04:57 +02:00
Pierre Le Marre 4d605b700e tests: Ensure random generator use an explicit seed
This enable debugging with the exact same seed.
2025-04-29 13:04:57 +02:00
Pierre Le Marre 963c062cab tests: Refactor utils
Some parts relied on undefined behavior and it had duplicated tests.
2025-04-29 13:04:57 +02:00
Benjamin Gilbert 0bfd097ca5 test: Fix main() function prototype
Fix compilation error when building for Windows with clang-cl:

    ../subprojects/libxkbcommon-xkbcommon-1.9.0/test/keysym-unicode.c:11:1: error: return type defaults to 'int' [-Wimplicit-int]
    ../subprojects/libxkbcommon-xkbcommon-1.9.0/test/keysym-unicode.c:11:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
2025-04-29 08:21:10 +02:00
Pierre Le Marre 8af09d5912 doc: Fix usual vmods mapping typo
`LevelThree` and `LevelFive` are mapped respectively to `Mod5` and
`Mod3`. This is counter-intuitive but set so for ages and probably hard-
coded in some places.
2025-04-28 08:05:52 +02:00
Ran Benita 33bc8c1326 doc/keymap-format-text-v1: fix inaccurate statement in Keysym glossary entry
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-04-28 06:44:56 +02:00
Pierre Le Marre ee1a98c5b3 Bump version to 1.9.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-04-26 22:41:34 +03:00
Pierre Le Marre 95c5c85997 xkbcomp: Quote erroneous field in logging 2025-04-15 20:25:50 +02:00
Pierre Le Marre d66a65c2f5 xkbcomp: Consistent keycodes logging 2025-04-15 20:25:50 +02:00
Pierre Le Marre 38322758c0 doc: Include and merge modes 2025-04-15 20:23:59 +02:00
Pierre Le Marre 21a341f232 test: Enable 3rd party compilers 2025-04-15 20:21:31 +02:00
Pierre Le Marre 9b0b8c6863 xkbcomp: Stricter handling of default map include
Before this commit, including a *default* map, i.e. without an explicit
section name (e.g. `include "au"` vs `include "au(basic)"`) would match
the first section of the first matching file in the XKB include paths,
even if this section is not an *explicit* default map (i.e. tagged with
`default`) but an *implicit* default map (i.e. the first map of the
file, i.e. a weak match).

It makes user configuration risky: say a user wants to create a custom
version `au(custom)` of the `au` layout:
- `./config/xkb/symbols/au`: custom layout in section “custom”.
- `/usr/share/X11/xkb/symbols/au`: system layout, with *default* section
  “basic”.

In this setup *any* layout that imports the default map from `au` would
in fact import the *implicit* default map `au(custom)` instead of the
*explicit* default map `au(basic)`.

This incorrect behavior may thus break setups with multiple layouts.
This is especially true for symbols files such as: `pc`, `us` or `latin`.

Fixed by trying harder to found the exact default map, defaulting to the
old behavior (weak match) only if no *explicit* default map (exact match)
has been found in the XKB include paths.
2025-04-15 20:13:34 +02:00
Pierre Le Marre 00585c5c25 doc: Keymap format + misc 2025-04-15 19:44:44 +02:00
Pierre Le Marre 9ede705b60 state: Capitalization transformation in xkb_state_key_get_syms
Previously `xkb_state_key_get_syms()` did not perform capitalization
tranformation, while `xkb_state_key_get_one_sym()` does perform it.

This is unfortunate if we want to promote the use of multiple keysyms
per levels.

The API make it difficult to change now though: we return a pointer to
an immutable array rather than filling a buffer. While we could use an
internal buffer in `xkb_state`, this option would limit the API to
*sequential* calls of `xkb_state_key_get_syms()` or require some buffer
handling (e.g. rotation).

Instead we now store the capitalization directly in `xkb_level`. We
modified `xkb_level` like so (see below for discussion about the size):

```diff
 struct xkb_level {
-    unsigned int num_syms;
+    uint16_t     num_syms;
-    unsigned int num_actions;
+    uint16_t     num_actions;
+    union {
+        /** num_syms == 1: Upper keysym */
+        xkb_keysym_t upper;
+        /** num_syms >  1: Indicate if `syms` contains the upper case
+         *                 keysyms after the lower ones. */
+        bool has_upper;
+    };
     union {
         xkb_keysym_t sym;          /* num_syms == 1 */
         xkb_keysym_t *syms;        /* num_syms > 1  */
     } s;
     union {
         union xkb_action action;   /* num_actions == 1 */
         union xkb_action *actions; /* num_actions >  1 */
     } a;
 };
```

- When `level.num_syms` <= 1, we store the upper keysym in `level.upper`.
- Else if there no cased syms, we set `level.has_upper` to false.
- Else if there are some cased syms, we set `level.has_upper`` to `true`
  and we double the original size of `level.s.syms`, but *without*
  modifying `level.num_syms`. We then append the transformed keysyms
  right after the original ones, so that we can access them by a simple
  pointer operation: `level.s.syms + level.num_syms`.

The memory footprint is *unchanged*, thanks to the reduced fields for
actions and keysyms counts.
2025-04-14 16:56:10 +02:00
Pierre Le Marre 9e93e5e5d2 symbols: Restrict the number of actions and keysyms per level
In preparation to support capitalization in `xkb_state_key_get_syms()`,
this commit reduces the number of supported actions and keysyms per
level, going from UINT_MAX to UINT16_MAX. This is most likely still more
than enough and could be even reduced further, but deemed unnecessary
at the moment: alignment of `struct xkb_level` is driven by the fields
`a` and `s`.

- Switched the item count type from `unsigned int` to `uint16_t`.
- Introduced `xkb_{action,keysym}_count_t` type for the respective item
  count for exact typing.
- Added relevant bounds checks.
2025-04-14 16:56:10 +02:00
Pierre Le Marre 44bcdb73c2 symbols: Avoid keysyms allocation by stealing darray 2025-04-14 16:56:10 +02:00
Pierre Le Marre 53d80b8779 xkbcomp: Safer keycode max_key_code
Since we now always keep the keycodes array at the minimal dimensions,
`max_key_code` is redundant and error prone. Let’s use `darray_size`
directly.
2025-04-12 12:31:22 +02:00
Pierre Le Marre 256be1ea1a xkbcomp: Fix merge mode for defaults actions
- Keep defaults local: do not share accross includes.
- Do not allocate default actions.
2025-04-12 12:20:02 +02:00
Pierre Le Marre b1865376ed xkbcomp: Fix merge mode for defaults in symbols 2025-04-12 12:20:02 +02:00
Pierre Le Marre a629aa84c9 xkbcomp: Fix merge mode for defaults in compat 2025-04-12 12:20:02 +02:00
Pierre Le Marre af5296cff7 xkbcomp: Fix virtual mods merge modes 2025-04-12 12:20:02 +02:00
Pierre Le Marre 06c024e02f xkbcomp: Fix merge modes
Fix various issues with merge mode handling:
- Invalid initialization
- Invalid merge mode inherited from keymap
- Do not leak local merge mode
2025-04-12 12:20:02 +02:00
Pierre Le Marre 0f6ea465e1 ci: Enable merge modes tests 2025-04-12 12:20:02 +02:00
Pierre Le Marre 636b8b976f test: Add merge mode tests for all the sections
The merge modes tests C file is now only generated locally, because it
is too large. The generator Python script requires Jinja2, so the test
is optional and depends on Jinja22 availability.

The test aim to be exhaustive with various combinations of a base and
an update:
- plain base + plain update, for every mode
- plain base + include (for every mode) update (every mode)
- single include (base +| update)
2025-04-12 12:20:02 +02:00
Pierre Le Marre 216352db6c test: Improve xkeyboard-config script
- Enable setting the XKB root directory. By far the most important
  change.
- Enable to pass registry XML files relative to the target rules
  directory (with or without the `.XML` extension).
- Enable to set the rules set to use.
- Better JSON/YAML escaping.
- Better error logging.
2025-04-12 11:53:40 +02:00
Pierre Le Marre a1e595e701 rules: Fix merging KcCGST values in layout order
When using layout index ranges (e.g. special indexes “any” or “later”),
the rules still match following the order in the rules file, so layout
indexes may match without following their natural order. So the resulting
KcCGST value should not be merged with the output until reaching the end
of the rule set.

Because the rule set may also involve options, it may match multiple
times for the *same* layout index. So these multiple matches should not
be merged together either, until reaching the end of the rule set.

When reaching the end of the rule set, for each KcCGST component the
pending values are then merged: for each layout, for each KcCGST value
in the corresponding sequence, merge with the output.

---

Example:

    ! model = symbols
      *     = pc
    ! layout[any] option = symbols
      C           1      = +c1:%i
      C           2      = +c2:%i
      B           3      = skip
      B           4      = +b:%i

The result of RMLVO

    {layout: "A,B,C", options: "4,3,2,1"}

is:

    symbols = pc+b:2+c1:3+c2:3

- `skip` was dropped because it has no explicit merge mode;
- although every rule was matched in order, the resulting order of the
  symbols follows the order of the layouts, so `+b` appears before `+c1`
  and `+c2`.
- the relative order of the options for layout C follows the order
  within the rule set, not the order of RMLVO.

Before this commit, the result would have been:

    symbols = pc+c1:3+c2:3+b:2
2025-04-11 19:10:19 +02:00
Pierre Le Marre 8d380f1b6b rules: Improve bench 2025-04-11 19:10:19 +02:00
Pierre Le Marre dc50603cd9 build: Force UTF-8 source files encoding on Windows
Some of our test files (e.g. keysym strings) use UTF-8 encoded
strings that require proper handling by the compiler. Let’s favor
readability using modern compiler settings instead of escape
sequences.
2025-04-09 14:58:11 +02:00
Pierre Le Marre 66f718905d symbols: Enable writing keysyms list as UTF-8 strings
Each Unicode code point of the string will be translated to their
respective keysym, if possible. An empty string denotes `NoSymbol`.
When such conversion is not possible, this will raise a syntax error.

This introduces the following syntax:

```c
// Empty string = `NoSymbol`
key <1> {[""]}; // NoSymbol
// Single code point = single keysym
key <2> {["é"]}; // eacute
// String = translate each code point to their respective keysym
key <3> {["sßξك🎺"]}; // {s, ssharp, Greek_xi, Arabic_kaf, U1F3BA}
// Mix string and keysyms
key <4> {[{"ξ", Greek_kappa, "β"}]}; // { Greek_xi, Greek_kappa, Greek_beta}
```

It can also be used wherever a keysym is required, e.g. in `interpret`
and `modifier_map` statements. In these cases a single keysym is expected,
so the string should contain *exactly one* Unicode code point.
2025-04-09 14:58:11 +02:00
Pierre Le Marre ead3ce772c scanner: Enable LRM and RLM marks for BiDi text
Enable displaying bidirectional text in XKB files using:
- U+200E LEFT-TO-RIGHT MARK
- U+200F RIGHT-TO-LEFT MARK

We now parse these marks as white space. As such, they are dropped;
note that a later serialization may not display correctly without
the marks, although it will parse.

References:
- https://www.w3.org/International/articles/inline-bidi-markup/uba-basics
- https://www.w3.org/International/questions/qa-bidi-unicode-controls
- https://www.unicode.org/reports/tr31/#Whitespace
- https://www.unicode.org/reports/tr55/
2025-04-09 14:58:11 +02:00
Pierre Le Marre bc3e464b1e keysyms: Fix Unicode handling
- `xkb_utf32_to_keysym`: Allow [Unicode noncharacters]. There is no
  requirement to drop them and this would be the only function of our
  API doing so.

  From the Unicode Standard 16.0, section 23.7 “Noncharacters”:

  > Applications are free to use any of these noncharacter code points
  > internally. They have no standard interpretation when exchanged
  > outside the context of internal use. However, they are not illegal
  > in interchange, nor does their presence cause Unicode text to be
  > ill-formed.

  > If a noncharacter is received in open interchange, an application is
  > not required to interpret it in any way. It is good practice,
  > however, to recognize it as a noncharacter and to take appropriate
  > action, such as replacing it with `U+FFFD` REPLACEMENT CHARACTER,
  > to indicate the problem in the text.

  The key part is:

  > an application is not required to interpret it in any way

  Since we handle the reverse conversion with `xkb_keysym_to_utf32` just
  fine, I do not see a good motivation to keep this asymmetry. This is
  the only function with a special case for these code points.
- `xkb_keysym_from_name`:
  - Unicode format `UNNNN`: allow control characters C0 and C1 and use
    `xkb_utf32_to_keysym` for the conversion when `NNNN < 0x100`, for
    backward compatibility.
  - Numeric hexadecimal format `0xNNNN`: *unchanged*. Contrary to the
    Unicode format, it does not normalize any keysym values in order to
    enable roundtrip with `xkb_keysym_get_name`.

Also added tests to ensure various properties and consistency.

Note about *surrogates*: they are valid valid *code points* but invalid
Unicode *scalar values*, i.e. they cannot be encoded in any Unicode
encoding form (UTF-8, UTF-16, UTF-32). So their corresponding Unicode
keysyms are valid, but:
- cannot be used as input of `xkb_keysym_to_utf32` nor `xkb_keysym_to_utf8`
- cannot result as output of `xkb_utf32_to_keysym`.
Otherwise they are valid e.g. in the Unicode keysym notation.

[Unicode noncharacters]: https://en.wikipedia.org/wiki/Universal_Character_Set_characters#Noncharacters
2025-04-09 13:55:33 +02:00
Pierre Le Marre 08d9a0318f Unicode: Make surrogate handling more explicit 2025-04-09 13:55:33 +02:00
Pierre Le Marre 5e55704067 xkbcomp: Fix Unicode escape sequence
While the previous code correctly rejected malformed sequences such as
`\u{` (incomplete) or `\u{123x}`, it should try to consume as much input
as possible until reaching the corresponding closing `}` within the
string. Else we can get leftovers and the error message does not
reference the whole malformed sequence.

Also added further tests with surrogates and noncharacters.
2025-04-09 11:27:11 +02:00
Pierre Le Marre ca798d2181 keysyms: Pad Unicode keysyms only up to 4 digits
Previously there was a distinction between keysyms with code points in
BMP and the others: the former used a 4-padding while the latter used
a 8-padding: e.g `U0001` vs `U00010000`. This is unnecessary and makes
the reading harder.

Let’s use the same padding for all: `U0001` and `U10000`.

Parsing remains unchanged and would parse both paddings.

Also added a test to check no explicit name can clash with Unicode
notation.
2025-04-08 18:28:40 +02:00
Pierre Le Marre 47c2c820e7 Add internal API to get all explicit names of a keysym 2025-04-08 18:28:40 +02:00
Pierre Le Marre 102f4ba1ed Fix integer conversion warnings 2025-04-07 18:41:13 +02:00
Pierre Le Marre 3370ead3e4 test: Better handling of missing xkbcomp for X11 tests
- meson: Warn if missing xkbcomp for X11 tests;
- test: Better logging to spot missing Xorg executables.
2025-04-06 17:15:57 +02:00
Pierre Le Marre 5a32b77974 logging: Handle NULL map name
Display “(unnamed map)” instead of “(null)”.
2025-04-06 08:05:32 +02:00
Pierre Le Marre 36442baa47 xkbcomp: Support multiple actions in interpret
Before this commit we supported multiple actions per level, but not in
*interpret* statements. Let’s fix this asymmetry, so we can equivalently
assign all actions sets either implicitly or explicitly.
2025-04-05 15:54:27 +02:00
Pierre Le Marre 06394afc8b xkbcomp: Minor parser refactor for keysyms and actions 2025-04-05 15:54:27 +02:00
Pierre Le Marre f348c6e9e6 logging: Quote invalid escape sequence 2025-04-05 15:24:54 +02:00
Pierre Le Marre 6d4cc13553 xkbcomp: Escape ASCII control characters 2025-04-05 15:24:54 +02:00
Pierre Le Marre 3d79f4591c xkbcomp: Add Unicode code point escape sequence \u{NNNN}
Unicode code point escape sequences `\u{NNNN}` are replaced with the
UTF-8 encoding of their corresponding code point `U+NNNN`, if legal.
Supported Unicode code points are in the range `1‥0x10ffff`.

Note that we will reject the `U+0000` NULL code point, as we reject it
in the octal escape sequence `\0`.

This is intended mainly for the upcoming feature to write keysyms as
UTF-8 encoded strings. It can be used for various reasons:
- avoid encoding issues;
- avoid issue with font rendering (e.g. Asian scripts);
- make white space or zero-width characters more readable.
2025-04-05 15:24:54 +02:00
Pierre Le Marre 23bbec9667 xkbcomp: Add escape sequence \"
`\"` seems like a very natural extension. However it is not
supported by Xorg xkbcomp, so do not emit it when serializing.
2025-04-05 15:24:54 +02:00
Pierre Le Marre 7d91a7531d xkbcomp: Enable xkbcomp-style octal escape sequences
Xorg xkbcomp only parses octal sequences with `\0`, while xkbcommon
does not force the `0` prefix of the numeric part. However, we only
parsed up to to 3 digits, which does not allow to parse e.g. `\0377`
while `\377` parses fine.

Fixed by parsing up to 4 octal digits, while checking the result fits
into a byte.
2025-04-05 15:24:54 +02:00
Pierre Le Marre 3d02643643 keymap serialization: Fix unchecked allocation failures
The previous commit enabled clang-tidy to detect some missing checks.
2025-04-05 15:24:54 +02:00
Pierre Le Marre aa8b572eb3 keymap serialization: Ensure escaping relevant chars
Previously we would write characters without any escaping in some
cases (e.g.: names of indicators, types and groups). E.g. the string

    "new\nline"

would be serialized as:

    "new
    line"

which would raise a syntax error if parsed.

Fixed by escaping any string that was not escaped after parsing (e.g.
the section names are safe already).
2025-04-05 15:24:54 +02:00
Pierre Le Marre 39c1bb36d5 xkbcomp: Fix static_assert syntax 2025-04-05 15:24:54 +02:00
Pierre Le Marre d2f7b9cd87 rules: Do not use strto* parsers 2025-04-05 11:23:45 +02:00
Pierre Le Marre d5a91fa9b0 xkbcomp: Use custom parsers instead of strtol*
The use of `strtol*` functions was already restricted due to its
slowness and its capacity to parse other stuff than digits (e.g.
signs and spaces).

There is also another *big* limitation: it requires a NULL-terminated
string. This is incompatible with our functions that work on buffers,
because we cannot guarantee this. This may lead to a memory violation
if the last token is a number.

We now roll out our own parsers, which are more efficients and
compatible with buffers.
2025-04-05 11:23:45 +02:00
Pierre Le Marre 9b255d1ebf tools: Update bash completion
Handle positional argument as a path for the `compile-*` tools.
2025-04-03 07:57:46 +02:00
Pierre Le Marre 8594adc416 doc: Mention that alternate merge mode is not supported 2025-04-02 20:48:30 +02:00
Pierre Le Marre 028869b192 doc: Add sections for merge modes and include mechanism 2025-04-02 20:48:30 +02:00
Pierre Le Marre 36bb4fe315 xkbcomp: Minor renaming
Use the same case for `KeySym` in the parser.
2025-04-02 19:51:11 +02:00
Pierre Le Marre 44480f7ca9 xkbcomp: Enable lists of keysyms and actions {} and {a}
Motivations:
- Follow the principle of least astonishment;
- Ensure consistency;
- Enhance the use of custom defaults;
- Facilitate the tests.

There is some ambiguity because we use `{}` to denote both an empty list of
keysyms and an empty list of actions. But as soon as we get a keysym or an
action, we know whether it is a `MultiKeySymList` or a `MultiActionList`.
So we just count the `{}` at the *beginning* using `NoSymbolOrActionList`,
then replace it by the relevant count of `NoSymbol` or `NoAction()` once the
ambiguity is solved. If not, this is a list of empties of *some* type: we
drop those empties and delegate the type resolution using `ExprEmptyList()`.
2025-04-02 19:51:11 +02:00
Pierre Le Marre e09cbe6695 symbols: Fix handling of empty keys
Before this commit, the following symbols:

```c
xkb_symbols {
  virtual_modifiers M1, M2;
  key <A> {};
  key <B> { [] };
  key.vmods = M1;
  key <C> {};
  key <D> { vmods = M2 };
};
```

would be equivalent to:

```c
xkb_symbols {
  virtual_modifiers M1,M2;
  key <B> { [ NoSymbol ] };
};
```

`<B>` entry could be skipped but is harmless. However, `<C>` and `<D>`
are missing, which would lead to the mapping resolution of `M1` and
`M2` failing.

After this commit, it is equivalent to:

```c
  virtual_modifiers M1,M2;
  key <C> { vmods = M1 };
  key <D> { vmods = M2 };
```

Empty keys are skipped entirely, but any explicit field:
- is taken into account: previously they would be skipped if there
  were no group;
- forces the key to be printed at serialization.
2025-04-02 17:39:19 +02:00
Pierre Le Marre 2e0245f8d4 xkbcomp: Enable more empty lists
- Empty `interpret`
- Empty key `type`
- Empty `indicator`

Motivations:
- Follow the principle of least astonishment;
- Ensure consistency;
- Enhance the use of custom defaults;
- Facilitate the tests.
2025-04-02 17:39:19 +02:00
Pierre Le Marre 6881fb3270 xkbcomp: Drop trailing NoSymbol and NoAction()
This brings us closer to what `xkbcomp` outputs. One should use
the explicit `VoidSymbol` instead of `NoSymbol`, in order to avoid
dropping empty levels.

This may affect keys that rely on an *implicit* key type. Example:

- Input:
  ```c
  key <> { [a, A, NoSymbol] };
  ```
- Compilation with xkbcommon \< 1.9.0:
  ```c
  key <> {
    type= "FOUR_LEVEL_SEMIALPHABETIC",
    [a, A, NoSymbol, NoSymbol]
  };
  ```

- Compilation with xkbcommon ≥ 1.9.0:
  ```c
  key <> {
    type= "ALPHABETIC",
    [a, A]
  };
  ```
2025-04-02 12:14:34 +02:00
Pierre Le Marre 7dbd257649 keymap: Use constants for Lock and Control indexes
These indexes are fixed, so there is no need to lookup their name.
2025-04-01 21:07:37 +02:00
Pierre Le Marre fbacdd98f9 test: Refactor test_multi_keysyms_actions
- Use less macros
- Add golden tests to check the compilation *result*
2025-04-01 11:32:09 +02:00
Pierre Le Marre 55e99f0a68 keymap: refactor ClearLevelInfo 2025-04-01 11:32:09 +02:00
Pierre Le Marre 343c49cca3 doc: Optional components 2025-03-30 21:03:36 +02:00
Pierre Le Marre b254cc2ea4 test: Remove empty components boilerplate 2025-03-30 20:49:57 +02:00
Pierre Le Marre 8ba5c4537f xkbcomp: Use section reference as default section name
Before this commit the following keymap:

```c
xkb_keymap {
    xkb_keycode {};
};
```

would result in (boilerplate removed):

```c
xkb_keymap {
    xkb_keycode "(unnamed)" {};
};
```

This is both useless and wasting allocation: section names are optional,
so we should just remove this default name altogether and keep it
undefined, as in the original keymap.

The situation is a bit different if there is an include, as for keymaps
created from RMLVO names. Before this commit, the following keymap:

```c
xkb_keymap {
    xkb_keycode { include "evdev+aliases(qwerty)" };
};
```

would result in (boilerplate removed):

```c
xkb_keymap {
    xkb_keycode "(unnamed)" { … };
};
```

With this commit we now follow the Xorg xkbcomp style by using the
section reference (the include string) as the *default* section name. So
the previous example would now result in:

```c
xkb_keymap {
    xkb_keycode "evdev_aliases(qwerty)" { … };
};
```

which is useful to give a hint of the original include.

Note that if the original section had a name, it would preserve it:

```c
xkb_keymap {
    xkb_keycode "test" { include "evdev+aliases(qwerty)" };
};
```

would compile to:

```c
xkb_keymap {
    xkb_keycode "test" { … };
};
```
2025-03-30 20:49:57 +02:00
Pierre Le Marre 3150bca84b xkbcomp: Make all components optional
We already accept *empty* components, such as: `xkb_compat {};`. Let’s
accept missing components as well, so that we can reduce the boilerplate
in our tests.

Note that we will still explicitly serialize empty components for
compatibility with previous xkbcommon versions and Xorg xkbcomp.
2025-03-30 20:49:57 +02:00
Pierre Le Marre 23598fa10b Enable merge mode “replace” in include statements
Previously only the merge modes “override” and “augment” were available
in include statements, using the prefix ‘+’ and ‘|’ respectively. While
on one hand `replace` include statement can be used in keymap files, on
the other hand *rules* files have no way to express the *replace* mode.

This commit enables the merge mode “replace” using the prefix `^`. This
prefix was chosen due to its similarity with the `XOR` bit operator,
which convey *mutual exclusion*.

Other candidates:
- `!` conveys some kind of higher precedence, akin to CSS `!important`.
  But it conflicts with the section header `!`, which is a token in the
  current parser. It would require special handling, not worth it. It
  also convey the meaning of negation, which is confusing.
- `&` has the advantage of not corresponding to a token in the rules
  parser. `^` seems however to stand out more and it is less likely to
  trigger erroneous comparison with `|` and `&` bit operators.
2025-03-29 20:44:04 +01:00
Pierre Le Marre 6fc6e64b56 rules: Added extended wild cards <none>, <some> and <any>
Added the following wild cards to the rules file syntax, in addition
to the current `*` legacy wild card:
- `<none>`: Match *empty* value.
- `<some>`: Match *non-empty* value.
- `<any>`: Match *any* (optionally empty) value. Its behavior does not
  depend on the context, contrary to the legacy wild card `*`.

This will enable writing much simpler rules, see [!764] for an example
of tricky rules in the `xkeyboard-config` project, that would benefit
from the new wild cards.

[!764]: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/764

The verbose wild cards are preferred to single characters:
- More intuitive: self-explanatory.
- Does not steal syntax from other token.
- Extensible syntax, should we need it.

A previous proposal used the characters (`!`, `+`, `?`) for their
similarity with the corresponding syntax of regular expressions
(negative assertion & quantifiers), in line with `*`. But `!` is not
that intuitive after all and conflict with its role as section header.
Furthermore, `+` is also used as a merge mode. Finally, nothing beats
whole short words for readability.
2025-03-29 20:09:27 +01:00
Pierre Le Marre ecde6ade17 doc: Document floating-point parsing difference with Xorg xkbcomp 2025-03-29 20:02:28 +01:00
Pierre Le Marre 500b260bcf xkbcomp: Fix parser failure on floating-point numbers
Before this commit we used `strtold`, which depends on the locale. But
the XKB syntax is fixed and uses a period as decimal separator. So ensure
the syntax is correct without relying on `strtold` and truncate the
result, as the parser does not use floating-point numbers.
2025-03-29 20:02:28 +01:00
Pierre Le Marre d1c279dadd ci: Run Linux test with a non-US locale
Hopefully this will enable us to catch locale-related bugs.
2025-03-29 20:02:28 +01:00
Pierre Le Marre d3188d3379 test: Enable using the user locale
This enable to test different locales easily. Note that the logging
tests requires resetting the locale back to `C`.
2025-03-29 20:02:28 +01:00
Pierre Le Marre d7e112febb registry: Added support for libxml2 2.14+
`libxml2-2.14+` now disallows parsing trailing `NULL` bytes, so don’t.
This is backward-compatible with previous versions of the library.
2025-03-29 19:53:27 +01:00
Pierre Le Marre cc95f2171a xkbcomp: Fix whichGroupState serialization
This indicator field was previously looked up in the wrong table,
resulting the erroneous serialization `(null)`.
2025-03-28 11:41:28 +01:00
Pierre Le Marre 9a5547ce58 symbols: Fix leak in HandleSymbolsDef 2025-03-28 11:05:45 +01:00
Pierre Le Marre 955eef14bd tools: Ensure to honor user locale
This is just good practice, but it is also necessary if we want to
facilitate the discovery of issues with locales in libxkbcommon.
2025-03-28 09:26:13 +01:00
Pierre Le Marre daee709d83 test: Add xkbcli compile-keymap --kccgst tests 2025-03-27 21:32:43 +01:00
Pierre Le Marre 47f7f93c3d test: Check mutually exclusive tools options 2025-03-27 21:32:43 +01:00
Pierre Le Marre f01f0d638e test: Check more tools options combinations 2025-03-27 21:32:43 +01:00
Pierre Le Marre 140e2cdd6e test: Make tools options parsing checks faster 2025-03-27 21:32:43 +01:00
Pierre Le Marre 275ffa668e tools: Make --kccgst xkbcli-compile-keymap option public
The new public option `--kccgst` enables to display the result of RMLVO
resolution to KcCGST components.

This option has the same function than `setxkbmap -print`. This is particularly
useful for debugging issues with the rules.

Before this commit it was a private API. This commit enables us to remove
the *internal* version of `xkbcli-compile-keymap`.
2025-03-27 21:32:43 +01:00
Pierre Le Marre 8e92f25e8e rules: Added xkb_components_names_from_rules()
This is mainly for debugging purposes and to enable displaying KcCGST
values from RMLVO resolution in `xkbcli compile-keymap --kccgst`.
2025-03-27 21:32:43 +01:00
Pierre Le Marre f3a4eeaa41 symbols: Improve keysym parsing 2025-03-26 23:12:12 +01:00
Pierre Le Marre e5401b0781 symbols: Improve Modmap parsing
Parse, dont’t validate: ensure *at parsing* that `modifier_map`
definitions use a list of keys and keysyms.

This enables to remove the redundant `ExprResolveKeySym` and have keysym
parsing exclusively in handled in `parser.y`.
2025-03-26 23:12:12 +01:00
Pierre Le Marre 920b3d6c2e ci: Revert workaround unavailable gitlab.freedesktop.org
This reverts commit 2b3ffb6292.
2025-03-26 11:46:28 +01:00
Pierre Le Marre 70d11abd78 messages: Add file encoding and invalid syntax entries
Added:
- `XKB_ERROR_INVALID_FILE_ENCODING`
- `XKB_ERROR_INVALID_RULES_SYNTAX`
- `XKB_ERROR_INVALID_COMPOSE_SYNTAX`

Changed:
- `XKB_ERROR_INVALID_SYNTAX` renamed to `XKB_ERROR_INVALID_XKB_SYNTAX`.
2025-03-26 08:00:54 +01:00
Pierre Le Marre fe0d374271 registry: Fix typo in variable declaration 2025-03-18 21:08:03 +01:00
Pierre Le Marre e856190957 xkbcomp: Fix keycodes bounds
- Refactor to check conflicts first for the key names and then for the
  keycodes. This seems more useful for the user and enable further
  memory optimizations.
- Do not allocate until we are sure to add the keycode. The bounds are
  only updated afterwards, so the call to `FindKeyByName` should be
  more efficient.
- Fixed keycodes bounds not shrunk correctly when an existing keycode
  is overridden.
- Do not prepare keyname strings for logging if we are not going to
  use them.
2025-03-18 21:08:03 +01:00
Pierre Le Marre 2b3ffb6292 ci: Workaround unavailable gitlab.freedesktop.org
gitlab.freedesktop.org is currently migrated to a new infrastructure,
so use a release tarball of xkeyboard-config instead of cloning its repo.

NOTE: This commit should be reverted once the migration is completed.
2025-03-17 07:41:52 +01:00
Pierre Le Marre 4e90cb9c6b xkbcomp: Improve logging of virtual modifiers
When logging about virtual modifier *explicit* mappings, we should
always use only real modifiers or hexadecimal numbers to print the mask.

Consider:

```
virtual_modifiers M1, M2=0x200, M2=0x400;
```

Before this commit we would get the following warning:

```
WARNING: Virtual modifier M2 defined multiple times; Using M2, ignoring M1
```

while we would prefer the less confusing:

```
WARNING: Virtual modifier M2 defined multiple times; Using 0x400, ignoring 0x200
```
2025-03-17 07:41:52 +01:00
Pierre Le Marre b346508187 Bump version to 1.8.1 and update changelog 2025-03-12 00:24:11 +01:00
Pierre Le Marre 02b3224483 registry: Use safer contextual libxml2 functions
Avoid using functions depreacted in 2.13 and 2.14 libxml releases.

Follow-up of: 5f1b06b749.
2025-03-12 00:14:50 +01:00
Pierre Le Marre 311c8424c4 meson: Fix libxml2 header test 2025-03-12 00:14:50 +01:00
Ran Benita 9953d9f04b xkbcomp/ast-build: fix possible UB in expr AST node allocations (#659)
The expression AST constructors all return `ExprDef *`. `ExprDef` is a
union of all expr types. As a memory optimization, instead of allocating
`sizeof(ExprDef)`, we only allocate the size of the actual type (e.g.
`sizeof(ExprBinary)`) which is sometimes smaller than `sizeof(ExprDef)`.
This is probably undefined behavior, and gcc (with optimization turned
on) complains about it, for example:

src/xkbcomp/ast-build.c:69:23: warning: array subscript ‘ExprDef[0]’ is partly outside array bounds of ‘unsigned char[24]’ [-Warray-bounds=]

Since it doesn't save that much memory, drop this optimization.

Fix #292.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-03-10 21:58:05 +02:00
Julian OrthandPierre Le Marre cb3565b1a8 keymap: Fix segfault due to invalid group wrapping
The modular arithmetic is incorrect for negative values, e.g. for
num_groups = 1. It triggers a segfault for the following settings:

- layouts count (per key or total) N: `N > 0`, and
- layout index n: `n = - k * N` (`k > 0`)

% returns the *remainder* of the division, not the modulus (see C11
standard 6.5.5 “Multiplicative operators”: a % b = a - (a/b)*b. While
both operators return the same result for positive operands, they do
not for e.g. a negative dividend: remainder may be negative (in the
open interval ]-num_groups, num_groups[) while the modulus is always
positive. So if the remainder is negative, we must add `num_groups` to
get the modulus.

Fixes: 67b03cea ("state: correctly wrap state->locked_group and ->group")
Signed-off-by: Julian Orth <ju.orth@gmail.com>
Co-authored-by: Julian Orth <ju.orth@gmail.com>
Co-authored-by: Pierre Le Marre <dev@wismill.eu>
2025-03-09 00:33:32 +01:00
Pierre Le Marre 04220319bb doc: Warn about the options order
Options are always applied depending of their order in the relevant
rules files, independently of their order in the relevant RMLVO config.

Since this is counter-intuitive (e.g. when using `xkbcli`), let’s
highlight this in the documentation.
2025-03-08 20:20:54 +01:00
dependabot[bot] 361b0b0991 build(deps): bump dawidd6/action-download-artifact from 8 to 9
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 8 to 9.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v8...v9)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-08 16:42:58 +01:00
Pierre Le Marre b274440268 doc: Fix cool URIs 2025-02-16 18:28:02 +01:00
Pierre Le Marre aa2928fc6b doc: Fix link to modules
It’s a breaking change of Doxygen. Now it’s called “topics”.
2025-02-15 16:37:46 +01:00
Pierre Le Marre 548fc3556c test: Fix inversion of expected/got in log test 2025-02-14 16:47:46 +01:00
Pierre Le Marre c9b0c527c7 interactive-wayland: Fix int casts 2025-02-14 16:28:36 +01:00
Pierre Le Marre e18922661c clang-tidy: Miscellaneous fixes 2025-02-14 16:28:36 +01:00
Pierre Le Marre 5cfd36ab3a tools: Do not load names from the environment by default
Our tools are debugging tools and as such we need to have complete
control to be able to reproduce setups. This is not currently the case,
as we do not use `XKB_CONTEXT_NO_ENVIRONMENT_NAMES` by default nor can
we set it.

So it is very easy to forget about the various `XKB_DEFAULT_*`
environement variables for the default RMLVO values, then to get puzzled
by unexpected results.

Added to that, these environment variables do not work correctly in
`xkbcli-compile-xeymap`: calling the tool without RMLVO values will
use these variables only if the RMLVO values are set explicitly empty or
if the various *constants* `DEFAULT_XKB_*` are empty. This is unexpected,
as the environment variables should *always* be used unless:

- `XKB_CONTEXT_NO_ENVIRONMENT_NAMES` is used (not the case here);
- the variable is empty; in this case the constants `DEFAULT_XKB_*` are
  used.

Fixed by the following *breaking change*: make the tools use
`XKB_CONTEXT_NO_ENVIRONMENT_NAMES` *by default*, unless the new
`--enable-environment-names` option is used.

We also make `rmlvo` incompatible with `--enable-environment-names` for
now in the public tool, as else it requires a private API.
2025-02-14 15:17:26 +01:00
Pierre Le Marre 5ef19bcf12 xkbcomp: Fix incorrect memory comparison
Spotted by clang-tidy:

```
../src/keymap-priv.c:146:16: warning: comparing object representation of
                             type 'union xkb_action' which does not have
                             a unique object representation; consider
                             comparing the members of the object manually
                             [bugprone-suspicious-memory-comparison]
````

Indeed, from “EXP42-C. Do not compare padding data”[^1]:

> unnamed members of objects of structure and union type do not participate
> in initialization. Unnamed members of structure objects have indeterminate
> representation even after initialization.

Fixed by using a dedicated comparison function for `union xkb_action`.

[^1]: https://wiki.sei.cmu.edu/confluence/display/c/EXP42-C.+Do+not+compare+padding+data
2025-02-14 14:39:38 +01:00
Pierre Le Marre 2c10e50c9a tools: Fix compile-keymap default KcCGST values
Values may be read from the environment.
2025-02-14 10:55:18 +01:00
Pierre Le Marre 350931add1 xkbcomp: Fix compat group index 2025-02-12 18:54:27 +01:00
Pierre Le Marre f2dd030220 xkbcomp: Fix LED index int type 2025-02-12 18:54:27 +01:00
Pierre Le Marre 2d111bbe5d xkbcomp: Fix possible overflow in numbers parser 2025-02-12 18:54:27 +01:00
Pierre Le Marre a4038a4770 Miscellaneous int types fixes 2025-02-12 18:54:27 +01:00
Pierre Le Marre e3108182bf Fix int casts related to layout index
- XkbWrapGroupIntoRange
- State
2025-02-12 18:54:27 +01:00
Pierre Le Marre 14a816e58c xkbcomp: Fix int cast 2025-02-12 18:54:27 +01:00
Pierre Le Marre 6c9806ae0e xkbcomp: Fix ExprResolveMaskLookup error message 2025-02-12 18:54:27 +01:00
Pierre Le Marre 558447d850 xkbcomp: Explicit vars initialization
The `Resolve*` functions do not always initialize the parameters
that they can modify, so it is safer to always initialize them at the
call site.
2025-02-12 18:54:27 +01:00
Pierre Le Marre 97698fca24 xkbcomp: Use explicit int sizes for Expr resolution 2025-02-12 18:54:27 +01:00
Pierre Le Marre 2d94da3db7 xkbcomp: Fix the int type of ExprInteger
Avoid implicit conversion from `int64_t`.
2025-02-12 18:54:27 +01:00
Pierre Le Marre befa0cdd27 test: Check integers syntax 2025-02-12 18:54:27 +01:00
Pierre Le Marre 4cef822aa7 test: Check masks syntax 2025-02-12 18:54:27 +01:00
Pierre Le Marre 3a0b77f029 xkbcomp: Fix parser headers 2025-02-12 18:13:06 +01:00
Pierre Le Marre 16e3e3cbe5 utils: Fix missing headers 2025-02-12 18:13:06 +01:00
Pierre Le Marre afb9c1352e Update .clang-tidy 2025-02-12 18:13:06 +01:00
Pierre Le Marre ce9bcbe06c scripts: Rename keysyms-related files
Previous names were too generic. Fixed by using explicit names and add
the `.py` file extension.
2025-02-11 08:09:27 +01:00
Ran Benita 945c5e3bb2 Add clangd configuration file
It mostly works by default, as long as the meson build directory is
called "build". Just needs a couple of project-specific tweaks.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-10 00:24:53 +02:00
Ran Benita bb5e464e53 xkbcomp/expr: remove comment on ExprResolveIntegerLookup
What it says mostly no longer holds, I think it's more confusing than
helpful now.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-07 20:55:25 +02:00
Ran Benita aa3e4c71c3 xkbcomp/expr: remove unused ExprResolveKeyCode
This function was added in commit
4e22851141. But that commit also changed
the grammar:

-KeyNameDecl    :       KeyName EQUALS Expr SEMI
+KeyNameDecl    :       KeyName EQUALS KeyCode SEMI

i.e. while before you could write

    <AE01> = 9+1;

now this is a syntax error, an integer literal is expected. I'm not sure
if it was intended to remove this ability. In any case, this rendered
`ExprResolveKeyCode` useless since there's no longer an expression to
evaluate, and after some refactoring it went unused.

Even if we choose to restore Expr here, I don't see a reason for the
specialized function over `ExprResolveInteger` except the type (which we
should probably widen from int to int64_t...). So remove it.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-07 20:55:25 +02:00
Ran Benita a4d782c783 xkbcomp/ast: remove ExprCommon
It's now empty and no longer serves a purpose.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-07 14:08:23 +02:00
Ran Benita 9d7eb8494b xkbcomp/ast: combine expr_value_type into stmt_type
This field is a funky attempt at type inference, or perhaps some
optimization? Anyway, after careful examination I conclude it serves no
purpose except specifying the type of a literal
(string/integer/float/boolean/keyname) when `STMT_EXPR_VALUE` (i.e.
literal).

Remove it and replace `STMT_EXPR_VALUE` with specific statement types
for each literal type.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-07 14:08:23 +02:00
Ran Benita d9fc01b393 xkbcomp/ast: combine expr_op_type into stmt_type
It's better to have a single AST type enum.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-07 14:08:23 +02:00
Ran Benita 635c48f83c xkbcomp: remove unused EXPR_TYPE_ACTION
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-07 14:08:23 +02:00
Ran Benita a5c2c746e5 Fix a few direct modifications to generated files
Accidentally modified generated files in a couple of recent changes.
Sync the templates.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-06 14:18:42 +02:00
Ran Benita f4e9528033 xkbcomp/scanner: avoid unneeded strdup of IDENT tokens
The allocation is immediately discarded, either turned into a keysym or
an atom. So use an sval slice into the input string instead strdup'ing.

memusage ./release/bench-compile-keymap --iter=1000 --layout us,de --variant ,neo

Before:

    Memory usage summary: heap total: 534063576, heap peak: 581022, stack peak: 18848
            total calls   total memory   failed calls
     malloc|   11240525      291897104              0
    realloc|    1447657      192307328              0  (nomove:37629, dec:0, free:0)
     calloc|     430573       49859144              0
       free|   13993903      534063576

After:

    Memory usage summary: heap total: 506839909, heap peak: 581022, stack peak: 18960
            total calls   total memory   failed calls
     malloc|    8016419      264673437              0
    realloc|    1447657      192307328              0  (nomove:37278, dec:0, free:0)
     calloc|     430573       49859144              0
       free|   10769797      506839909

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 23:59:31 +02:00
Ran Benita 113ac30440 meson: link tests and benches against shared library, not static library
This makes the tests, and especially benches, more realistic, since
xkbcommon is almost always used as a shared library.

Also significantly reduces the build time with LTO enabled (for me, from
90s to 30s).

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 18:33:33 +02:00
Ran Benita 2fb1b2e124 Make XKB_EXPORT do dllexport on Windows
Without this, the test-internal libraries (which don't use the .def file
because they contain additional private symbols) can't be made shared.
But it also makes sense for consistency with GCC.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 18:33:33 +02:00
Ran Benita a380ba5218 Move XKB_EXPORT to headers
The Windows dllexport annotation wants to be on the declarations, not
the definitions.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 18:33:33 +02:00
Ran Benita 7e918f2edc tools: add Windows compat for S_ISFIFO
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 18:33:33 +02:00
Ran Benita cfe53fe471 tools: add Windows include for execv
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 18:33:33 +02:00
Pierre Le Marre b5cde5c1b5 doc: Improve README 2025-02-05 14:17:44 +01:00
Pierre Le Marre a93fd7dbe8 doc: Fix Doxygen config
- Use classical layout without a side bar, which is the default in
  recent Doxygen versions.
- Use Github-style heading IDs: more user-friendly and stable.
- Enable the Javascript-base search engine.
- Generate `sitemaps.xml`.
- Fix CSS width incompatible with small devices.
2025-02-05 14:17:44 +01:00
Pierre Le Marre c051d0aeec Replace include guards by #pragma once (again)
Follow-up of df2322d70c.
2025-02-05 14:16:08 +01:00
Ran Benita df2322d70c Replace include guards by #pragma once
We currently have a mix of include headers, pragma once and some
missing.

pragma once is not standard but is widely supported, and we already use
it with no issues, so I'd say it's not a problem.

Let's convert all headers to pragma once to avoid the annoying include
guards.

The public headers are *not* converted.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 14:50:02 +02:00
Ran Benita d75702ba9c utils: remove ifdefs for some ancient or obscure compilers
If someone needs this, they can let us know...

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 12:18:58 +02:00
Ran Benita 4601b20e17 meson: fix typo
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 12:18:58 +02:00
Ran Benita 42dd1ca4b4 meson: suppress MSVC C4100 unreferenced formal parameter warnings
Equivalent to `-Wno-unused-parameter` which we use.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 12:18:09 +02:00
Ran Benita 02456c14ff xkbcomp/keymap: avoid some allocations in ApplyInterpsToKey
Reuse the darray.

memusage ./release/bench-compile-keymap --iter=1000 --layout us,de --variant ,neo

Before:

    Memory usage summary: heap total: 552866360, heap peak: 581022, stack peak: 18848
            total calls   total memory   failed calls
    realloc|    2035244      211110112              0  (nomove:37629, dec:0, free:0)

After:

    Memory usage summary: heap total: 534063576, heap peak: 581022, stack peak: 18848
            total calls   total memory   failed calls
    realloc|    1447657      192307328              0  (nomove:37629, dec:0, free:0)

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 12:05:23 +02:00
Ran Benita 7e84c84500 xkbcomp/scanner: avoid extra copies for keynames, keywords, identifiers
The tokens don't have escapes so no need to use the `buf` for them.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 12:04:57 +02:00
Ran Benita 43f6036d31 xkbcomp/keywords: don't require C string for keyword lookup
Needed for next commit, but good regardless. No noticeable effect on
performance.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 12:04:57 +02:00
Sertonix 4b498b6954 ci: fix link to NEWS file in releases
Fixes 737706fe83 doc: Use towncrier to handle release notes
2025-02-05 12:01:54 +02:00
Ran Benita e120807bde Update license notices to SDPX short identifiers + update LICENSE
Fix #628.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 01:24:02 +02:00
Ran Benita 63b488af32 ci: remove mention of tarball for github-release workflow
We no longer publish tarballs.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 00:23:59 +02:00
Ran Benita bb78ed9061 RELEASING: fix the push tag command
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-05 00:23:59 +02:00
Pierre Le Marre 76740e0c45 Bump version to 1.8.0 and update changelog 2025-02-04 23:47:00 +02:00
Pierre Le Marre 80233f96f1 tests: Fix env variables messing tools arguments checks 2025-02-04 23:47:00 +02:00
dependabot[bot] 3e26bc43f8 build(deps): bump dawidd6/action-download-artifact from 7 to 8
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 7 to 8.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v7...v8)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-03 11:27:12 +02:00
Ran Benita 1f43670337 xkbcomp: rework KeysymList AST representation
This is similar to the previous commit, for keysym lists.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-01 09:39:59 +01:00
Ran Benita 39689867e6 xkbcomp: rework ActionList AST representation
The AST is heavily based on intrusive lists for representing lists, but
actions are an exception, instead using darray. I don't see any reason
for this; it ends up allocating more, and we don't especially need a
flat array for this.

Change it to use the familiar linked-list style.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-02-01 09:39:59 +01:00
Pierre Le Marre 848ecacfde tools: Enable Compose file positional argument and piping
Also deprecate the `--file` flag as redundant.
2025-01-30 14:13:29 +01:00
Ran Benita 6e97f57e0a scanner: speed up token position -> location using a cache
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-30 10:50:53 +02:00
Ran Benita 26807a90c6 scanner: compute token line/column lazily on errors
The scanner functions are hot, and the line/column location tracking is
quite expensive. We only use it for errors, which don't need to be fast,
because we bail if there are too many; and for warnings, which are
usually not shown by default. So only keep the token start pos, and
compute the line/column lazily from that. This will also allow some
further improvements ahead.

bench/rulescomp
before: compiled 1000 keymaps in 1.669028s
after:  compiled 1000 keymaps in 1.550411s

bench/compose:
before: compiled 1000 compose tables in 2.145217s
after:  compiled 1000 compose tables in 2.016044s

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-30 10:50:53 +02:00
Pierre Le Marre 3249223f8e test: Add check for keymap and compose compilation logs 2025-01-30 09:37:34 +01:00
Pierre Le Marre 502e9e5bff xkbcomp: Add stricter bounds for keycodes and levels
Our current implementation uses continuous arrays indexed by keycodes
and levels. This is simple and good enough for realistic keymaps.
However, they are allowed to have big values that will lead to either
memory exhaustion or a waste of memory (sparse arrays).

Added the much stricter upper bounds `0xfff` for keycodes[^1] and 2048
for levels[^2], which should still be plenty enough and provides stronger
memory security.

[^1]: Current max keycode is 0x2ff in Linux.
[^2]: Should be big enough to satisfy automatically generated keymaps.
2025-01-29 17:00:29 +01:00
Ran Benita 307ce5a7fc test/compose: reduce quickcheck iterations
They're a *bit* too slow for interactive test runs when running in
debug+sanitizers.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-29 10:55:37 +02:00
Pierre Le Marre ff2ac49323 tests: Fix deprecated keysyms in Compose data
The data set is big enough so we can just drop most sequences with
deprecated keysyms and fix most keysyms an alternative non-deprecated
name.

We keep a handful of them for testing purpose.
2025-01-29 10:51:03 +02:00
Pierre Le Marre c85c9bdcf2 symbols: Allow levels with different keysyms and actions counts
Contrary to groups, there is no reason for levels to restrict the same
count of keysyms and actions.
2025-01-29 06:38:53 +01:00
Pierre Le Marre 27ac30b28c symbols: Normalize levels by dropping NoSymbol & NoAction 2025-01-29 06:38:53 +01:00
Pierre Le Marre c12df47746 tests: Reactivate the Python test suite for Linux 2025-01-28 19:45:25 +01:00
Pierre Le Marre bcb16d299c tools: Miscellaneous enhancements 2025-01-28 19:45:25 +01:00
Pierre Le Marre b168623cb3 tools: Enable using keymap file as a positional argument 2025-01-28 19:45:25 +01:00
Pierre Le Marre 313001cedc tools: Add --keymap alias and enable loading keymap files
Add `--keymap` as a more intuitive alias to `--from-xkb`; it also makes
it consistent with `interactive-evdev`. It optionally accepts a keymap
file path; if the argument is empty or `-` then the keymap is read from
`stdin`.
2025-01-28 19:45:25 +01:00
Pierre Le Marre ae473f9fa1 tools: Fix return code of compile-keymap
Previously when using `--keymap` we mistakenly returned a boolean so
that `true` (resp. false) translated to `EXIT_FAILURE` (resp.
`EXIT_SUCCESS`).

Fixed by returning the proper return code integer.
2025-01-28 19:45:25 +01:00
Pierre Le Marre af5704dc46 state: Fix empty level not breaking latches
In essence empty levels are levels with just a `NoSymbol` keysym and
a `NoAction()`, which breaks latches.

Fixed regression introduced in fdf2c52597.

Added tests also for the case where the keycode is unknown.
2025-01-27 18:02:46 +01:00
Pierre Le Marre 7a08b145a7 tests: Modifier and group latch
- Added a big bunch of tests for modifier latch. No yet exhaustive,
  but should cover the most usual use cases.
- Added missing test cases for breaking the group latch. Ideally, more
  tests should be added to match the coverage of modifiers latches.

WARNING: it is ambiguous what prevents a latch when multiple keys are
         *simultenously* operated together. We currently assuming that
         any action that is not identical to the considered latch
         prevents it.
2025-01-27 18:02:46 +01:00
Pierre Le Marre a5bdb95491 tools: Fix signed literal used as a mask 2025-01-24 20:22:59 +01:00
Pierre Le Marre 4ac222632a keysyms: Check clashes between keysyms names and keywords
Due to how our parser is implemented, keysyms names that are also valid
keywords require special handling.

Added a check for these clashes in the keysym generator. The only
current clash, `section`, is already handled. Note that it means that
e.g. `section`, `Section` and `sEcTiOn` all parse to the same keysym.
This side effect is fine here, because *currently* there is no other
keysym that clashes with any possible of the case variation of `section`.
But in order to be extra cautious, we now test thoses clashes too.

Hopefully we will never have a clash again, but while it is unlikely
that we modify the keywords, the keysyms are not a frozen set.
2025-01-24 07:29:58 +01:00
Pierre Le Marre 7c124fd921 rules: Fix incrementing a variable in a complex condition 2025-01-24 00:24:57 +01:00
Pierre Le Marre 818b1b6b22 symbols: Simplify GetGroupIndex call 2025-01-24 00:24:57 +01:00
Pierre Le Marre a2c9b6b44f x11: Make assumption explicit 2025-01-24 00:24:57 +01:00
Pierre Le Marre fc3c8cfd16 Replace STATIC_INSERT with official C11 static_assert 2025-01-24 00:24:57 +01:00
Pierre Le Marre 3ee082516c clang-tidy: Fix possible leak 2025-01-24 00:24:57 +01:00
Pierre Le Marre 357ab0cb11 clang-tidy: Fix missing default case in switch statement 2025-01-24 00:24:57 +01:00
Pierre Le Marre 842497d916 clang-tidy: Fix implicit or incorrect integer casts 2025-01-24 00:24:57 +01:00
Pierre Le Marre 5389a31e0b clang-tidy: Use memcpy instead of the insecure strcpy 2025-01-24 00:24:57 +01:00
Pierre Le Marre b76617e6c3 clang-tidy: Various fixes related to IO 2025-01-24 00:24:57 +01:00
Pierre Le Marre 53b3f446ce clang-tidy: Fix headers includes 2025-01-24 00:24:57 +01:00
Pierre Le Marre 0c94082730 clang-tidy: Macro arguments should be enclosed in parentheses 2025-01-24 00:24:57 +01:00
Pierre Le Marre c6b29f9f88 Add .clang-tidy 2025-01-24 00:24:57 +01:00
Pierre Le Marre 88a3d3c285 tests: Refactor buffercomp
Move tests into proper functions and log tests names.
2025-01-24 00:05:34 +01:00
Pierre Le Marre b1e1aae64f xkbcomp: Fix memory leak when extra content after keymap
It triggers with e.g.:

```
xkb_keymap { xkb_keycodes { }; };
}; // erroneous
```
2025-01-24 00:05:34 +01:00
Pierre Le Marre 709027ec81 symbols: Fix inconsistent error handling
Currently the following keymap triggers a critical error (invalid
`vmods`) only for the second key statement, while it should handle both
equally.

```
xkb_keymap {
    xkb_keycodes { <> = 9; };
    xkb_types { };
    xkb_compat { };
    xkb_symbols {
        key <> { vmods = [], repeats = false };
        key <> { repeats = false, vmods = [] };
    };
};
```

Fixed by parsing the whole symbols body and failing if any error was found.
2025-01-24 00:05:34 +01:00
Pierre Le Marre ec2915fefc symbols: Fix a possible null pointer deference
Introduce a new Expression type, `EXPR_EMPTY_LIST`, to avoid the
ambiguity between action and keysym empty lists. Two alternatives were
rejected to keep the semantics clear:

- Using `EXPR_KEYSYM_LIST`: because we would end up accepting an empty
  keysym list while processing actions.
- Using NULL: convey no info and is hazardous.
2025-01-24 00:05:34 +01:00
Pierre Le Marre 9b7466cf40 atom: Fix missing return value in atom_intern
Ensure all control paths return a value.
2025-01-21 20:04:17 +01:00
Pierre Le Marre 425dc63474 Fix some implicit integers casts 2025-01-21 20:04:17 +01:00
Pierre Le Marre 9ef45dc58f Fix incompatible pointer types with enums
The enum casts can possibly lead to unaligned access.

The warnings trigger in the Windows CI but not on Linux. One may use
`-fshort-enums` with gcc in order to trigger the errors.
2025-01-21 20:04:17 +01:00
Pierre Le Marre b1aecd470c actions: Fix SwitchScreen screen value range
Currently we accept values of -255..255 while parsing the screen value
of `SwitchScreen` actions`, but then we silently cast it against `int8_t`,
i.e. in range -128..127.

We actually do as xkbcomp, but this seems a bug because the target storage
is a `char`. Let’s simply raise a parse error if the value does not fit
in our type.
2025-01-21 19:12:44 +01:00
Pierre Le Marre 4b0209df72 bench: Fix embedded directive within macro arguments
Embedding a directive within macro arguments has undefined behavior.
2025-01-21 14:29:26 +01:00
Ran Benita e74e9cbc58 meson: change warning level 2 -> 3
Who doesn't like more warnings? :)

In gcc/clang, 3 adds -Wpedantic, which sucks, so we turn it off. So no
difference there.

On msvc, it turns on "level 4 informational warnings that aren't off by
default" and is recommended[0].

[0] https://learn.microsoft.com/en-us/cpp/build/reference/compiler-option-warning-level

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-21 14:17:35 +01:00
Ran Benita 2f0bc3e0a0 meson: show compiler id in summary
Useful for seeing whether the compiler is gcc, clang, etc.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-21 14:17:35 +01:00
Ran Benita 38557e5b18 meson: remove explicit b_lundef=true
It is already the default.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-21 14:17:35 +01:00
Ran Benita 26069b7695 xkbcomp/parser: silence a set but unused warning
```
libxkbcommon.so.0.7.0.p/parser.c:1632:9: warning: variable '_xkbcommon_nerrs' set but not used [-Wunused-but-set-variable]
 1632 |     int yynerrs = 0;
```

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-21 14:17:35 +01:00
Ran Benita 8c07140349 test/keysym: fix comparison of integers of different signs
```
../test/keysym.c:320:9: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
  320 |         U16_APPEND(cp_string, offset, ARRAY_SIZE(cp_string), cp, isError);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/unicode/utf16.h:396:47: note: expanded from macro 'U16_APPEND'
  396 |     } else if((uint32_t)(c)<=0x10ffff && (i)+1<(capacity)) { \
      |                                          ~~~~~^ ~~~~~~~~
```

Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-21 14:17:35 +01:00
Ran Benita 91e58f0e4d test/registry: remove unused function
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-21 14:17:35 +01:00
Ran Benita 2a60432ece test/xvfb-wrapper: remove unused code
Signed-off-by: Ran Benita <ran@unusedvar.com>
2025-01-21 14:17:35 +01:00
Pierre Le Marre db5e6d3030 registry: Refactor to avoid hazardous casts
Inline `rxkb_object_unref` for each type and remove the `destroy` field.
2025-01-21 13:06:06 +01:00
Pierre Le Marre c0762c4972 keymap: Fix buffer unnecessary written twice
When dumping the keymap, we first try to write to the buffer and get
the min size requirement. Then we reallocate if necessary. However, we
should not write it again if we got enough space previously!
2025-01-21 05:27:51 +01:00
Pierre Le Marre ddb731cebc bench: Add xkb_keymap_get_as_string
Based on the `compile-keymap` benchmark.
2025-01-21 05:27:51 +01:00
Pierre Le Marre 24fe4bac41 Fix undefined behaviours with NULL pointer
Issues detected by the sanitizers:
- fix indexing NULL pointer
- fix zero offset to NULL pointer
2025-01-21 05:27:51 +01:00
Pierre Le Marre 454b18f54f ci: Enable sanitizers for Linux
Since `asan` and `ubsan` overlap Valgrind, we run separate pipelines
for each.

Enable only for gcc for now, as we could not make it work with clang.
2025-01-21 05:27:51 +01:00
Pierre Le Marre 8d0df44a95 text: Ensure mod mask can always be printed entirely 2025-01-17 21:59:04 +01:00
Pierre Le Marre b0d9a79049 vmods: Fix explicit vmods not dumped 2025-01-17 21:59:04 +01:00
Dimitry Andric 11140ded91 Use test map for checking --version-script, instead of full map
Various problems can occur when using the full `xkbcommon.map` file when
checking whether the `--version-script` linker option works in
`meson.build`.

For instance, newer linkers typically complain about non-existing
symbols, so in commit ebe4157 `--undefined-version` was added to work
around that. But then in commit 1d8a25d6 another workaround needed to be
added for older linkers.

It is better to use a minimalistic linker script for testing instead.
The other workarounds can then be removed.
2025-01-17 21:53:12 +01:00
Pierre Le Marre c7fdf50620 Use portable integer literal suffixes 2025-01-17 20:56:59 +01:00
Pierre Le Marre e3e449988f Fix missing or incorrect integer literal suffixes
The correct suffix is required in order to have the expected value
in a portable way.
2025-01-17 20:56:59 +01:00
3fdd822da9 state: Fix mods not being independently cleared (#584)
The modifiers filters should ensure minimal interaction between them,
but currently the Latch mod filters are overzealous and mess with the
mods from other filters set to be cleared, resulting in some modifiers
permanently set.

Fixed by clearing mods properly with `OR` rather than direct setting
of `state::clear_mods`.

While we are at it, `state::set_mods` should be `OR`ed as well. This
should not have any impact for now, but this is more future-proof.

Fixes #583

Co-authored-by: Jules Bertholet <julesbertholet@quoi.xyz>
Co-authored-by: Pierre Le Marre <dev@wismill.eu>
2025-01-16 08:21:29 +01:00
Pierre Le Marre dfa286b260 compat: Fix Interp & LED merge modes 2025-01-15 17:22:45 +01:00
Pierre Le Marre d43bb95555 symbols: Fix key symbols/actions merge
- Fixed field for defined keysyms/actions
- Fixed regression introduced by fdf2c52597
2025-01-15 13:35:56 +01:00
Pierre Le Marre 7036e46cd8 symbols: Add tests for key merge modes (keysyms/actions)
This commit adds tests for merging various key configurations:

- With/without keysyms/actions
- Single/multiple keysyms/actions per level

We test all the merge modes for including a map (global) as well as
directly on the keys (local):

- default (global: include, local: implicit)
- augment
- override
- replace

The tests data are generated with:

- A Python script `scripts/update-merge-modes-tests.py` for keycodes
  and symbols data. Use `--debug` for extra comments to help debugging.
  The script can optionally generate C headers for alternative key
  sequence tests, that were used before implementing golden tests.
  The latter tests are not used anymore (duplicate with golden tests)
  but their generator is kept for now, as they can still be useful for
  debugging or writing similar tests.
- The `merge-modes` test generates its own keymap files for golden
  tests, using: `build/test-merge-modes update`. It can also replace
  them with the obtained output rather than the expected one using
  `build/test-merge-modes update-obtained`, which is very useful for
  debugging.
2025-01-15 13:35:56 +01:00
Pierre Le Marre 6c6dbf32c1 state: Fix LatchGroup action with latchToLock disabled
A `LatchGroup` action with the `latchToLock`` option disabled can apply
its latch effect multiple times.
2025-01-14 12:49:16 +01:00
Pierre Le Marre 325ba10ebb state: Fix LEDs driven by the group state
When the indicator field `whichGroupState` is set to `Base` or `Latched`,
the group masks should be considered only as boolean values as per the
XKB specification.
2025-01-14 12:16:58 +01:00
Pierre Le Marre 7d08bf430b state: Add test for LEDs driven by the group state 2025-01-14 12:16:58 +01:00
Pierre Le Marre 93b75c637f x11: Keep level when the keysym is undefined but not the action
When getting the keymap from X11, the following:

```
key <AD01> { actions=[SetGroup(2)] };
```

is currently converted to:

```
key <AD01> { };
```

This commit fixes dropping a defined action when the keysym is undefined
2025-01-11 11:05:53 +01:00
Pierre Le Marre d523fd5619 test: Do not include extra numpad in the base one
This allow to load only the minimal key types required by the protocol:
`basic+numpad`.
2025-01-11 11:03:31 +01:00
Pierre Le Marre 0dc39650e7 test: Declare virtual modifiers explicitly
This is required in order to use the sections in isolation.
2025-01-11 11:03:31 +01:00
Pierre Le Marre b6acdc30a0 xkbcli list: Fix duplicate variants 2025-01-10 20:36:34 +01:00
Pierre Le Marre d706e64998 scripts: Fix formatting with Ruff 0.9
See: https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md#090
2025-01-10 14:22:32 +01:00
Pierre Le Marre d2eb8601b8 doc: Mark $HOME/.xkb/ as a deprecated location for user configuration
`$HOME/.xkb` was supported before the addition of the XDG directories.
Removal of the functionality is just going to cause potential breakage
for now good technical reason.

See https://specifications.freedesktop.org/basedir-spec/latest/ for
further details.
2025-01-07 08:09:10 +01:00
Pierre Le MarreandPeter Hutterer 16eff2221d doc: Add debugging page and warning about session restart
Co-authored-by: Pierre Le Marre <dev@wismill.eu>
Co-authored-by: Peter Hutterer <peter.hutterer@who-t.net>
2025-01-07 08:09:10 +01:00
Pierre Le Marre bf03b4b5a4 symbols: Parse empty key
The following syntax does not parse in xkbcommon, but it does in xkbcomp:

```
xkb_symbols "x" {
    key <AD01> { };
};
```

While the usefulness of such statement is debatable, the fact that it
does parse in xkbcomp and that tools may generate such keymap entry make
it relevant to handle.
2024-12-28 20:08:25 +01:00
Ran Benita 09ae46dd26 Add "How to make a libxkbcommon release"
Signed-off-by: Ran Benita <ran@unusedvar.com>
2024-12-19 16:52:05 +02:00
Ran Benita 593a1613d7 ci: upload only doxygen docs to pages
We use the xkbcommon/website pages for the website, so here it's just
for previewing and we only need to the docs, not the website.

Fix #561.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2024-12-15 16:36:27 +02:00
Pierre Le Marre b9b4ab475d keysyms: Add sharp S upper case mapping exception
The case mapping `ssharp` ß ↔ `U1E9E` ẞ was added in
13b30f4f0d but was broken:
- For the lower case mapping it returned the keysym `0x10000df`, which
  is an invalid Unicode keysym.
- For the upper case mapping it returned the upper Unicode code point
  rather than the corresponding keysym.

It did accidentally enable the detection of alphabetic key type for the
pair (ß, ẞ) though. However this detection was accidentally removed in
5c7c79970a (v1.7) with an attempt to fix
the wrong keysym case mapping. Finally both the *lower* case mapping
and the key type detection were fixed for good when we implemented the
complete Unicode simple case mappings and corresponding tests in
e83d08ddbc.

However, the *upper* case mapping `ssharp` → `U1E9E` remained disabled.
Indeed, ẞ is a relatively recent addition to Unicode (2008) and had no
official recommendation, until recently. So while the lower mapping ẞ→ß
exists in Unicode, its converse upper mapping does not. Yet since 2017
the Council for German Orthography (Rat für deutsche Rechtschreibung)
recommends[^1] ẞ as the capitalization of ß.

Due to its stability policies, the Unicode Character Database (UCD)
that we use to generate our keysym case mappings (via ICU) cannot update
the simple case mapping of ß. Discussions are currently ongoing in the
Unicode mailing list[^2] and CLDR[^3] about how to deal with the new
recommended case mapping. However, the discussions are oriented on
text-processing and compatibility mappings, while libxkbcommon is
on a rather lower level.

It seems that the slow adoption of ẞ is partly due to the difficulty
to type it. Since ẞ is used only for ALL CAPS casing, the expectation
is to type it using CapsLock. While our detection of alphabetic key
types works well[^4] for the pair (ß,ẞ), the *internal capitalization*
currently does not work and is fixed by this commit.

Added the ß → ẞ upper mapping:
- Added an exception in the generation script
- Fixed tests
- Added documentation of the exceptions in `xkbcommon.h`
- Added/updated log entries

[^1]: https://www.rechtschreibrat.com/regeln-und-woerterverzeichnis/
[^2]: https://corp.unicode.org/pipermail/unicode/2024-November/011162.html
[^3]: https://unicode-org.atlassian.net/browse/CLDR-17624
[^4]: Except libxkbcommon 1.7, see the second paragraph.
2024-12-15 13:38:03 +01:00
Ran Benita 0ebdc4dba0 ci: fix upload artifact conflict
Doesn't like it when two jobs from the same run upload the same name.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2024-12-15 12:14:45 +02:00
dependabot[bot] c79c65123e build(deps): bump actions/upload-artifact from 3 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-15 12:00:38 +02:00
dependabot[bot] e4092d1f76 build(deps): bump actions/upload-pages-artifact from 1 to 3
Bumps [actions/upload-pages-artifact](https://github.com/actions/upload-pages-artifact) from 1 to 3.
- [Release notes](https://github.com/actions/upload-pages-artifact/releases)
- [Commits](https://github.com/actions/upload-pages-artifact/compare/v1...v3)

---
updated-dependencies:
- dependency-name: actions/upload-pages-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-15 11:57:37 +02:00
dependabot[bot] 8985cc3186 build(deps): bump dawidd6/action-download-artifact from 6 to 7
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 6 to 7.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v6...v7)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-15 11:57:23 +02:00
dependabot[bot] 16a346a12f build(deps): bump actions/configure-pages from 3 to 5
Bumps [actions/configure-pages](https://github.com/actions/configure-pages) from 3 to 5.
- [Release notes](https://github.com/actions/configure-pages/releases)
- [Commits](https://github.com/actions/configure-pages/compare/v3...v5)

---
updated-dependencies:
- dependency-name: actions/configure-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-15 11:57:04 +02:00
dependabot[bot] fda76884c0 build(deps): bump actions/deploy-pages from 2 to 4
Bumps [actions/deploy-pages](https://github.com/actions/deploy-pages) from 2 to 4.
- [Release notes](https://github.com/actions/deploy-pages/releases)
- [Commits](https://github.com/actions/deploy-pages/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/deploy-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-15 11:56:40 +02:00
Ran Benita 807f11b715 Add dependabot configuration to keep github actions up to date
Signed-off-by: Ran Benita <ran@unusedvar.com>
2024-12-15 11:52:55 +02:00
Pierre Le Marre e0130e3079 state: Add vmod support for xkb_state_mod_mask_remove_consumed 2024-11-29 09:19:06 +01:00
Pierre Le Marre 5fbc0ec7e8 state: Support querying whether virtual mods are consumed
Previously it was not possible to query the status of virtual modifiers
with the following functions:
- `xkb_state_mod_index_is_consumed`
- `xkb_state_mod_index_is_consumed2`

Note that it may *overmatch* if some modifier mappings overlap. For
example, the default “us” PC layout maps both “Alt” and “Meta” to the
real modifier “Mod1”; thus “Mod1”, “Alt” and “Meta” modifiers will
return the same result with these functions.
2024-11-29 09:19:06 +01:00
Pierre Le Marre 31a841ae12 state: support querying whether virtual modifiers are active
Previously it was not possible to query the status of virtual modifiers
with the following functions:
- `xkb_state_mod_index_is_active`
- `xkb_state_mod_indices_are_active`
- `xkb_state_mod_name_is_active`
- `xkb_state_mod_names_are_active`

Note that it may *overmatch* if some modifier mappings overlap. For
example, the default “us” PC layout maps both “Alt” and “Meta” to the
real modifier “Mod1”; thus “Mod1”, “Alt” and “Meta” modifiers will
return the same result with these functions.
2024-11-29 09:19:06 +01:00
Pierre Le Marre 2ba9daf11f mods: Add more built-in names
Added support for the following virtual modifiers:
- `Alt`
- `Meta`
- `NumLock`
- `Super`
- `Hyper`
- `LevelThree`
- `LevelFive`
- `ScrollLock`
2024-11-29 09:19:06 +01:00
Pierre Le Marre 086a286acb mods: Always use constants from xkbcommon-names.h
Respect the claim that real modifiers names are built-in:
- Add `XKB_MOD_NAME_MOD[1-5]` constants.
- Replace modifiers names with their corresponding constants.
2024-11-29 09:19:06 +01:00
Pierre Le Marre 43b26bd788 keysyms: Update to Unicode 16.0 2024-11-29 09:12:18 +01:00
Pierre Le Marre 420123fdd8 export-keysyms: Enable all keysyms export + char names
This enable to check case mappings for Unicode keysyms.
2024-11-29 09:12:18 +01:00
dependabot[bot] c085874ef2 build(deps): bump dawidd6/action-download-artifact in /.github/workflows
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 2 to 6.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v2...v6)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-25 23:00:56 +00:00
Pierre Le Marre 6153fece18 changelog: Fix release title format
Towncrier doc states that the `underlines` setting is not used with
Markdown files, so let’s apply the tag ourselves.
2024-11-25 13:24:03 +01:00
Jeffrey Cliff b1b9ff618b compose/paths: fix false <-> NULL confusion, errors on C23
i don't have access to github but this patch enabled me to compile
libxkbcommon with -std=gnu23

otherwise the following compilation error will result :

    ../src/compose/paths.c:70:16: error: incompatible types when returning type ‘_Bool’ but ‘char *’ was expected

( gcc (GCC) 15.0.0 20240509 (experimental) )

Signed-off-by: Ran Benita <ran@unusedvar.com>
2024-11-23 10:13:23 +02:00
Pierre Le Marre 15da5ee83e Improve xkeyboard-config test script
- Refactored to write files within the workers, else we have only one
  worker writing, slowly consuming the result queue. In some scenarios
  it may even result in out-of-memory as the resulting keymaps piles up.
- Added the option `--compress` to allow compressing keymaps files with
  gunzip.
- Use the recently added `--test` option for `xkbcli-compile-keymap`
  when we only want to test compilation, not the resulting keymap file.
  This speeds up the test suite of `xkeyboard-config`.
2024-11-18 17:39:17 +01:00
Pierre Le Marre 628242b285 tools: Add --test to compile-{keymap,compose}
The new flag `--test` enables to only test if compilation succeeds,
without printing the corresponding keymap or Compose file.

This is useful for quick feedback and to speedup some tests suites, e.g.
for `xkeyboard-config`.
2024-11-18 17:39:17 +01:00
Pierre Le Marre a7b84be92e Fix types annotations of Python scripts 2024-11-14 18:30:36 +01:00
Pierre Le Marre a8afe6fc0c tests: Improve xkeyboard-config script
- Refactor to more modern Python
- Allow iterating over models too
- Add filter for models and options
- Add “short output” option
- Fix layout variant
- Use models subfolders for keymaps
- Allow to load multiple registries simultaneously
2024-11-04 16:34:38 +01:00
Pierre Le Marre bfddd9a8b3 Add typing annotations to Python scripts 2024-10-30 15:44:04 +01:00
Pierre Le Marre cd029431e1 registry: Set libxml2 context options 2024-10-15 10:18:40 +02:00
Pierre Le Marre 5f1b06b749 registry: Start using libxml2 contextual API
Contextual functions are safer because they do not rely on a global
state.
2024-10-15 10:18:40 +02:00
Sebastian Keller a47961b15a registry: Restore default libxml2 error handler after parsing
Leaving the custom error handler could have resulted in a crash after
the context has been freed.

Closes: https://github.com/xkbcommon/libxkbcommon/issues/529
2024-10-13 11:40:59 +02:00
Pierre Le Marre b8888345fe tools: Add xkbcli dump-keymap-{wayland,x11}
There is currently no easy way to dump a keymap from a Wayland compositor,
such as `xkbcomp -xkb $DISPLAY -` could do for X servers.

As `xkbcomp` may not be intuitive, a corresponding tool for X servers
would also be useful.

Add the tools `xkbcli-dump-keymap-{wayland,x11}` by tweaking the existing
`xkbcli-interactive-{wayland,x11}` tools.
2024-10-11 16:38:05 +02:00
Pierre Le Marre 71d64df397 symbols: Add tests for multiple actions per level 2024-10-11 16:26:13 +02:00
Pierre Le Marre b1da948ab0 symbols: Add doc for multiple actions 2024-10-11 16:26:13 +02:00
Pierre Le Marre 6022835616 symbols: Add message ID for incompatible keysyms and actions counts 2024-10-11 16:26:13 +02:00
Pierre Le Marre fdf2c52597 actions: Add support for multiple actions per level
This makes 1 keysym == 1 action holds also for multiple keysyms per level.

The motivation of this new feature are:

- Make multiple keysyms per level more intuitive.
- Explore how to fix the issue with shortcuts in multi-layout settings
  (see the xkeyboard-config issue[^1]). The idea is to use e.g.:

  ```c
  key <LCTL> {
      symbols[1] = [ {Control_L,                  ISO_First_Group    } ],
      actions[1] = [ {SetMods(modifiers=Control), SetGroup(group=-4) } ]
  };
  ```

  in order to switch temporarily to a reference layout in order to get
  the same shortcuts on every layout.

When no action is specified, `interpret` statements are used to find
an action corresponding for *each* keysym, as expected.

For an interpretation matching Any keysym, we may get the same
interpretation for multiple keysyms. This may result in unwanted
duplicate actions. So set this interpretation only if no previous
keysym was matched with this interpret at this level, else set the
default interpretation.

For now, at most one action of each following categories is allowed
per level:
- modifier actions: `SetMods`, `LatchMods`, `LockMods`;
- group actions: `SetGroup`, `LatchGroup`, `LockGroup`.

Some examples:
- `SetMods` + `SetGroup`: ok
- `SetMods` + `SetMods`: error
- `SetMods` + `LockMods`: error
- `SetMods` + `LockGroup`: ok

[^1]: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/416
2024-10-11 16:26:13 +02:00
Pierre Le Marre 772ac0c4fa keymap: Rename keysyms field in xkb_level
The current field `u` (short for “union”) is not very descriptive.
Next commit will add multiple actions per level, so let’s rename the
keysym field to `s` (short for “symmbols”).
2024-10-11 16:26:13 +02:00
Pierre Le Marre 31c6d866e4 symbols: Min. 2 keysyms in level list
Do not allow `{ a }` when a single `a` suffices.
2024-10-11 16:26:13 +02:00
Pierre Le Marre 7c4c718b45 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.
2024-10-11 16:18:11 +02:00
Pierre Le Marre 948f7a59af symbols: Skip interprets only for groups with explicit actions
Previously setting explicit actions for a group in symbols files made
the parser skip compatibility interpretations for the corresponding
*whole* key, so the other groups with *no* explicit actions could result
broken on some levels.

In the following example, `<RALT>` would have an action on group 2,
because it is explicit, but none on group 1 because interpretation are
also skipped there as a side effect:

```c
key <RALT> {
	symbols[1]= [              ISO_Level3_Shift ],
	symbols[2]= [              ISO_Level3_Shift ],
	actions[2]= [ SetMods(modifiers=LevelThree) ]
};
```

Fixed by skipping interpretations *only* for groups with explicit actions.

We still set `key->explicit |= EXPLICIT_INTERP` if at least one group
has explicit actions. In such case, when dumping a keymap, we will
write explicit actions for *all* groups, in order to ensure that X11 and
previous versions of libxkbcommon can parse the keymap as intended. One
side effect is that no interpretation will be run on this key anymore,
so we may have to set some extra fields explicitly: repeat, virtualMods.
Thus the previous example would be bumped as:

```c
key <RALT> {
	repeat= No,
	symbols[1]= [              ISO_Level3_Shift ],
	actions[1]= [ SetMods(modifiers=LevelThree,clearLocks) ],
	symbols[2]= [              ISO_Level3_Shift ],
	actions[2]= [ SetMods(modifiers=LevelThree) ]
};
```
2024-10-11 15:41:20 +02:00
Pierre Le Marre 3ed763c31d test: Add strip_lines and uncomment to text utils
These allow us to store comments in files (especially keymaps), that
can then be removed (e.g. to compare with output) or uncommented (e.g.
to activate an optional line).
2024-10-11 15:41:20 +02:00
Pierre Le Marre 929a485f72 symbols: Fix too liberal parsing of keysyms lists
Currently we are too liberal when parsing symbols lists: e.g.
`[{a,{b}}]` is parsed as `[{a,b}]` but it should be rejected.
2024-10-08 13:19:26 +02:00
Pierre Le Marre 7a8772baa7 ci: Fix macOS
- Bump macOS image, as macOS 12 has been deprecated.
  See: https://github.com/actions/runner-images?tab=readme-ov-file#available-images
- Install PyYaml via Pip, as it has been disabled in Brew.
  See: https://docs.brew.sh/Homebrew-and-Python#pep-668-python312-and-virtual-environments
- Fix libxml2 not linked.
2024-10-08 07:20:49 +02:00
Pierre Le Marre 1d89750264 keysyms: Update using latest xorgproto
xorgproto commit: d7ea44d5f04cc476dee83ef439a847172f7a6bd1
Relevant MR: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/91
2024-10-04 08:25:31 +02:00
Pierre Le Marre bf1ea08879 Fix typo in darray_enumerate_from 2024-09-30 12:02:43 +02:00
Pierre Le Marre 4ea9d431c2 rules: Add support for :all qualifier
Some layout options require to be applied to every group to maintain
consistency (e.g. a group switcher). Currently this must be done manually
for all layout indexes. This is error prone and prevents the increase of
the maximum group count.

This commit introduces the `:all` qualifier for KcCGST values. When a
rule with this qualifier is matched, it will expands the qualified
value (and its optional merge mode) for every layout, e.g.
`+group(toggle):all` (respectively `|group(toggle)`) would expand to
`+group(toggle):1+group(toggle):2` (respectively
`|group(toggle):1|group(toggle):2`) if there are 2 layouts, etc.

If there is no merge mode, it defaults to *override* `+`, e.g. `x:all`
expands to `x:1+x:2+x:3` for 3 layouts.

Note that only the qualified *value* is expanded, e.g. `x+y:all` expands
to `x+y:1+y:2` for 2 layouts.

`:all` can be used in combination with special layout indexes. Since
this can lead to an unexpected behaviour, a warning will be raised.
2024-09-27 08:26:00 +02:00
Pierre Le Marre cdafba4f86 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.
2024-09-27 08:26:00 +02:00
Pierre Le Marre 076c60dfa9 rules: Ensure same number of layouts and variants 2024-09-27 08:26:00 +02:00
Pierre Le Marre c67ec170dc include: Use constants for merge mode prefixes
This will make their semantics explicit.
2024-09-27 08:26:00 +02:00
Pierre Le Marre a898bc810e logging: Added new error messages ID for keymap and rules 2024-09-25 07:07:49 +02:00
Pierre Le Marre 1b83771fe8 logging: Use messages ID in registry 2024-09-25 07:07:49 +02:00
Pierre Le Marre 8b45556d63 logging: Make log_err_func* use a message ID 2024-09-25 07:07:49 +02:00
Pierre Le Marre ba89693526 logging: Make scanner_warn use a message ID 2024-09-25 07:07:49 +02:00
Pierre Le Marre c8bd57ddb7 logging: Make scanner_err use a message ID 2024-09-25 07:07:49 +02:00
Pierre Le Marre fdcd458cb0 nit: Format files 2024-09-25 07:07:49 +02:00
Pierre Le Marre a600c36d1b compose: Use is_absolute to test absolute paths 2024-09-23 11:49:28 +02:00
Pierre Le Marre 7697c712a0 rules: Resolve relative include statements using XKB paths
Contrary to keymap files, the `! include` statement in rules does not
lookup include paths added to `xkb_context`. So it is not possible e.g.
to import another file in the same folder without using an absolute path.

- Added path utils: `is_absolute(path)`.
- Added XKB paths lookup to enable e.g. `! include evdev` to work.
- Added test.
2024-09-23 11:49:28 +02:00
Pierre Le Marre 0cd1087ac1 xkbcli how-to-type: Enhance arguments parsing & doc
Currently the positional parameter of the CLI is either a Unicode code
point or a keysym. However their respective format is not documented.

It turns out that there are multiple issues due to the use of `strtol`:
- Code points can be parsed as octal, decimal and hexadecimal, while
  keysyms can only be parsed as hexadecimal. Some programs outputs
  keysyms in their decimal form (e.g. `wev`) so it is worth to bring
  symmetry with code points.
- Octal format is unusual for both and is triggered by leading zeros,
  which is unintuitive in this context.
- `U+NNNN` format is the standard format for Unicode code points but is
  not supported.
- Plain characters are not supported, e.g.: a, é, ß, Æ, γ, 🦆, etc.
  Although this is probably the easiest format for most users.

Fixed the issues above:
- Allow the code point to be passed exactly in the following formats:
  - Literal character (requires UTF-8 character encoding of the terminal);
  - Decimal number;
  - Hexadecimal number: either `0xNNNN` or `U+NNNN` (any digit count)
- Allow the keysym to be passed exactly in the following formats:
  - Decimal number;
  - Hexadecimal number: `0xNNNN` (any digit count);
  - Name.
- Improve both `--help` message and manual page.
2024-09-23 10:01:20 +02:00
Pierre Le Marre 98dee22519 Add UTF-8 to UTF-32 decoding
Add internal functions to convert UTF-32 to UTF-8, with corresponding
tests.
2024-09-23 10:01:20 +02:00
Pierre Le Marre b5f077970d scripts: Improve messages registry update 2024-09-23 09:09:51 +02:00
Pierre Le Marre 44df6eee45 Add new warnings for deprecated keysyms
Add 2 new warnings:
- Deprecated keysym name (typo, historical alias, etc.);
- Deprecated keysym (all names and forms).

Guard deprecated keysym tests with verbosity level ≥2, so they are
run only when actually needed.
2024-09-23 09:09:51 +02:00
Pierre Le Marre 378badab6c Add function xkb_keysym_is_deprecated
This function allow to check whether a keysym is deprecated, based
on the keysym and optionally its name.

The generation of the table of deprecated keysyms relies on the
rules described in `xkbcommon-keysyms.h`.

The `ks_table.h` is now generated deterministically by setting
explicitly the random seed to a constant. This will avoid noisy
diffs in the future.
2024-09-23 09:09:51 +02:00
Pierre Le Marre f6f30c6b49 Add benchark for compile-keymap
Implement `tasty-bench` method:
1. Set n = 1.
2. Measure execution time t_n of n iterations and execution time t_2n
   of 2n iterations.
3. Find t which minimizes deviation of (n·t, 2·n·t) from (t_n, t_2n),
   namely t = (t_n + 2·t_2n)/5n.
4. If deviation is small enough (see --stdev CLI parameter), return t
   as a mean execution time.
5. Otherwise set n = 2·n and jump back to Step 2.

See: https://hackage.haskell.org/package/tasty-bench
2024-09-23 09:09:51 +02:00
Pierre Le Marre e4269202c9 keysyms: Fix off-by-one XKB_KEYSYM_NAME_MAX_SIZE
The constant did not account for the terminating `NULL` byte and this was
sadly not caught by the tests.

Fixed the invalid value, the corresponding script and the tests.
2024-09-20 10:47:35 +02:00
Pierre Le Marre 05ba96db56 rules: Fix wild card handling
The handling of wild card `*` is different in libxkbfile and X server:
wild card matches empty strings for model and option but not for layout
nor variant, while in libxkbcommon wild cards always match empty strings.

See:
- https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/blob/bf985c68acb1244f51ec91414532a2347fbc1c4c/src/maprules.c#L687
- https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/blob/bf985c68acb1244f51ec91414532a2347fbc1c4c/src/maprules.c#L712

The difference of handling between the components is unfortunately not
documented, but we should follow the behavior of the original
implementations for consistency.

- Fixed by implementing the same behavior than libxkbfile.
- Added tests and fixed failing tests.
- Improve the documentation of rules to highlight the special behavior.
2024-09-16 16:31:38 +02:00
Martin Rys 9af1f9f2cb Add XKB_LED_NAME_COMPOSE and XKB_LED_NAME_KANA 2024-09-03 09:11:33 +02:00
Pierre Le Marre 5e539bf0a3 compose: Make iteration API faster
New implementation without explicit direction
2024-09-01 12:48:21 +02:00
Pierre Le Marre 8bc426e22b compose: Add optional foreach traversal to benchmark
This allow us to compare the iterator API to the fastest implementation,
`foreach`.
2024-09-01 12:48:21 +02:00
Pierre Le Marre 4100bdd216 compose: Add roundtrip test parse/dump 2024-09-01 12:48:21 +02:00
Pierre Le Marre d4deb75558 compose: Add quickcheck test for traversal
Test against the `foreach` reference implementation:
- Suffle compose file lines randomly;
- Compare traversal entry by entry.

The `foreach` Compose traversal implementation is based on Ran’s work:
https://github.com/bluetech/libxkbcommon/commit/f7f3c3c385fdc9ae91135f95e4b10f072603b812
2024-09-01 12:48:21 +02:00
Pierre Le Marre 652b03ccdd compose: Add Compose table dump internal API
- Move `print_compose_table_entry` to own file and add a `file`
  argument to select output.
- Add `xkb_compose_table_dump` to dump a Compose table.

This change is needed in order to share the feature “dump a Compose
table” between tests and tools.
2024-09-01 12:48:21 +02:00
Pierre Le Marre e9bd7de420 state: Add support for group latch action
Surprisingly, the latch group action was not yet implemented.

Added tests to ensure we get the tricky bits right.
2024-08-28 17:18:08 +02:00
Pierre Le Marre ce32decc1a build: Set the ABI version properly
Rational (from: https://gitlab.freedesktop.org/wayland/wayland/-/issues/175):

The ABI of a shared library on Linux is given by a major version, which
is part of the SONAME and is incremented (rarely) on incompatible changes,
and a minor version, which is part of the basename of the regular file to
which the SONAME provides a symlink. It's conventional to manage the ABI
version in the style of semantic versioning (major.minor.micro where the
major version goes up for incompatible changes, the minor version goes up
for new ABI, or the micro version goes up for internal fixes), although
this is not strictly required.

The minor version is used by `ldconfig(8)` and by some projects to choose
which of potentially several copies of a library is the newest; keeping
it the same means we can't tell, and will potentially choose an outdated
version.

---

In xkbcommon we did not have an API break for a long time, so in order
to avoid an unnecessary SONAME bump, let’s keep the major version version
at 0, e.g. xkbcommon 1.x.y produces `libxkbcommon.so.0.x.y`.

The same goes for `libxkbcommon-x11` and `libxkbregistry`.
2024-07-31 10:39:21 +02:00
Peter Hutterer 573583e3a8 test/registry: fix array overrun
test/registry.c:532:9: overrun-local: Overrunning array "tl->iso639" of 3
8-byte elements at element index 23 (byte offset 191) using index "i"
(which evaluates to 23).
2024-07-31 10:26:58 +02:00
Peter Hutterer 4b69cd9c7b test/keysym: remove dead assignment
../../../test/keysym.c:394:5: warning: Value stored to 'iter' is never read [deadcode.DeadStores]
  394 |     iter = xkb_keysym_iterator_unref(iter);
2024-07-31 10:26:58 +02:00
Peter Hutterer c15ca44497 test/compose: reset the utf8 buffer to a "random" sequence
This ensures that our string termination is handled by utf32_to_utf8()
as opposed to false positives due to previously set null terminators.

Fixes:
../../../test/compose.c:912:34: warning: The left operand of '==' is a
garbage value [core.UndefinedBinaryOperatorResult]
  912 |             assert_printf(buf[c] == '\0', "NULL-terminated string\n");
2024-07-31 10:26:58 +02:00
Peter Hutterer f129b21bac test/compose: only setenv if our top_srcdir is not NULL
../../../test/compose.c:968:5: warning: Null pointer passed to 2nd
parameter expecting 'nonnull' [core.NonNullParamChecker]
2024-07-31 10:26:58 +02:00
Peter Hutterer d85fc24dfd test: initialize two return values
../../../test/xvfb-wrapper.c:166:5: warning: Undefined or garbage value
returned to caller [core.uninitialized.UndefReturn]
  166 |     return rc;

../../../tools/interactive-wayland.c:820:14: warning: The left operand
of '>=' is a garbage value [core.UndefinedBinaryOperatorResult]
  820 |     exit(ret >= 0 ? EXIT_SUCCESS : EXIT_FAILURE);
2024-07-31 10:26:58 +02:00
Peter Hutterer 89d318da7b test: explicitly cast time() to int for the seed
(hopefully) silences an analyzer warning:

test/compose.c:955:16: store_truncates_time_t: A "time_t" value is stored
in an integer with too few bits to accommodate it. The expression
"time(NULL)" is cast to "int".
2024-07-31 10:26:58 +02:00
Peter Hutterer a0a59d9f80 interactive-x11: initialize a variable
If xkb_compose_table_new_from_locale() fails we end up de-initializing
the keyboard state before it was ever initialized.

../../../tools/interactive-x11.c:196:5: warning: 1st function call
argument is an uninitialized value [core.CallAndMessage]
  196 |     xkb_state_unref(kbd->state);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
2024-07-31 10:26:58 +02:00
Peter Hutterer 08deb9c3e0 compose: initialize the dummy node to zero
src/compose/table.c:66:5: uninit_use: Using uninitialized value "dummy".
Field "dummy.lokid" is uninitialized.

This looks like a false positive but it's easy enough to shut up:
2024-07-31 10:26:58 +02:00
Peter Hutterer 4b5d10276a compose: fix a sizeof char* vs char warning
../../../src/compose/dump.h:48:16: warning: Result of 'calloc' is
converted to a pointer of type 'char', which is incompatible with
sizeof operand type 'char *' [unix.MallocSizeof]
   48 |     char* to = calloc(4 * length + 1, sizeof(to));
      |     ~~~~~      ^~~~~~                 ~~~~~~~~~~

No security impact as sizeof(char*) is always >1 so we were just overallocating
here.
2024-07-31 10:26:58 +02:00
Pierre Le Marre e83d08ddbc keysyms: Fast and complete case mappings (Unicode 15.1)
The current code to handle keysym case mappings is quite complex and
slow. It is also incomplete, as it does not cover recent Unicode
database. Finally, it does not handle title case correctly.

It would be easier if we were to use only a lookup table, but a trivial
implementation would lead to a huge array: the cased characters range
from `U+0041` to `U+`1F189, i.e. a span of 127 304 elements.

Thus we need some tricks to compress the lookup table. We based our
work on the post:
https://github.com/apankrat/notes/blob/3c551cb028595fd34046c5761fd12d1692576003/fast-case-conversion/README.md

The compression algorithm is roughly:
1. Compute the delta between the characters and their mappings.
2. Split the delta array in chunk of a given size.
3. Rearrange the order of the chunks in order to optimize consecutive
   chunks overlap.
4. Create a data table with the reordered chunks and an index table
   that maps the original chunk index to its offset in the data table.

The compression algorithm is then applied a second time to the previous
index table.

The complete algorithm optimizes the two chunk sizes in order to get
the lowest total data size.

The mappings were generated using CPython 3.12.4, PyICU 2.13, PyYaml
6.0.1 and ICU 75.1.

Also:
- Added explicit list of named keysyms and their case mappings.
- Added benchmark for case mappings.
- Rework ICU tests.

Note: 13b30f4f0d introduced a fix for
sharp S `U+00DF`. With the new implementation, the *conversion*
functions `xkb_keysym_to_{lower,upper}` leave it *unchanged*, while
the *predicate* functions `xkb_keysym_is_{lower,upper_or_title}`
produce the expected results:

```c
xkb_keysym_to_upper(XKB_KEY_ssharp) == XKB_KEY_ssharp;
xkb_keysym_to_lower(XKB_KEY_ssharp) == XKB_KEY_ssharp;
xkb_keysym_to_lower(XKB_KEY_Ssharp) == XKB_KEY_ssharp;

xkb_keysym_is_lower         (XKB_KEY_ssharp) == true;
xkb_keysym_is_upper_or_title(XKB_KEY_Ssharp) == true;
```
2024-07-27 21:46:39 +02:00
Pierre Le Marre b8b872d0c3 keysyms: Fix case mappings
There are several mismatches with the Unicode database.

Fix the case mappings in `data/keysyms.yaml` for the following keysyms:
- `Iabovedot`
- `idotless`
- `Greek_finalsmallsigma`
- `function`
2024-07-27 21:46:39 +02:00
Pierre Le Marre 798b7b7396 keysyms: Export explicitly named keysyms
Added a tool to export explicitly named keysyms to a yaml file. This
includes the following keysyms properties:

- Value
- Name
- Corresponding Unicode code point, if relevant
- Corresponding case mapping, if relevant

This will allow us to check the case mappings easier and to refactor the
related functions.
2024-07-27 21:46:39 +02:00
Pierre Le Marre 45d64a7ce2 keysyms: Add benchmark for case mapping functions 2024-07-27 21:46:39 +02:00
Pierre Le Marre addf73c5bb keysyms: Require only 5 bytes for UTF-8 encoding
Require only 5 bytes for the buffer of `xkb_keysym_to_utf8`, as UTF-8
encodes code points on up to 4 bytes + 1 byte for the NULL-terminating
byte.

Previous standard [RFC 2279] (1998) required up to 6 bytes per code
point, but has been superseded by [RFC 3629] (2003).

[RFC 2279]: https://datatracker.ietf.org/doc/html/rfc2279
[RFC 3629]: https://datatracker.ietf.org/doc/html/rfc3629
2024-07-22 08:48:48 +02:00
Pierre Le Marre 1d8a25d6f1 build: Check for --undefined-version support
Gate the use of `--undefined-version` in the linker because it breaks on
older GNU `ld`: https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=58272.
2024-07-16 13:57:52 +02:00
Pierre Le Marre 621e31014c build: Require meson >= 0.58
This will enable f-strings and allow us to simplify the build file.
2024-07-16 13:57:52 +02:00
Pierre Le Marre 32179d919b doc: Improve rules
- Improved introduction
- Added examples
- Added RMLVO resolution process
2024-07-16 12:38:17 +02:00
Pierre Le Marre 9944be7e3f nit: Fix typo 2024-07-16 12:38:17 +02:00
Pierre Le Marre b5d3fa9e85 ci: Add ruff-format check
- Add CI step
- Fix errors
2024-07-12 10:45:15 +02:00
Pierre Le Marre 809704e0d8 pre-commit: Use ruff-format instead of black 2024-07-12 10:45:15 +02:00
Alexander ZiaeeandRan Benita a4f62fcd84 doc (manuals): clean and expand apropos results
Previously on FreeBSD/mandoc (probably affecting others), everything
except xkbcli was being listed twice and wrapping on standard console
in apropos because mdoc(7) names should not have spaces or be different
than the title.

Further, xkb is already parsed in search results by being in the name,
so expand xkb to "X keyboard" so that they match for apropos keyboard.
We did this already in xkbutils, which matches setxkbmap.

These don't need to be quoted literals, and - doesn't need to be escaped,
but I left them because there may be environments which are not to spec,
but I'm happy to ammend this commit if that cleanup seems desirable.

Co-authored-by: Ran Benita <ran@unusedvar.com>
2024-06-05 00:54:51 +03:00
Pierre Le Marre 11f7ef2ea3 test(x11): Warn for missing Xvfb program
Xvfb is required for *running* X11 tests. We do not make it mandatory
in the meson setup though, because we did not find a way to require a
*run* time dependency.
2024-04-16 07:02:25 +02:00
Pierre Le Marre 4052a645d2 doc: Fix contribution entry in NEWS 2024-03-24 09:26:41 +01:00
Ran Benita 7a31e3585e Bump version to 1.7.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2024-03-23 23:23:43 +02:00
Ran Benita 9e2c3b7a53 Merge pull request #445 from wismill/release/1.7.0
Prepare for 1.7.0
2024-03-23 23:21:50 +02:00
Pierre Le Marre bc1547fbdf doc(news): Update for 1.7.0 release
Signed-off-by: Ran Benita <ran@unusedvar.com>
2024-03-23 23:10:10 +02:00
wysiwys d455e805f9 rules: fix variant index being ignored for layout index (#475)
We accidentally ignored the variant index and used the layout index instead.
In realistic rules they are always the same but don't have to be.
2024-03-23 23:07:18 +02:00
Pierre Le Marre e4b20b916a doc(keymap): Improve types & symbols sections
- Add a diagram to illustrate how key types work.
- Add examples to explain the key types mappings.
- Add note for using `preserve` to tweak shortcuts.
- Improve the key statement section.
2024-03-22 16:08:05 +01:00
Pierre Le Marre a4946488f3 doc(keymap): Fix quotes and apostrophe
Straight apostrophe `'` and straight quotations marks `"` are typewriter
legacy and should only be used in programming.

apostrophe
2024-03-22 16:08:05 +01:00
Pierre Le Marre 41bdd33a7c test(X11): Avoid running X11 tests in parallel
On macOS, it seems to be responsible for the following error in the CI:

```
_XSERVTransmkdir: ERROR: euid != 0,directory /tmp/.X11-unix will not be created.
```
2024-03-15 15:57:56 +01:00
Pierre Le Marre 4975598cff test(X11): Fix macOS build
Xvfb wrapper: adapt ELF custom section to macOS.
2024-03-15 15:57:56 +01:00
Pierre Le Marre 0ed9390c07 test(x11): Do not skip test when setup fails
With the current setup, the tests passes even if there is an issue with
the setup. X11 tests are already guarded with `enable-x11=true`, so
there is no reason to skip these tests if we built the X11 support.

Meson supports the GNU convention for exit code in tests:

- 77: test skipped; already used in xkbcommon: `SKIP_TEST`.
- 99: hard error/setup failure; introduced in this commit:
  `TEST_SETUP_FAILURE`.

Meson reports setup failure as `ERROR`, while a test failure is reported
as `FAIL`. In both cases it will make the CI fail, allowing us to
correctly detect any errors.

Fixed:
- Use `TEST_SETUP_FAILURE` instead of `SKIP_TEST` for X11 setup
  failures.
- Xvfb wrapper: Add verbosity for debugging.
2024-03-15 15:57:56 +01:00
Pierre Le Marre 0f6efc4754 ci(macOS): enable X11
It requires to install `xkeyboardconfig` and `xorg-server`.

XQuartz cask was tested but did not work.
2024-03-15 15:57:56 +01:00
Rui Chen 346d687100 ci(macOS): Use brew for all deps and remove doc deps
Install meson and pyyaml via brew, as this the standard way on macOS.

Remove Doxygen and Graphviz dependencies, as we do not build
documentation by default anymore.

Signed-off-by: Rui Chen <rui@chenrui.dev>
2024-03-13 15:41:29 +01:00
Rui Chen 7977880a3a ci: Bump action deps to use nodejs 20 runtime
Signed-off-by: Rui Chen <rui@chenrui.dev>
2024-03-13 15:41:29 +01:00
Rui Chen 23d772af4f ci: Use Python 3.12
Signed-off-by: Rui Chen <rui@chenrui.dev>
2024-03-13 15:41:29 +01:00
Peter Hutterer c2780ea11b meson: disable doc builds by default
The only docs we build is the doxygen API and I reckon there's a near-zero
amount of users who actually want these built locally instead of just browsing
the online doc.

Let's not build this by default, dropping the requirement on doxygen and
speeding up the build by quite a fair bit.
2024-03-13 07:14:29 +01:00
Pierre Le Marre 737706fe83 doc: Use towncrier to handle release notes
Towncrier is a utility to produce useful, summarized news files.

See:
- https://pypi.org/project/towncrier/
- https://towncrier.readthedocs.io

Custom configuration for xkbcommon:
- New fragments are located in the `changes` directory.
- 3 sections:
  - API: `changes/api`
  - Tools: `changes/tools`
  - Build System: `changes/build`
- 3 news fragments:
  - Breaking changes: `.breaking`
  - New: `.feature`
  - Fixes: `.bugfix`

`NEWS` is renamed to `NEWS.md` because the tool requires `.md`
extension to write in markdown format.
2024-03-12 07:29:24 +01:00
Pierre Le Marre ddbefb6760 keysyms: Make locale explicit in scripts/update-keysyms 2024-03-11 11:37:26 +01:00
Pierre Le Marre 53d9881e7f keysyms: Fix inconsistent case-insensitive name lookup
`xkb_keysym_from_name` has inconsistent behavior when used with the flag
`XKB_KEYSYM_CASE_INSENSITIVE`:

```c
xkb_keysym_from_name("a", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_a;
xkb_keysym_from_name("A", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_a;
xkb_keysym_from_name("dead_a", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_dead_A;
xkb_keysym_from_name("dead_A", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_dead_A;
xkb_keysym_from_name("dead_o", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_dead_o;
xkb_keysym_from_name("dead_O", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_dead_o;
xkb_keysym_from_name("KANA_tsu", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_kana_tsu;
xkb_keysym_from_name("KANA_TSU", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_kana_tsu;
xkb_keysym_from_name("KANA_ya", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_kana_YA;
xkb_keysym_from_name("KANA_YA", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_kana_YA;
xkb_keysym_from_name("XF86Screensaver", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_XF86ScreenSaver;
xkb_keysym_from_name("XF86ScreenSaver", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_XF86ScreenSaver;
```

So currently, if two keysym names differ only by case, then the
lower-case *keysym* is returned, not the keysym corresponding to the
lower-case keysym *name*. Indeed, `xkb_keysym_from_name` uses
`xkb_keysym_is_lower` to test if a keysym is a lower-case keysym.

Let’s look at the example for keysyms `a` and `A`: we get the keysym `a`
not because its name is lower case, but because `xkb_keysym_is_lower(XKB_KEY_a)`
returns true and `xkb_keysym_is_lower(XKB_KEY_A)` returns false.

So the results are correct according to the doc:

- Katakana is not a bicameral script, so e.g. `kana_ya` is *not* the lower
  case of `kana_YA`.
- As for the `dead_*` keysyms, they are not cased either because they do
  not correspond to characters.
- `XF86ScreenSaver` and `XF86Screensaver` are two different keysyms.

But this is also very counter-intuitive: `xkb_keysym_is_lower` is not
the right function to use in this case, because one would expect to check
only the name, not the corresponding character case:

```c
xkb_keysym_from_name("KANA_YA", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_kana_ya;
xkb_keysym_from_name("XF86ScreenSaver", XKB_KEYSYM_CASE_INSENSITIVE) == XKB_KEY_XF86Screensaver;
```

Fixed by making the order of the keysyms names consistent in `src/ks_tables.h`:

1. Sort by the casefolded name: e.g. `kana_ya` < `kana_YO`.
2. If same casefolded name, then sort by cased name, i.e for
   ASCII: upper before lower: e.g `kana_YA` < `kana_ya`.

Thus we now have e.g. `kana_YA` < `kana_ya` < `kana_YO` < `kana_yo`.
The lookup logic has also been simplified.

Added exhaustive test for ambiguous case-insensitive names.
2024-03-11 11:37:26 +01:00
Ran Benita abb6e58801 tools: remove unused #incldue <ctype.h>
We avoid this header due to its locale dependence. This include seems
like a leftover in 44029221e8.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2024-03-07 11:43:06 +02:00
Mikhail GusarovandPierre Le Marre ba76ec16f0 Global default statement: Fix types
Do not accept statements like garbage.level_name in types files

Fix parser accepting clearly nonsensical type definitions like

type "ONE_LEVEL" {
    garbage.modifiers = None;
    garbage.map[None] = Level1;
    garbage.level_name[Level1] = "Any";
};

and ignoring the garbage part.

Co-authored-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Co-authored-by: Pierre Le Marre <dev@wismill.eu>
2024-03-07 09:14:43 +01:00
Pierre Le Marre 24f6964526 Global default statement: Fix symbols 2024-03-07 09:14:43 +01:00
Pierre Le Marre 13b36a7684 Global default statement: Improve code & error message
- Simplify error handling.
- Improve error message: add message ID and relevant
  quotes and try to standardize a bit.
- Add proper doc for in the message registry.

Note: Instead of testing the value of `expr.op`, we test if the argument
`elem` of `ExprResolveLhs` is set: this allows us to catch also the
error with `x.y[z]` rather than just `x.y` as previously.
2024-03-07 09:14:43 +01:00
Pierre Le Marre 64614bccb0 doc: Fix message entries count
It seems an error originating from 00e3058e7b027c3d698b24415fd2ac105cd72246A.
Probably an unfortunate Git rebase or so.
2024-03-07 09:14:43 +01:00
Pierre Le Marre 0d875ef563 NEWS: Fix missing contributors for 1.6.0 2024-03-01 17:30:58 +01:00
Pierre Le Marre 2c23852a19 Doc: Keymap format enhancement + misc
- Add introduction to keymap and its components
- Add a diagram to explain the relationships between RMLVO and KcCGST.
- Add keywords & comments sections.
- Improve Quick guide section in the index page.
- Add links to User-configuration page.
- Fix typos.
2024-02-29 18:32:39 +01:00
Baptiste Daroussin ebe4157d77 meson: inform ld to accept undefined symbols for version-scripts (#459)
with lld 1.17, linking with a symbol map which contains symbols which actually do not exists now result in an error, which means the test in meson.build to check if -Wl,--version-script works always fails. because it tries to use the general map file with "int main(void) {}".

Fixes #424
2024-02-28 10:27:10 +10:00
Pierre Le Marre 58d0bdc743 Update pre-commit 2024-02-23 17:09:42 +01:00
Pierre Le Marre e325e65eb8 Add test_unit to all tests
Currently it only ensure we do not buffer `stdout`.
2024-02-21 06:26:36 +01:00
Peter Hutterer e7570bcb78 test: disable stdout output buffering for our tests
Hook this into test_create_context() so all the test immediately use it.
2024-02-20 11:27:13 +10:00
Peter Hutterer 5270a55324 test: print the keyboard state as part of test_key_seq_va
Makes it easier to debug modifier bugs.
2024-02-20 11:27:13 +10:00
Peter Hutterer be1c2f27ce test: improve debugging output for test_key_seq
Print the op too to make it easier to find which part in a long test_key_seq
triggered an assertion and add some whitespace for nicer debugging output.
2024-02-20 11:27:13 +10:00
Peter Hutterer 883bac60d8 tools: constify the prefix in tools_print_keycode_state 2024-02-20 11:27:13 +10:00
Peter Hutterer 51e084728a Fix a typo 2024-02-20 11:27:13 +10:00
Mikhail Gusarov d21645be08 xkbcomp: Require newline after !include line in rules files
Rules file parser allows constructs like

!include "foo" !include "bar" !layout = symbols

This is most likely an oversight in original code.

Closes #452
2024-02-20 11:27:02 +10:00
Peter Hutterer 89ceb3515b tools: add --verbose to interactive-evdev 2024-02-15 10:44:09 +01:00
Pierre Le Marre ed2dc978b1 keysyms: Update using latest xorgproto
This fixes a typo and improves comments.

xorgproto commit: cd33097fc779f280925c6d6bbfbd5150f93ca5bc
Relevant MR: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/84
2024-02-08 14:24:28 +01:00
Peter Hutterer dd3e214003 interactive-evdev: reduce the space allocated for keysyms (#443)
* interactive-evdev: reduce the printed space used for keysyms

In commit 8cca3a7bfb the buffer for the keysym
was extended to accommodate for up to XKB_COMPOSE_MAX_STRING_SIZE bytes. This
caused the printf to expand to the same width for the keysym alone, making the
output less useful. Drop this back down to the same width it was before.
2024-02-08 11:15:22 +01:00
Pierre Le Marre 1731c6b3ef compose: Ensure we mmap only regular files
Currently we do not check that the Compose files we try successively are
*regular* files. This may result in an error, while we should just really
just skip the corresponding path.

Fixed by adding the new utily function `open_file`.
2024-02-07 09:24:59 +01:00
Peter Hutterer 54f073ce17 doc: remove obsolete HTML_TIMESTAMP
warning: Tag 'HTML_TIMESTAMP' at line 44 of file '/home/whot/xorg/lib/libxkbcommon/build/Doxyfile' has become obsolete.
2024-02-07 11:37:26 +10:00
Peter Hutterer 8e26a8b2bd interactive-evdev: align Usage and or in the help output 2024-02-07 11:35:55 +10:00
Pierre Le Marre 382f6d2d5e Keysyms: Update using latest xorgproto
For the sake of compatibility, this reintroduce some deleted keysyms and
postpone the effective deprecation of others.

xorgproto commit: fe12c5102762afcbf852e50dcbbdea2ef625570c

Also added tests for some canonical names.
2024-02-06 17:45:02 +01:00
Yuichiro Hanada efdb05d193 parser: Do now allow the empty symbol declaration
An empty element is allowed in SymbolsBody definition, so the following
keymap is gramatically correct.

```
xkb_keymap {
  ...
  xkb_symbols "sym" {
    key <SPC> {, [Space] };
  };
};
```

However, the current parser crashes with the keymap due to null pointer
access.
This change fixes it by changing the parser not to allow it.
2024-02-05 09:42:02 +01:00
Pierre Le Marre 43c9752d44 compose: Fix iterator for empty tables
The current `xkb_compose_table_iterator_next` segfaults when used with an
empty table. Indeed, in this case we initialize cursors in
`xkb_compose_table_iterator_new` with the dummy node and the direction
`NODE_LEFT`, but the dummy node is a leaf!

Fixed by initializing with no cursors when the table is has no non-dummy
nodes.
2024-01-16 11:34:28 +01:00
Pierre Le Marre 1034f272e4 compose: Reduce xkb_compose_state_get_utf8 buffer
`xkb_keysym_to_utf8` does not return a keysym name but its corresponding
character, if defined.
2024-01-12 10:58:38 +01:00
Pierre Le Marre 8cca3a7bfb compose: Add XKB_COMPOSE_MAX_STRING_SIZE
Define the maximum size of a compose sequence result string explicit as
a constant and use it everywhere to improve the code readability.
2024-01-12 10:58:38 +01:00
Pierre Le Marre c1b5da1dbf tools: Fix bash completion permissions
There is no need to give execution permission. It also creates an
unnecessary work for packaging.

Fixed by removing execution permission.
2024-01-12 10:55:16 +01:00
Pierre Le Marre 806c5dc0e4 scripts: Fix update-headers command
The file name misses an extension.
2024-01-10 17:23:01 +01:00
Pierre Le Marre 5c7c79970a keysyms: Fix case mapping for 3 Latin 1 keysyms
Fixed the upper case mappings for:
- XKB_KEY_ydiaeresis
- XKB_KEY_mu
- XKB_KEY_ssharp

Note: In Unicode, the upper case of “ß” (U+00DF) is *not* “ẞ” (U+1E9E)
but “SS”. “ẞ” is reserved for text in capitals.
2024-01-10 15:03:22 +01:00
Pierre Le Marre c88fe4b692 keysyms: Add tests with ICU
Added tests of the simple case mappings when the ICU library is
available. A warning is raised for missing mappings.

Note: `xkb_keysym_is_upper` is interpreted as matching the disjunction of the
Unicode character properties “Uppercase” or “Titlecase”.
2024-01-10 15:03:22 +01:00
Pierre Le Marre 82305adb51 keysyms: Test keypad 2024-01-10 14:43:29 +01:00
Pierre Le Marre b5a140832b keysyms: Fix xkb_keysym_is_modifier
Currently `xkb_keysym_is_modifier` does not detect the following keysyms:
- `XKB_KEY_ISO_Level5_Shift`
- `XKB_KEY_ISO_Level5_Latch`
- `XKB_KEY_ISO_Level5_Lock`

Indeed, there is a mistake in the keysym interval that the code checks.
The reason seems a confusing order of the keysyms in
`xkbcommon-keysyms.h`: the current code has a comment “libX11 only goes
up to XKB_KEY_ISO_Level5_Lock”, but in fact the modifiers keysyms are
listed in a _semantic_ order in `xkbcommon-keysyms.h`, not in the
increasing keysym _value_ order.

Fixed by using the same (correct) code as libX11 and added some tests.
2024-01-10 14:43:29 +01:00
Pierre Le Marre 0074baf451 keysyms: Add XKB_KEYSYM_NAME_MAX_SIZE for internal use
Currently there is no indication of the maximum length of keysym names.

This is statically known, so add the new *internal* following API:
`XKB_KEYSYM_NAME_MAX_SIZE`.
2024-01-10 14:18:43 +01:00
Pierre Le Marre f77c97bd45 keysyms: Test xkb_keysym_to_utf8 length 2024-01-10 14:18:43 +01:00
Pierre Le Marre 817179d866 keysyms: Add xkb_keysym_iterator
Add an efficient way to iterate over the assigned keysyms.

Currently only provided for testing, so we guard it by
`ENABLE_PRIVATE_APIS` in order to reduce the installed library.
2024-01-10 14:18:43 +01:00
Pierre Le Marre 4f52d6068e keysyms: Add xkb_keysym_is_assigned
Add internal API `xkb_keysym_is_assigned` for tests, guarded by
`ENABLE_PRIVATE_APIS` in order to avoid increasing the size of the installed library.
2024-01-10 14:18:43 +01:00
Pierre Le Marre 82f138c633 keysyms: Add min and max assigned keysyms internal API
Currently there is no direct way to know the minimum and maximum keysym
values that are assigned, i.e. that have an explicit name or are
Unicode keysyms.

Introduce the new following internal API:
- XKB_KEYSYM_MIN_ASSIGNED
- XKB_KEYSYM_MAX_ASSIGNED
- XKB_KEYSYM_MIN_EXPLICIT
- XKB_KEYSYM_MAX_EXPLICIT
- XKB_KEYSYM_COUNT_EXPLICIT

Also add a bunch of tests to ensure consistant keysyms bounds.
2024-01-10 14:18:43 +01:00
Pierre Le Marre 4a92f61b5c keysyms: Add Unicode constants
Add the following constants in order to improve the code readability:
- XKB_KEYSYM_UNICODE_OFFSET
- XKB_KEYSYM_UNICODE_MIN
- XKB_KEYSYM_UNICODE_MAX
2024-01-10 14:18:43 +01:00
Peter Hutterer 31ebe0037b test: add a test for multiple keysyms (and some minimal docs)
I couldn't find any reference to *how* the keymap format actually needs to look
like if you want multiple keysyms per level. So let's add a test for it and a
minimal documentation entry.
2023-12-27 12:23:46 +01:00
Pierre Le Marre dd65950f44 Provide ssize_t for Windows
`ssize_t` is not part of standard C but is specific to POSIX.
2023-12-19 07:45:26 +01:00
Pierre Le Marre 7185b023c5 Add documentation to XkbToControl
While some transformations are defined in the section “Interpreting the
Control Modifier” of the XKB protocol, a lot are not. Documentation is
scarce about the topic, so write down some context using the following
sources:

- https://en.wikipedia.org/wiki/Caret_notation#Use_in_software
- https://www.vt100.net/shuford/terminal/dec_keyboards_news.txt
- https://misc.openbsd.narkive.com/NvSWf6ax/which-key-shortcuts-are-safe-to-bind-and-some-q-s-about-history-and-os-diffs-re-ctrl-4-means
- https://vt100.net/docs/vt220-rm/chapter3.html#T3-5
2023-12-19 07:01:04 +01:00
Brendan Le Foll 244128aa79 Update meson.build error message when enable-wayland enabled (#419)
Let's drop the explicit versions, meson prints a message anyway that 
specifies the version we have vs the one we need.
2023-12-14 10:44:00 +10:00
Pierre Le Marre 20329baf4d xkbcomp: Use steal for better memory handling 2023-12-04 10:44:52 +10:00
Pierre Le Marre 20c6fa62a7 registry: Use steal for better memory handling 2023-12-04 10:44:52 +10:00
Pierre Le Marre dbc187cfa1 utils: Steal steal from libei
Add excerpt of `util-mem.h` from libei defining the macro `steal`, in
order to improve memory management and the code semantics.

See: https://gitlab.freedesktop.org/libinput/libei/-/blob/38132d6fc5905e2d4361325fdded29a0dff990d6/src/util-mem.h#L92
2023-12-04 10:44:52 +10:00
ppw0 0db1dc1c4a fix error with "-Wl,--gc-sections" 2023-12-02 19:13:39 +02:00
Pierre Le Marre 7caf57f013 registry: Parse “popularity” attribute
Previously the attribute “popularity” was completely ignored. It also
did not respect the modified DTD, because its default value depends if
we are currently parsing an “extras” rules file.

Fixed:
- Always parse the popularity attribute.
- Change the DTD to reflect that the default value is implied.
2023-11-21 08:10:22 +01:00
Pierre Le Marre cfcc7922c2 xkbcli-compose: Simplify locale options
Current options to set the locale are convoluted:
- An explicit locale *must* be given, while a sane default would be
  to use the user environment.
- Then there are two options that were useful while testing locale
  handling: read environment variables or use `setlocale`. But the
  program has already called:
  ```
  setlocale(LC_ALL, "");
  ```
  so it turns out the two options lead to the same results.

Remove options `--locale-from-env` and `--locale-from-setlocale`
and make the locale default to the user environment.
2023-11-19 09:57:24 +01:00
Pierre Le Marre 0a577a0998 xkbcli-compile-compose: Fix string result escaping
Currently the result string is not escaped and may produce invalid
results.

Fixed by introducing an ad-hoc escape function and relative tests.
2023-11-19 09:57:24 +01:00
Pierre Le Marre d826d70b9b xkbcli: Fix bash completion
`compgen` expect command options list formatted as a newline-separated
list. Add a missing newline when concatenating two lists.
2023-11-19 09:57:24 +01:00
Pierre Le Marre bc330c00e6 xkbcli: Promote compose to xkbcli-compile-compose
Previously this tool was only used for internal testing and thus
not installed. But it is useful for debugging, much like
xkbcli-compile-keymap.
2023-11-19 09:57:24 +01:00
Pierre Le Marre 79502700a6 Doc: fix malformed links and some typos 2023-11-14 10:33:31 +01:00
Pierre Le Marre 00e3058e7b Prevent recursive includes of keymap components
- Add check for recursive includes of keymap components. It relies on
  limiting the include depth. The threshold is currently to 15, which
  seems reasonable with plenty of margin for keymaps in the wild.
- Add corresponding new log message `recursive-include`.
- Add tests for recursive includes.
2023-11-06 22:06:25 +01:00
Pierre Le Marre 4b58ff7859 Fix memory leak in print_keymap
The string buffer was not freed.
2023-11-06 21:44:41 +01:00
Pierre Le Marre 171e0170c2 Fix memory leak in FindFileInXkbPath
The string `buf` was not freed after each call to `asprintf_safe`.

Avoid allocating and introduce the new message: `XKB_ERROR_INSUFFICIENT_BUFFER_SIZE`.
2023-11-06 21:44:41 +01:00
Pierre Le Marre 2b71431007 Fix memory leaks in key types compilation
When there is no error the types are “stolen” and copied to the keymap.
But when there is an error, `MergeIncludedKeyTypes` just return without
“stealing” nor freeing the types.

Fixed by explicitly freeing the key types.

Fixed another leak in `HandleKeyTypeDef` that may occur if there is an
error in parsing a type definition.
2023-11-06 21:44:41 +01:00
Pierre Le Marre 0f9c95df06 interactive-x11: Add support for Compose 2023-11-06 20:57:13 +01:00
Pierre Le Marre c7f4e308f2 interactive-wayland: Add support for Compose 2023-11-06 20:57:13 +01:00
Sam James fed96378a1 state: fix -Walloc-size
GCC 14 introduces a new -Walloc-size included in -Wextra which gives:
```
src/state.c:589:9: warning: allocation of insufficient size ‘1’ for type ‘struct xkb_state’ with size ‘128’ [-Walloc-size]
```

The calloc prototype is:
```
void *calloc(size_t nmemb, size_t size);
```

So, just swap the number of members and size arguments to match the prototype, as
we're initialising 1 struct of size `sizeof(struct xkb_state)`. GCC then sees we're not
doing anything wrong.

Signed-off-by: Sam James <sam@gentoo.org>
2023-11-06 12:32:46 +10:00
Pierre Le Marre 3aaa4e2a53 rules: early detection of invalid encoding 2023-11-03 04:16:50 +01:00
Pierre Le Marre 82e9293e12 xkbcomp: early detection of invalid encoding 2023-11-03 04:16:50 +01:00
Pierre Le Marre a2da57aba1 Compose: early detection of invalid encoding
Also move “unrecognized token” error message before skiping the
line, in order to fix token position.
2023-11-03 04:16:50 +01:00
Pierre Le Marre 6c54681fe7 Compose: Fix UTF-8 BOM detection
The leading UTF-8 BOM detection code is misplaced as it is executed
after each EOL.

Fixed by moving the code before the goto labels.
2023-10-30 12:44:55 +01:00
Pierre Le Marre 9e88718080 rules: skip heading UTF-8 encoded BOM (U+FEFF)
Leading BOM is legal and is used as a signature — an indication that
an otherwise unmarked text file is in UTF-8.
See: https://www.unicode.org/faq/utf_bom.html#bom5 for further details.
2023-10-30 07:15:13 +01:00
Pierre Le Marre f937c30820 xkbcomp: skip heading UTF-8 encoded BOM (U+FEFF)
Leading BOM is legal and is used as a signature — an indication that
an otherwise unmarked text file is in UTF-8.
See: https://www.unicode.org/faq/utf_bom.html#bom5 for further
details.
2023-10-30 07:15:13 +01:00
Pierre Le Marre 59886e4183 Compose: skip heading UTF-8 encoded BOM (U+FEFF)
Leading BOM is legal and is used as a signature — an indication that
an otherwise unmarked text file is in UTF-8.
See: https://www.unicode.org/faq/utf_bom.html#bom5 for further details.
2023-10-30 07:15:13 +01:00
Ran Benita 6073565903 ci: fix url in github release text
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-10-08 23:55:38 +03:00
Ran Benita d2a08f761c Bump version to 1.6.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-10-08 23:46:48 +03:00
Wismill 05fd5100af Update NEWS for 1.6.0 (#385) 2023-10-08 23:45:05 +03:00
Pierre Le Marre 238d132406 Keysyms: Fix missing hpYdiaeresis
The handling of keysym name guards (e.g. `#ifndef XK_Ydiaeresis`) was
incomplete and led to a missing keysym.

Make `sripts/makeheader` more robust to C macros handling.
2023-10-06 09:37:40 +02:00
Pierre Le Marre 1c1542d64f Tools: Add bash completions for xkbcli
- Add bash completion script. It parses the commands help messages to
  provide the completions, thus any new subcommand or option will be
  supported, as long as it has its entry in the help messages. This
  should result in low maintenancei effort.
- Add installation entry in Meson. The path can be configured using
  the following options:
  - `enable-bash-completion` to enable the installation;
  - `bash-completion-path` to control the installation path. It will
    default to: `share/bash-completion/completions`.

TODO: completion for other shells, such as zsh?
2023-10-05 06:24:02 +02:00
Pierre Le Marre 357c00b3a1 Tools: Improve xkbcli help messages and manual pages
Add missing `--help` and `--short` entries.
2023-10-05 06:24:02 +02:00
Pierre Le Marre 87dcf30126 Fix trailing whitespaces in XKB files 2023-09-29 09:42:08 +02:00
Pierre Le Marre 1a4a89a749 Python: make ruff & black happy 2023-09-29 09:42:08 +02:00
Pierre Le Marre c6716461d1 Add support for pre-commit
See https://pre-commit.com for further info. Current checks:

- Whitespaces
- Yaml
- Large files
- Python linting/formatting

TODO: investigate options for C linter and formatter
2023-09-29 09:42:08 +02:00
Pierre Le Marre 0d4541151f Keysyms: Fix failing tests
- Update keymap to use reference keysym names.
- Fix x11comp test by handling old x11proto.

  We need xkbcomp to be compiled with at least x11proto-dev 2023.2.
  So we replace the unsupported keysyms with supported ones not
  already in the keymap. This is kind of ugly, but it works. If we
  ever want to restore the original keysyms with their supported names,
  the substitute keysyms will be easy to spot.
2023-09-28 07:48:37 +02:00
Pierre Le Marre 49690d936b Keysyms: Update using latest xorgproto
xorgproto commit: 1c8128d72df22843a2022576850bc5ab5e3a46ea.
2023-09-28 07:48:37 +02:00
Pierre Le Marre 9c2f0fdbed scripts/makeheader: Minor improvements
Use `pathlib` for proper path handling.
2023-09-28 07:48:37 +02:00
Pierre Le Marre 9d15c6a7a1 Show invalid escape sequences
It is easier to debug when the message actually displays the offending
escape sequence.
2023-09-26 17:25:49 +02:00
Pierre Le Marre 0038c86607 Prevent overflow of octal escape sequences
The octal parser accepts the range `\1..\777`. The result is cast to
`char` which will silently overflow.

This commit prevents overlow and will treat `\400..\777` as invalid
escape sequences.
2023-09-26 17:25:49 +02:00
Pierre Le Marre ca7aa69cc0 Disallow producing NULL character with escape sequences
NULL usually terminates the strings; allowing to produce it via escape
sequences may lead to undefined behaviour.

- Make NULL escape sequences (e.g. `\0` and `\x0`) invalid.
- Add corresponding test.
- Introduce the new message: XKB_WARNING_INVALID_ESCAPE_SEQUENCE.
2023-09-26 17:25:49 +02:00
Ran BenitaandPierre Le Marre a17701327e Compose: add iterator API
Allow users to iterate the entries in a compose table. This is useful
for other projects which want programmable access to the sequences,
without having to write their own parser.

- New API:
  - `xkb_compose_table_entry_sequence`;
  - `xkb_compose_table_entry_keysym`;
  - `xkb_compose_table_entry_utf8`;
  - `xkb_compose_table_iterator_new`;
  - `xkb_compose_table_iterator_free`;
  - `xkb_compose_table_iterator_next`.
- Add tests in `test/compose.c`.
- Add benchmark for compose traversal.
- `tools/compose.c`:
  - Print entries instead of just validating them.
  - Add `--file` option.
  - TODO: make this tool part of the xkbcli commands.

Co-authored-by: Pierre Le Marre <dev@wismill.eu>
Co-authored-by: Ran Benita <ran@unusedvar.com>
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-09-26 09:02:45 +02:00
Pierre Le Marre c0065c95a4 Messages: merge macros with and without message code
Previously we had two types of macros for logging: with and without
message code. They were intended to be merged afterwards.

The idea is to use a special code – `XKB_LOG_MESSAGE_NO_ID = 0` – that
should *not* be displayed. But we would like to avoid checking this
special code at run time. This is achieved using macro tricks; they
are detailed in the code (see: `PREPEND_MESSAGE_ID`).

Now it is also easier to spot the remaining undocumented log entries:
just search `XKB_LOG_MESSAGE_NO_ID`.
2023-09-24 09:09:24 +02:00
Pierre Le Marre a83d745b62 Messages: add new messages to registry
This commit is another step to identify and document the maximum number
of logging messages. Bulk changes:

- Rename `conflicting-key-type` to `conflicting-key-type-merging-groups`.
  Giving more context in the name allow us to introduce
  `conflicting-key-type-definitions` later.
- Add conflicting-key-type-definitions
- Add conflicting-key-type-map-entry
- Add undeclared-modifiers-in-key-type
  Also improve the log messages.
- Add conflicting-key-type-preserve-entries
- Use XKB_ERROR_UNSUPPORTED_MODIFIER_MASK
- Add illegal-key-type-preserve-result
- Add conflicting-key-type-level-names
- Add duplicate-entry
- Add unsupported-symbols-field
- Add missing-symbols-group-name-index
- Use XKB_ERROR_WRONG_FIELD_TYPE
- Add conflicting-key-name
- Use XKB_WARNING_UNDEFINED_KEYCODE
- Add illegal-keycode-alias
- Add unsupported-geometry-section
- Add missing-default-section
- Add XKB_LOG_MESSAGE_NO_ID
- Rename log_vrb_with_code to log_vrb
- Use ERROR_WRONG_FIELD_TYPE & ERROR_INVALID_SYNTAX
- Add unknown-identifier
- Add invalid-expression-type
- Add invalid-operation + fixes
- Add unknown-operator
- Rename ERROR_UNKNOWN_IDENTIFIER to ERROR_INVALID_IDENTIFIER
- Add undeclared-virtual-modifier
- Add expected-array-entry
- Add invalid-include-statement
- Add included-file-not-found
- Add allocation-error
- Add invalid-included-file
- Process symbols.c
- Add invalid-value
- Add invalid-real-modifier
- Add unknown-field
- Add wrong-scope
- Add invalid-modmap-entry
- Add wrong-statement-type
- Add conflicting-key-symbols-entry
- Add invalid-set-default-statement
2023-09-24 09:09:24 +02:00
Wismill b900faf77b Keysyms: improve generator (#364)
Motivation: normalization of keysyms header files in `xorgproto`. See:
https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/80

Improve `scripts/makeheader`:
- Simplify `evdev` and `XK_` substitution and improve alignment. Also, perform
  some additional `XK_` substitutions in comments.
- Format with `black`.
2023-09-20 07:45:15 +02:00
Pierre Le Marre eafd3aceca Add a new warning for numeric keysyms
Usually it is better to use the corresponding human-friendly keysym
names. If there is none, then the keysym is most probably not
supported in the ecosystem. The only use case I see is similar to the
PUA in Unicode (see: https://en.wikipedia.org/wiki/Private_Use_Areas).
I am not aware of examples of this kind of use.
2023-09-19 08:49:52 +02:00
Pierre Le Marre 417d0747b6 Add xkb-check-messages tool
This tool checks whether messages codes are supported.

This is useful e.g. for CI, where one may want to grep for some XKB
error codes and ensure that these are still supported.
2023-09-19 08:49:52 +02:00
Pierre Le Marre 399aa888e0 Use warning code in xkeyboard-config test 2023-09-19 08:49:52 +02:00
Pierre Le Marre ef81d04eef Structured log messages with a message registry
Currently there is little structure in the log messages, making
difficult to use them for the following use cases:

- A user looking for help about a log message: the user probably
  uses a search engine, thus the results will depend on the proper
  indexing of our documentation and the various forums. It relies
  only on the wording of the message, which may change with time.
- A user wants to filter the logs resulting of the use of one of the
  components of xkbcommon. A typical example would be testing
  xkeyboard-config against libxkbcommon. It requires the use of a
  pattern (simple words detection or regex). The issue is that the
  pattern may become silently out-of-sync with xkbcommon.

A common practice (e.g. in compilers) is to assign unique error codes
to reference theses messages, along with an error index for
documentation.

Thus this commit implements the following features:

- Create a message registry (message-registry.yaml) that defines the
  log messages produced by xkbcommon. This is a simple YAML file that
  provides, for each message:

  - A unique numeric code as a short identifier. It is used in the
    output message and thus can be easily be filtered to spot errors
    or searched in the internet. It must not change: if the
    semantics of message changes, it is better to introduce a new
    message for clarity.
  - A unique text identifier, meant for two uses:

    1. Generate constants dealing with log information in our code
       base.
    2. Generate human-friendly names for the documentation.

  - A type: currently warning or error. Used to prefix the constants
    (see hereinabove) and for basic classification in documentation.
  - A short description, used as concise and mandatory documentation.
  - An optionnal detailed description.
  - Optional examples, intended to help the user to fix issues
    themself.
  - Version of xkbcommon it was added. For old entries this often
    unknown, so they will default to 1.0.0.
  - Version of xkbcommon it was removed (optional)

  No entry should ever be deleted from this index, even if the message
  is not used anymore: it ensures we have unique identifiers along the
  history of xkbcommon, and that users can refer to the documentation
  even for older versions.

- Add the script update-message-registry.py to generate the following
  files:

  - messages.h: message code enumeration for the messages currently
    used in the code base. Currently a private API.
  - message.registry.md: the error index documentation page.

- Modify the logging functions to use structured messages. This is a
  work in progress.
2023-09-19 08:49:52 +02:00
Pierre Le Marre 0e3e2d1730 interactive-evdev: add option to print modmaps
Add an option to print modmap and vmodmap of relevant keys, as well as
virtual modifiers mapping to real modifier. This is useful for debugging.
It uses private API, so we compile it separately in the fashion of
`xkbcli-compile-keymap/compile-keymap`.
2023-09-18 16:14:12 +02:00
Pierre Le Marre b5079dc96d Interactive tools: add options to hide some fields
Display can be cluttered when too many fields are displayed.

Add options to hide some default fields
2023-09-18 16:14:12 +02:00
Pierre Le Marre c23c6bb996 Interactive tools: always print keycode 2023-09-18 16:14:12 +02:00
Pierre Le Marre 44029221e8 Interactive tools: Escape control character for Unicode output
Currently the interactive tools print the string result of key strokes
as it is, without any escape. This is especially annoying for trivial
keysyms such as: Return, BackSpace and Escape.

Fix this by displaying the Unicode code point notation (e.g U+000D for
Return) for single control characters from the C0 set and DEL.

This is a hack: ideally we would like to escape any non-printable
character in the utf-8 string.
2023-09-18 16:14:12 +02:00
Pierre Le Marre cf228acd26 CI: Use git master for xkeyboard-config on Linux
xkeyboard-config and xkbcommon projects are quite intertwined so we
want things to blow up early.

It also solves an issue with the x11comp test.
2023-09-18 16:07:09 +02:00
Pierre Le Marre fe9cd66fca Test: Enable x11comp and use the xvfb wrapper
This test was previously disabled in 914e84e018.

Note that it requires a recent version of xkeyboard-config to succeed.
2023-09-18 16:07:09 +02:00
Pierre Le Marre 266427723a Test: Catch SIGUSR1 from Xvfb for X11 tests
Based on the work done by Peter Hutterer. Original commit message:

If SIGUSR1 is set to SIG_IGN, X servers (all of them, including Xvfb)
will send that signal to the parent process when they're ready to accept
connections. We can use that instead of a hardcoded sleep which brings
the wait down to ~37ms on my box.
2023-09-18 16:07:09 +02:00
Pierre Le Marre 26b1a07659 Test: Use a xvfb wrapper for x11 test
The x11 test is currently silently skipped in CI, because it requires a
running X server.

Create a xvfb wrapper to run the test. We do not use `xvfb-run`, because
it is a shell script and it causes valgrind to detect unrelated memory
issues in the shell (dash, bash).

Improve wrapper using a special ELF section

TODO: The wrapper is intended to be used with the x11comp test as well.
2023-09-18 16:07:09 +02:00
Ran Benita c1b6c79aba doc: fix some Doxygen warnings
```
libxkbcommon/doc/introduction-to-xkb.md:67: warning: unable to resolve reference to 'rule-file-format' for \ref command
libxkbcommon/doc/introduction-to-xkb.md:181: warning: unable to resolve reference to 'keymap-text-format-v1' for \ref command
libxkbcommon/doc/rules-format.md:10: warning: unable to resolve reference to 'xkb-intro' for \ref command
```

Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-08-05 22:29:56 +03:00
M Kelly e7f02d322a parser: change deprecated %pure-parser to %define api.pure (#370)
This is now supported by byacc since version 2.0 20230516
2023-08-05 22:29:36 +03:00
Pierre Le Marre a4c0852687 Improved tests related to keysyms
- Add a keymap test with decimal and hexadecimal keysyms.
- Reorganize code in `test/keysym.c` by parsing type: name, Unicode and
  hexadecimal.
- Add more tests for edge cases. In particular:
  - test decimal format (currently not supported);
  - test the Unicode and hexadecimal ranges more thoroughly;
  - test with wrong case without the XKB_KEYSYM_CASE_INSENSITIVE flag;
  - test surrounding spaces.
- Document the tests.
2023-07-14 09:22:24 +02:00
Pierre Le Marre 7a815ad307 Fix parsing of numeric keysyms in ExprResolveKeySym
`ExprResolveKeySym` in `expr.c` does not parse non-digit numeric
keysyms.

Fixed by checking upper bound; also add warning messages.
2023-07-14 09:22:24 +02:00
Pierre Le Marre 0da68bc648 Simplify parsing of numeric keysyms in parser.y
In `parser.y`, a numeric keysym is parsed by formatting it in its
hexadecimal form then parsed as a keysym name. This is convoluted.

Fixed by checking directly the upper bound.
2023-07-14 09:22:24 +02:00
Pierre Le Marre 397e7e013d Fix xkb_keysym_from_name for numeric keysyms
When parsing hexadecimal keysym using `xkb_keysym_from_name`,
the result is limited by `parse_keysym_hex` to 0xffffffff, but the
maximum keysym is XKB_MAX_KEYSYM, i.e. 0x1fffffff.

Fixed by adding an upper bound.
2023-07-14 09:22:24 +02:00
Pierre Le Marre 4823838fa3 Move STRINGIFY to utils.h and add STRINGIFY2 2023-07-14 09:22:24 +02:00
Pierre Le Marre 8c7076a0b5 Improve the documentation of keysyms in xkbcommon.h 2023-07-14 09:22:24 +02:00
Pierre Le Marre e811743ff2 Add XKB_KEYSYM_MIN and XKB_KEYSYM_MAX
Keysyms are 32-bit integers with the 3 most significant bits always set
to zero. See: Appendix A “KEYSYM Encoding” of the X Window System
Protocol at https://www.x.org/releases/current/doc/xproto/x11protocol.html#keysym_encoding.

Add a new constants XKB_KEYSYM_MIN and XKB_KEYSYM_MAX to make the
interval of valid keysyms more obvious in the code.
2023-07-14 09:22:24 +02:00
Pierre Le Marre 0d01a933bb Replace keycode numeric offset with EVDEV_OFFSET
Add a constant `EVDEV_OFFSET` to make the semantic of the offset clearer.
2023-07-04 10:59:19 +02:00
Peter Hutterer 0624d8ff49 Check the doxygen version
Doxygen 1.9.7 breaks our urls, see issue #347. Let's put a check for the
doxygen version into our CI build so that if our base distro updates beyond
that, the CI fails and we know we have to build doxygen from scratch or
update to some other version that's supported.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2023-07-04 14:56:32 +10:00
Peter Hutterer 134c6bb28e Configure github pages
Upload the doxygen output as artifact from the linux build and use that from
the pages job where we combine the static website with our newly build HTML
docs.  The GitHub actions/download-artefact doesn't work across workflows so
we use the other popular one that can do this. The rest of the job is
basically copy/paste from the "Static HTML" example GitHub provides.

To make this useful as drop-in replacement, replace the one fixed link to the
API docs a relative one.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2023-07-04 14:56:32 +10:00
Ran Benita f75c0a2de6 xkbcli: allow compile-keymap without args
All of the arguments have defaults, but still an argument is required.
Make it work.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-07-03 13:53:26 +10:00
Pierre Le Marre 37fdd87c82 Add a meson flag to make cool URIs optional
The script `ensure-stable-doc-urls.py` relies on the Doxygen output files
names. These may change between Doxygen versions, although the Doxygen
developers intend stability.

Since the script is useful mainly for the online documentation of
xkbcommon, make the target `doc-cool-uris` optional.
2023-06-30 17:14:59 +02:00
Pierre Le Marre fc25e0f0f7 Test(compose): fix assumption on environment variables
The test `test_from_locale` fails when there is a user-defined compose
file, e.g. ~/.XCompose.

Indeed, the function `xkb_compose_table_new_from_locale` use various
environment variables to determine the location of the compose file.

Ensure no environment variables but the required ones are set, in order
to have robust tests.
2023-06-28 07:52:04 +02:00
Pierre Le Marre de9d82077c interactive-evdev: includes options
Currently there is no interactive tool allowing to set the include
paths of the context, such as in "compile-keymap". Note that only
"interactive-evdev" makes sense, because it does not rely on a
compositor.

Add --include and --include-defaults to "interactive-evdev" tool.
The code is adapted from "compile-keymap".
2023-06-26 09:52:38 +02:00
Pierre Le Marre 2c86216b5b CI: Fix documentation generation for macOS
- Force Doxygen version 1.9.6, because 1.9.7 breaks our doc cool URIs,
  i.e. our system that maintain stable doc pages via redirection.

  Associated issue in Doxygen:
  https://github.com/doxygen/doxygen/issues/10146

- Install graphviz to build the .dot files.
2023-06-26 09:50:01 +02:00
Pierre Le Marre eec389037e Fix typo in ensure-stable-doc-urls.py 2023-06-26 09:50:01 +02:00
alois31 f3210cbf27 compose: drop the 65535 node limit (#343)
In commit 1638409b22, the number of
compose nodes was limited to 65535 to enable "future optimizations",
which apparently means slightly reduced memory usage due to fitting in
a uint16_t. At this time, it was mentioned that the author was not
aware of "any compose files which come close".

However, I'm one of the users that actually do require a larger number
of nodes for their compose file. Thus, use a uint32_t again and raise
the limit significantly.
2023-05-15 15:23:16 +03:00
Wismill 64aaa7cda2 Add support for stable doc URLs (#342)
Doc URLs may change with time because they depend on Doxygen machinery.
This is unfortunate because it is good practice to keep valid URLs
(see: https://www.w3.org/Provider/Style/URI.html).

I could not find a built-in solution in Doxygen, so the solution proposed
here is to maintain a registry of all URLs and manage legacy URLs as
redirections to their canonical page.

This commit adds a registry of URLs that has three functions:
- Check no previous URL is now invalid.
- Add aliases for moved pages.
- Generate redirection pages for aliases. The redirection works with
  a simple <meta http-equiv="refresh"> HTML tag. See:
  https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meta#http-equiv

This commit also initialize the URLs registry with current pages and some
redirections needed after recent documentation refactoring.

Finally, the CI is updated to catch any change that invalidate previous
URLs.
2023-05-14 15:11:15 +02:00
Pierre Le Marre fc664cf1cc Improve documentation
- Add introduction to XKB
- Embrace Doxygen features
- More cross links
2023-05-13 22:05:23 +03:00
Pierre Le Marre 183761ac24 Do not interpret nor emit invalid Unicode encoding forms
Surrogates are invalid in both UTF-32 and UTF-8.
See https://www.unicode.org/versions/Unicode15.0.0/ch03.pdf#G28875
and https://www.unicode.org/versions/Unicode15.0.0/ch03.pdf#G31703
2023-05-13 22:02:46 +03:00
Pierre Le Marre 5fbffaf035 Add warning when RMLVO with no layout but variant set
There is no feedback that they are both replaced with default values.
Fix it by adding a warning informing about missing layout and show the
defaults for both.
2023-05-13 21:59:37 +03:00
Ran Benita c8efb70406 ci: bump runs-on versions
Mostly to bump to macos one which will hopefully fix CI issues there.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-05-12 22:27:17 +03:00
Ran Benita 5a5ab3e880 utils: fix printf format warnings on mingw
See:
https://github.com/mesonbuild/wrapdb/pull/819
https://github.com/Exiv2/exiv2/blob/c86ae6acf597304db37246434ebc393d732c22c2/src/image_int.hpp#L15
https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/

Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-05-06 17:29:45 +03:00
Ran Benita 45ba936bf0 ci/windows: use the vs backend instead of ninja backend
So we have some coverage of that.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-05-05 11:17:07 +03:00
Ran Benita e020174ac6 build: show a summary
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-05-05 11:17:07 +03:00
Ran Benita 80be81e5ce build: require bison >= 2.3a
At least 2.3 (released 2006) which is the version shipped with macos
doesn't work. Reading the changelog I think 2.3a *should* work, so
require that.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-05-05 11:17:07 +03:00
Ran Benita 60d38b0c05 build: bump required meson to 0.52.0
Support for version checks in `find_program()`.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-05-05 11:17:07 +03:00
Peter Hutterer b06aedb8ba scanner: allow for a zero terminated string as keymap
As the documentation for xkb_keymap_new_from_buffer() states, the "input string
does not have to be zero-terminated". The actual implementation however failed
with "unrecognized token/syntax error" when it encountered a null byte.

Fix this by allowing a null byte at the last position of the buffer. Anything
else is likely a client error anyway.

Fixes #307
2023-05-05 09:57:23 +10:00
Peter Hutterer 98b3314278 README: use meson compile/test over ninja
This is backend-agnostic and the recommended way to invoke compilation.

This requires meson 0.55 (July 2020) and we only require 0.51 but at this point
I'm expecting most users who require the README instructions will have a
recent-enough meson anyway.
2023-05-05 09:44:56 +10:00
Pierre Le Marre 536cf42704 .editorconfig: add .md config
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-05-04 11:58:48 +03:00
Ran Benita e422601121 Use consistent indentation for map and CSS files
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-05-04 11:58:48 +03:00
Peter Hutterer 8b7c1850e1 registry: remove a few asprintf/free() calls with snprintf
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2023-05-04 18:46:16 +10:00
Peter Hutterer a50890b155 registry: simplify strdup() error handling
strdup() is the least likely call to fail here, let's move it to the bottom so
we don't need to worry about the allocated string.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2023-05-04 18:46:16 +10:00
Ken Cunningham 46b7753fb8 meson.build: register libxkbcommon.dylib link
meson needs to know that the executable tools
link against libxkbcommon.dylib so that the
@rpath references used during the build/test phases
can be rewritten to full path names on install
2023-05-04 10:17:22 +10:00
Wismill 5b5b67f28c Add support for modmap None (#291)
Unlike current xkbcommon, X11’s xkbcomp allows to remove entries in
the modifiers’ map using “modifier_map None { … }”.

“None” is translated to the special value “XkbNoModifier” defined in
“X11/extensions/XKB.h”. Then it relies on the fact that in "CopyModMapDef",
the following code:

    1U << entry->modifier

ends up being zero when “entry->modifier” is “XkbNoModifier” (i.e. 0xFF).
Indeed, it relies on the overflow behaviour of the left shift, which in
practice resolves to use only the 5 low bits of the shift amount, i.e.
0x1F here. Then the result of “1U << 0xFF” is cast to “char”, i.e. 0.

This is a good trick but too magical, so in libxkbcommon we will use
an explicit test against our new constant XKB_MOD_NONE.
2023-05-01 23:30:41 +03:00
Wismill 0e9c2ec97e Improve the doc of the XKB keymap text format, V1 (#321)
- Add table of contents
- Add terminology section
- (WIP) Add Introduction to the format
- Improve the keycode section
- Improve the interpret section
- Add guide to create and use modifiers
- (WIP) Add actions documentation
- Add cross-references
- Add keysyms header to documentation
2023-04-30 22:30:36 +03:00
Ran Benita 003fdee137 keysyms: add new keysyms XF86EmojiPicker, XF86Dictate
Ref: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/914d8f5e0f469cd0416364dd008e9eea752bf703
Ref: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/a839f0c7fc5596d10e786394d3b0953eb8a1731b
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-04-12 10:29:42 +03:00
Ran Benita bd79a960f5 Possible fix for non-MSVC windows compilers
`_MSC_VER` is specific to MSVC, but there can be other compilers targeting
windows. Hopefully they do define `_WIN32`, so let's use that.

Refs: https://github.com/xkbcommon/libxkbcommon/issues/305
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-04-11 23:29:25 +03:00
Peter Hutterer 13d4b7f641 keysym: replace deprecated Serbian_DZE with Cyrillic_DZHE
Same numeric value for both and the Serbian one has been listed as deprecated
for decades.

See https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/69#note_1843415

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2023-03-31 10:11:59 +10:00
Simon Ser 5b5ec0ee27 build: override dependency for use as subproject
This allows xkbcommon to be used as a subproject.

Signed-off-by: Simon Ser <contact@emersion.fr>
2023-02-19 13:00:38 +02:00
Ran Benita c6ff79d5c1 NEWS: add "New API" section for last release
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-01-02 21:36:03 +02:00
Ran Benita cecaa01df1 Bump version to 1.5.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-01-02 21:23:30 +02:00
Ran Benita 233617d086 build: fix wayland-scanner deprecation code -> private-code
Signed-off-by: Ran Benita <ran@unusedvar.com>
2023-01-02 21:10:45 +02:00
Ran Benita 5ba075abe0 doc: clarify "server state" and "client state" distinction
Add a common page for the concept and link to there from the relevant
functions.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-12-17 13:53:29 +02:00
Ran Benita e5444f4195 build: require meson >= 0.51, fix meson deprecations
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-12-16 21:37:06 +02:00
Ran Benita 7428eb6e8b ci: don't run linux on push to non-master branches
It's redundant with the pull request run.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-12-16 21:36:13 +02:00
Ronan Pigott b4e81ca172 context: add XKB_CONTEXT_NO_SECURE_GETENV flag (#312)
This flag is useful for clients that may have relatively benign capabilities
set, like CAP_SYS_NICE, that also want to use the xkb configuration from the
environment and user configs in XDG_CONFIG_HOME.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/308
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/129
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-12-16 10:26:25 +02:00
Ran Benita 9d1043dcb5 build: remove -fsanitize-undefined-trap-on-error
Meson complains; it's probably not that important anymore when using the
`-Db_sanitize` options.

meson.build:36: WARNING: Consider using the built-in option for sanitizers instead of using "-fsanitize-undefined-trap-on-error".

Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-12-14 18:58:11 +02:00
Peter Hutterer a005d06c1d CI: bump a few actions to newer versions
Node 12 is deprecated so let's bump the actions to newer versions that
use Node 16. See
https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/
2022-12-14 18:22:55 +02:00
Ran Benita 2530f6444b build: reenable test-context in MSVC
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-09-24 12:31:53 +03:00
Ran Benita f9858bf5b9 test: move mkdir & mkdtemp calls to common place and fix them on MSVC
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-09-24 12:31:53 +03:00
Ran Benita 4d8293901b utils: move some MSVC compat stuff to common place
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-09-24 12:31:53 +03:00
Peter Hutterer b309514247 ci/linux: store the test logs as artifacts on failure
This makes debugging a lot easier than having to reproduce locally.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2022-09-24 10:09:11 +03:00
Peter Hutterer cc0e97e911 ci/linux: split normal testing from valgrind testing
A test case failure usually also triggers valgrind leaks, sifting through those
to find the actual test failure is painful. So let's separate the tests and run
them separately.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2022-09-24 10:09:11 +03:00
Jan Alexander Steffens (heftig) 320f56d2a4 interactive-wayland: Fix interface versioning
We need to request the lower version of the interface versions we
support and the server supports, not the higher version.

Using the higher version caused crashes due to unbound callbacks on
GNOME, which supports a higher version of `xdg_wm_base`.
2022-09-24 10:02:24 +03:00
Ran Benita 57af9cb71f Bump version to 1.4.1
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-05-21 22:55:22 +03:00
Ran Benita 4000a1bdde keysym-utf: remove bogus currency sign entries
These ended up being mapping in the 0x100xxxx Unicode range, which are
handled automatically ; these special keysyms don't exist (except for
EuroSign).

    #define XKB_KEY_EcuSign                    0x10020a0  /* U+20A0 EURO-CURRENCY SIGN */
    #define XKB_KEY_ColonSign                  0x10020a1  /* U+20A1 COLON SIGN */
    #define XKB_KEY_CruzeiroSign               0x10020a2  /* U+20A2 CRUZEIRO SIGN */
    #define XKB_KEY_FFrancSign                 0x10020a3  /* U+20A3 FRENCH FRANC SIGN */
    #define XKB_KEY_LiraSign                   0x10020a4  /* U+20A4 LIRA SIGN */
    #define XKB_KEY_MillSign                   0x10020a5  /* U+20A5 MILL SIGN */
    #define XKB_KEY_NairaSign                  0x10020a6  /* U+20A6 NAIRA SIGN */
    #define XKB_KEY_PesetaSign                 0x10020a7  /* U+20A7 PESETA SIGN */
    #define XKB_KEY_RupeeSign                  0x10020a8  /* U+20A8 RUPEE SIGN */
    #define XKB_KEY_WonSign                    0x10020a9  /* U+20A9 WON SIGN */
    #define XKB_KEY_NewSheqelSign              0x10020aa  /* U+20AA NEW SHEQEL SIGN */
    #define XKB_KEY_DongSign                   0x10020ab  /* U+20AB DONG SIGN */
    #define XKB_KEY_EuroSign                      0x20ac  /* U+20AC EURO SIGN */

Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-05-15 10:41:53 +03:00
Ran Benita 49e8a2d85b keysym-utf: remove bogus Korean Won sign entry
This entry maps a non existing special keysym 0x20a9.
The correct mapping for XKB_KEY_Korean_Won (0x0eff) already exists.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-05-15 10:35:30 +03:00
Sam LantingaandSimon Ser 2536713070 Remove bogus euro sign entry from keysymtab
Not sure what it's doing here, but converting "€" to a keysym
doesn't work with this entry. 0x13a4 doesn't appear in
xkbcommon-keysyms.h. 0x20ac is the keysym documented in the
header (and it's the last entry in the table).

It's been in the table since it was introduced in e0524296d2
("Add API for getting unicode representation of a keysym").

Co-authored-by: Simon Ser <contact@emersion.fr>
2022-05-15 10:26:44 +03:00
Weng Xuetian b064b60984 Do not clear sibling entries when override.
lokid and hikid actually stores the sibling to current node, which
should not be cleared when override. This would break the sequence with
a common prefix when override another.

Fix #286

Signed-off-by: Weng Xuetian <wengxt@gmail.com>
2022-05-15 10:07:57 +03:00
Ran Benita 3d56569ab2 ci/linux: bring back apt update to fix apt install 404s
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-03-20 13:51:14 +02:00
Ran Benita 0b3d90925c scanner: prefix functions with scanner_ to avoid symbol conflicts
Particularly `eof()` in mingw-w64.

Fixes: https://github.com/xkbcommon/libxkbcommon/pull/285
Reported-by: Marko Lindqvist
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-03-14 16:45:19 +02:00
Mladen Milinkovic a2507c0866 Improve misleading comments #270 2022-02-24 12:43:20 +02:00
Ran Benita 9e7f3ba496 ci: another possible fix for release workflow
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-02-04 12:59:18 +02:00
Ran Benita ea6580cc39 Bump version to 1.4.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2022-02-04 12:41:50 +02:00
Peter Hutterer 1c8ef9e0a5 test: add test for variant inheritance of ISO 639/3166 codes
See efa9962432
2022-02-04 12:30:27 +02:00
M Hickford efa9962432 Variants should inherit iso639, iso3166 and brief from parent layout if omitted (#266) 2022-01-24 11:16:08 +10:00
Peter Hutterer 9b05825e53 registry: skip over invalid ISO639 or ISO3166 entries
If the XML file is somehow off, don't load entries that are against the spec.
2022-01-24 10:44:31 +10:00
Peter Hutterer 34ef11d9c9 test: show the tool exit status on failure
We already do so for the non-successful cases, let's do this here too so we know
whether it was a signal or a normal exit.
2022-01-24 07:56:47 +10:00
Peter Hutterer 0e3f72af65 registry: don't call xmlCleanupParser()
From the documentation:
> It does not clean up parser state, it cleans up memory allocated by the library
> itself. It is a cleanup function for the XML library. It tries to reclaim all
> related global memory allocated for the library processing. [...]
> One should call xmlCleanupParser() only when the process has finished using the library.

http://xmlsoft.org/html/libxml-parser.html#xmlCleanupParser

Since we're a library ourselves we cannot know if something else in the same
proces uses the parser, so we must not call this.

Reported-by: M Hickford
2022-01-18 15:03:24 +10:00
Peter Hutterer be68829a6b CI: always run the linux workflow
This makes it easier for contributors to check if their code runs correctly
without having to file a PR.

The Mac and Windows workflows are a bit more involved, so let's keep those on
pull requests only.
2022-01-17 21:44:48 +10:00
Peter Hutterer 121cd37753 CI: split and rename the workflows to windows/macos/linux
"main" is a bit non-descriptive, let's name them after the platforms we run them
on. Splitting them up allows us to be less selective on how we run the various
workflows, e.g. always running the linux one.
2022-01-17 21:44:48 +10:00
M HickfordandRan Benita 9bbe629aad Update README.md
Co-authored-by: Ran Benita <ran@unusedvar.com>
2022-01-11 16:49:22 +02:00
matthickford 2e571b4392 Add instructions to run tests. Add build/ to .gitignore. 2022-01-11 16:49:22 +02:00
Alex Xu (Hello71) 8531ea723f build: add enable-tools option
this is mainly useful for multilib, but may be useful for other users as well

Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
2021-12-05 12:55:51 +02:00
Peter Hutterer 50a24569b8 tools/list: print an empty string for null vendor strings
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-11-11 08:26:36 +10:00
Peter Hutterer abb115c78f tools/list: enclose the the various field names in quotes
Because otherwise the 'no' layout is treated as disagreement with whatever is to
be disagreed with. Fixed in YAML 1.2 but that's not universally supported.

Fixes #268
2021-11-11 08:26:36 +10:00
Ran Benita e8cb431144 man: mention xkbcli list output is meant to be in YAML 1.2 format
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-11-01 23:56:22 +02:00
Ran Benita ae3b010e62 ci: possible fix for release workflow
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-09-17 00:00:11 +03:00
Ran Benita 88222c8d40 Bump version to 1.3.1
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-09-10 22:51:34 +03:00
Ran Benita 4a576ab184 x11: try to fix crash in xkb_x11_keymap_new_from_device error handling
In 1b3a1c277a we changed the error
handling in this code to not bail out immediately but only after
everything has been processed, to simplify the code. But I suspect the
code isn't prepared for this and that's what causing the crash reported
in the issue.

Bring back the short-circuit error handling which would hopefully fix
such crashes.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/252
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-09-09 16:52:47 +03:00
Ran Benita 4e361712d2 x11: stylistic fixes
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-08-31 22:03:03 +03:00
Ran Benita f8c430cf71 tools/how-to-type: add --keysym for how to type a keysym
Previously, could only check how to type a Unicode codepoint, but
searching for a keysym directly is also occasionally useful.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-07-31 22:03:33 +03:00
Simon Ser 5419e57736 tools/interactive-x11: use keysym to look for Esc
Don't assume that keycode 9 means Escape. Instead, use the keymap
to check for Esc.

Logic copied from the Wayland version.

Signed-off-by: Simon Ser <contact@emersion.fr>
2021-07-12 12:25:48 +03:00
Ran Benita eb59a1c55b bench/compose: fix compose file path
Forgotten in e2465c2.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-06-10 17:13:57 +03:00
Ran Benita 1318bedbb7 ci: some tweaks
- Reduce permissions
- Update some stuff

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-22 20:38:37 +03:00
Ran Benita c4fdcba305 ci: also link to tarball in github release
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-22 20:22:56 +03:00
Ran Benita 1f7ffde982 ci: automatically create github release when tag is pushed
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/233
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-22 20:20:12 +03:00
Ran Benita 8507af731a test/tool-option-parsing: don't depend on build prefix
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/244
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-22 20:11:10 +03:00
Ran Benita 98f07da895 test/compose: add tests for xkb_compose_table_new_from_locale lookup
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-22 20:07:06 +03:00
Ran Benita 5b1b2f7546 test/compose: clean up after a setenv
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-22 20:00:24 +03:00
Ran Benita e2465c2a69 tests/data: add files needed to fully test compose
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-22 19:58:40 +03:00
Ran Benita 09ac27f744 ignore: remove no longer relevant gitignore files
These were relevant for the autoconf build but now we're meson only.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-22 19:51:02 +03:00
Ran Benita 7062ab97b6 xkbcommon: deprecate XK_approxeq and XK_notapproxeq
Sync xorg-proto commit
https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/25f3278b85ec7d1c78bb150eaea52f9c98294ea4

Fixes: #82
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-22 19:36:22 +03:00
Peter Hutterer 8e9f943d38 scripts/update-keysyms: fix path to the include files after de1b6943d
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-05-14 08:45:03 +10:00
Ran Benita b6aadd57d9 tools: add compose tool for Compose debugging
Not very useful so not exposed in xkbcli.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-08 21:37:28 +03:00
Ran Benita 1915632e06 compose: add mapped locale to Compose-file-not-found error log
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-08 21:08:37 +03:00
Ran Benita 13ba9135c0 Bump version to 1.3.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-05-01 23:51:23 +03:00
Ran Benita 16fe837d8d atom: rewrite as a hash table
While the previous 1987-style[0] scheme was fun (and I reasonably
optimized it for a fair comparison), this task is more suited to a hash
table. Even a simple implementation beats the old one.

[0] Seems to have first appeared in X11R1, released September 1987.
    See server/dix/atom.c here: https://www.x.org/releases/X11R1/X.V11R1.tar.gz

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-27 16:41:32 +03:00
Ran Benita baf5522649 bench: add atom benchmark
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-27 16:41:32 +03:00
Ran Benita 5f8c2fa41a bench/rulescomp: decrease benchmark iterations
No need for more, and easier to convert to milliseconds per iteration.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-27 12:32:21 +03:00
Ran Benita 9d87f84915 build: fix missing includes
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-27 10:57:42 +03:00
Ran Benita de1b6943d2 Move include files to include/ subdirectory
This way we don't specify `include_directorories('.')` which brings in
more than needed.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-27 10:10:26 +03:00
Ran Benita 8ff0232bda build: move the subproject variables to a common section at the end
As suggested in:
https://github.com/xkbcommon/libxkbcommon/pull/240#discussion_r620784021

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-27 10:02:54 +03:00
Adrian Perez de Castro 4238417ba0 Meson: Allow building as subproject
Specify where to find the headers for libxkbcommon_dep,
libxkbcommon_x11_dep, and libxkbregistry_dep,  which allows other
projects to correctly locate the headers when libxkbcommon is being
built as a Meson subproject.

The dep_libxkbregistry variable is renamed to libxkbregistry_dep,
to follow the usual convention for variables which hold declared
dependencies to be used from subproject builds.
2021-04-27 09:54:58 +03:00
Adrian Perez de Castro 5cd76a8d93 Windows: Pass list of symbols to export to MSVC
Arrange for passing .def files with the lists of symbols to export from
DLLs when building on Windows with MSVC. Without this no symbols were
being exported at all.

The .def files are generated from the .map files at build time using
scripts/map-to-def, which avoids needing to maintain two different sets
of files.
2021-04-27 09:54:00 +03:00
Peter Hutterer f434c690cc tools: change xkbcli list to output YAML
We have a lot of keyboard layouts and the current output format is virtually
useless at searching for a specific one to debug any issues with either the
layout list or the output from libxkbregistry.

Let's use YAML instead because that can easily be post-processed to extract the
specific layouts wanted, e.g. to get the list of all layouts:
  xkbcli-list | yq -r ".layouts[].layout"
to get the list of all variants of the "us" layout:
  xkbcli-list | yq -r '.layouts[] | select(.layout == "us") | .variant
and the number of option groups:
  xkbcli-list | yq -r '.option_groups[] | length'

Note that the top-level nodes have been de-capitalized, so where it was "Models"
before it is now "models" and the "Options" node is now "option_groups".

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-04-27 09:53:32 +03:00
Peter Hutterer 693ffb073b tools: change the list separator handling
Slightly easier to read than the "bool first" approach.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-04-27 09:53:32 +03:00
Isaac Freund 68dddd4132 keysym: fix underflow in binary searches
This is hit when passing an empty string and XKB_KEYSYM_CASE_INSENSITIVE
to xkb_keysym_from_name currently if `(lo + hi) / 2` is 0 and `cmp < 0`,
causing mid to underflow and the the array access into name_to_keysym on
the next iteration of the loop to be out of bounds .

We *would* use ssize_t here as it is the appropriate type, but windows
unfortunately does not define it.
2021-04-25 12:25:58 +03:00
Peter Hutterer 1557668364 test: allow skipping errors in certain conditions
Add a skipError test function that can analyse rc, stdout, stderr to skip a test
even when we expect an error. We use that to skip if we couldn't find a keyboard
in the interactive-evdev test.

Fixes #235

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-04-22 10:02:46 +10:00
Peter Hutterer f60bdb1680 test: add extra info to the layout-tester --help output
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-04-20 10:30:17 +03:00
Peter Hutterer be520ef91c test: print the layout-tester progress bar to stdout by default
tqdm prints to stderr by default but we're using that for failed keymap
compiles (which are the ones that really matter). Plus, whether we're using tqdm
is dependent on isatty(sys.stdout) anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-04-20 10:30:17 +03:00
Peter Hutterer efa5805032 test: add an LVO argument to the XKB layout tester
Slightly easier to debug if we can have it only parse one single layout.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-04-20 10:30:17 +03:00
Peter Hutterer a955dca3d5 test: print the compiled keymaps to a given directory
With --keymap-output-dir, the given directory will contain a list of files named
after the layout + variant ('us', 'us(euro)', ...) that contain the keymaps for
each variant + option combination compiled.

This is still a lot, but better to sift through hundreds of keymaps than tens of
thousands.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-04-20 10:30:17 +03:00
Peter Hutterer 1cae250052 test: rework the output for the xkeyboard-config layout tester
The previous output is largely unusable. The result in the CI test runs is a 6GB
file with every compiled keymap in it and while we can grep for ERROR, it's not
particularly useful.

Let's change this and print out YAML instead - that can be machine-processed.
This patch adds a new parent class that prints itself in YAML format,
the tool invocations are child classes of that class. The result looks like this:

Example output:
- rmlvo: ["evdev", "pc105", "us", "haw", "grp:rwin_switch"]
  cmd: "xkbcli-compile-keymap --verbose --rules evdev --model pc105 --layout us --variant haw --options grp:rwin_switch"
  status: 0
- rmlvo: ["evdev", "pc105", "us", "foo", ""]
  cmd: "xkbcli-compile-keymap --verbose --rules evdev --model pc105 --layout us --variant foo"
  status: 1
  error: "failed to compile keymap"

Special status codes are: 99 for "unrecognized keysym" and 90 for "Cannot open
display" in the setxkbmap case.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-04-20 10:30:17 +03:00
Peter Hutterer 44e8d4b044 test: add proper --verbose handling to the xkeyboard-config tester
Instead of defaulting to verbose on/off depending on isatty, make it an
argument instead.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-04-20 10:30:17 +03:00
Evgeniy Khramtsov f04c7e93ce interactive-wayland: fallback to ftruncate() if needed
Fallback to ftruncate() if the underlying filesystem does not
support posix_fallocate().

Idea by: Jan Beich <jbeich@FreeBSD.org>, Niclas Zeising <zeising@FreeBSD.org>
Inspired by: Wayland cursor/os-compatibility.c
[ran: small adjustments]
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-14 13:44:57 +03:00
Jouke Witteveen 8b603dbe11 doc: fix user-configuration sample file
Support copy-pasting from the docs to get something functional.

Signed-off-by: Jouke Witteveen <j.witteveen@gmail.com>
2021-04-11 10:25:56 +03:00
Ran Benita 5d297c5012 scripts: update license note in perfect_hash.py
Ref: https://github.com/ilanschnell/perfect-hash/issues/5

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-08 10:14:15 +03:00
Ran Benita 097a0ca7d6 Bump version to 1.2.1
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-07 19:27:30 +03:00
Ran Benita 29af25eaa8 x11: fix xkb_x11_keymap_new_from_device failing when a level name is empty
The numpad:mac option doesn't specify a name for the first level:

    // On Mac keypads, level 1 and 2 are swapped.
    partial xkb_types "mac" {
        type "KEYPAD" {
            modifiers = None;
            map[None] = Level2;
            level_name[Level2] = "Number";
        };
        include "extra(keypad)"
    };

This means the atom for level name is XCB_ATOM_NONE. We tried to get its
name, which fails. This regressed in 40c00b4721.

Instead, translate it to XKB_ATOM_NONE, same as the previous behavior.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/229
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-07 19:21:10 +03:00
Ran Benita 086353b380 Bump version to 1.2.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-03 14:11:38 +03:00
Ran Benita 7e6d942a4f compose: fix max compose nodes check
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-02 15:15:33 +03:00
Ran Benita 45b1ca2205 keysym: speed up the perfect hash function
Make it use a bit operation instead of an expensive modulo.

perf diff:

    Baseline  Delta Abs  Shared Object      Symbol
    ........  .........  .................  ...................................

      28.15%     -6.57%  bench-compose      [.] xkb_keysym_from_name

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-01 22:52:59 +03:00
Ran Benita 8cd688c063 keysym: avoid strtoul in xkb_keysym_from_name
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-01 22:24:05 +03:00
Ran Benita 68e69b7deb keysym: use a perfect hash function for case sensitive xkb_keysym_from_name
In 7d84809fdc I added a fast path for the
case-sensitive case, but it is still slowing down Compose parsing.

Instead of the binary search, use a perfect hash function, computed with
a simple python module I found (vendored).

It is faster -- perf diff is:

   Baseline  Delta Abs  Shared Object      Symbol
   ........  .........  .................  ...................................

     22.35%    -14.04%  libc-2.33.so       [.] __strcmp_avx2
     16.75%    +10.28%  bench-compose      [.] xkb_keysym_from_name
     20.72%     +2.40%  bench-compose      [.] parse.constprop.0
      2.29%     -1.97%  bench-compose      [.] strcmp@plt
      2.56%     +1.81%  bench-compose      [.] resolve_name
      2.37%     +0.92%  libc-2.33.so       [.] __GI_____strtoull_l_internal
     26.19%     -0.63%  bench-compose      [.] lex
      1.45%     +0.56%  libc-2.33.so       [.] __memchr_avx2
      1.13%     -0.31%  libc-2.33.so       [.] __strcpy_avx2

Also reduces the binary size:

Before:

      text    data     bss     dec     hex filename
    341111    5064       8  346183   54847 build/libxkbcommon.so.0.0.0

After:

      text    data     bss     dec     hex filename
    330215    5064       8  335287   51db7 build/libxkbcommon.so.0.0.0

Note however that it's still larger than before 7d84809fdc:

      text    data     bss     dec     hex filename
    320617    5168       8  325793   4f8a1 build/libxkbcommon.so.0.0.0

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-04-01 20:06:59 +03:00
Ran Benita 02b9cabf98 compose: use a ternary tree instead of a regular trie
Previously we used a simple trie with a linked list for each chain.
Unfortunately most compose files have very long chains which means the
constructions performs an almost quadratic number of comparisons.

Switch to using a ternary search tree instead. This is very similar to a
trie, only the linked list is essentially replaced with a binary tree.

On the en_US/Compose file, the perf diff is the following (the modified
function is `parse`):

  Event 'cycles:u'

  Baseline  Delta Abs  Shared Object     Symbol
  ........  .........  ................  .................................

    39.91%    -17.62%  bench-compose     [.] parse.constprop.0
    20.54%     +6.47%  bench-compose     [.] lex
    17.28%     +5.55%  libc-2.33.so      [.] __strcmp_avx2
    12.78%     +4.01%  bench-compose     [.] xkb_keysym_from_name
     2.30%     +0.83%  libc-2.33.so      [.] __GI_____strtoull_l_internal
     3.36%     +0.78%  bench-compose     [.] strcmp@plt

Thanks to some careful packing, the memory usage is pretty much the
same.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-31 12:10:52 +03:00
Ran Benita 3a6c3b2c48 ast: remove comment re. anonymous struct
C11 is not sufficient for this, needs `--ms-extensions` which we don't
want to enable.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-30 20:42:31 +03:00
Ran Benita 8b09e1772c compose: use anonymous union
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-30 20:42:31 +03:00
Ran Benita 90e2d5ee76 build: require C11
I'd really like to use anonymous unions/structs. Supposedly even MSVC
supports it now. Let's try and see.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-30 20:42:31 +03:00
Ran Benita 1c0e28ad26 keysym: properly handle overflow in 0x keysym names
Relatedly, strtoul allows a lot of unwanted stuff (spaces, +/- sign,
thousand seperators), we really ought not use it. But that's for another
time.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-30 19:17:29 +03:00
Ran Benita 1638409b22 compose: add a limit of 65535 sequences
Fits in uint16_t, which enables some future optimizations. But also a
good idea to have some limit. Not aware of any compose files which come
close.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-30 17:52:36 +03:00
Peter Hutterer 127f8c976d utils: assert on streq for NULL pointers
We have streq_null for that purpose

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-30 01:37:55 +03:00
Peter Hutterer d172652753 test: move an assert up to before the strlen() use
../../../test/keysym.c:80:24: warning: Null pointer passed to 1st parameter
expecting 'nonnull' [core.NonNullParamChecker]
  (unsigned) strlen(expected));

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-30 01:37:55 +03:00
Peter Hutterer fa86433e7c xkbcomp: remove useless assignment
../../../src/xkbcomp/compat.c:693:16: warning: Although the value stored to
'merge' is used in the enclosing expression, the value is never actually read
from 'merge' [deadcode.DeadStores]
    si.merge = merge = (def->merge == MERGE_DEFAULT ? merge : def->merge);

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-30 01:37:55 +03:00
Peter Hutterer 20f7f80c23 xkbcomp: use memcpy over strncpy to avoid analyzer warnings
The target buffer is 7 bytes long, null-termination is optional (as the comment
already suggests). Coverity is unhappy about this though so let's use memset and
memcpy instead.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-30 01:34:33 +03:00
Ran Benita cda2eaf1f5 man: add missing pointer to xkbcli-compile-keymap(1)
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-29 20:59:45 +03:00
Ran Benita 7d84809fdc keysym: fast path for case sensitive xkb_keysym_from_name
xkb_keysym_from_name() is called a lot in Compose file parsing. The
lower case handling slows things down a lot (particularly given we can't
use the optimized strcasecmp() due to locale issues). So add separate
handling for the non-case-sensitive case which is used by Compose.

To do this we need to add another version of the ks_tables table. This
adds ~20kb to the shared library binary. We can probably do something
better here but I think it's fine.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-28 16:11:36 +03:00
Ran Benita 3b506497bf keysym: inline find_sym function
It's easier when everything is in one place.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-28 16:11:36 +03:00
Ran Benita 2d87ab08f3 keysym: use a more descriptive argument name
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-28 16:11:36 +03:00
Ran Benita a717549eb2 keysym: open-code bsearch
We want to optimize things here which requires messing with the binary
search some.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-28 16:11:36 +03:00
Ran Benita c14910a0de interactive-evdev: fix missing initialization
Accidentally got lost in 6b65be4.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-28 16:11:36 +03:00
Ran Benita 6b65be4c4e interactive-evdev: switch from epoll(2) to poll(2)
Turns out FreeBSD supports evdev, so this toll can work on it; however
it does not support epoll, so switch to poll, which is portable.

Reported-by: Evgeniy Khramtsov <evgeniy@khramtsov.org>
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-28 14:39:03 +03:00
Ran Benita 62b5b4a170 x11: fix comparison of integer expressions of different signedness
src/x11/keymap.c:980:26: warning: comparison of integer expressions of different signedness: ‘size_t’ {aka ‘long unsigned int’} and ‘int’ [-Wsign-compare]
  980 |     for (size_t i = 0; i < length; i++) {
      |                          ^

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-03-28 13:02:27 +03:00
Peter Hutterer 95e2907978 xkbcomp: plug a potential memory leak
libxkbcommon-1.0.3/src/xkbcomp/ast-build.c:526: leaked_storage: Variable "file"
going out of scope leaks the storage it points to.

Where we exit the loop early, we don't release the various allocated memory.

Make this patch more obvious my moving the declaration for those into the loop
as well, this way we know that they aren't used outside the loop anywhere.

Found by coverity

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-19 23:44:30 +02:00
Peter Hutterer 01aa222257 registry: plug a potential memleak for invalid rules files
If the name is missing in a configItem, we'd fail and leak the memory for
description, brief and vendor.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-19 23:44:30 +02:00
Peter Hutterer 694b8f7127 test: fix missing va_end in case of test failures
Found by coverity

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-19 23:44:30 +02:00
Peter Hutterer 7a205e25ac bench: silence coverity complaint about a double free
False positive because we rely on xkb_components_from_rules() to initalize this
struct, but let's localize the variable anyway to shut coverity up.

libxkbcommon-1.0.3/bench/rules.c:59:9: warning[-Wanalyzer-double-free]:
double-free of kccgst.symbols

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-19 23:44:30 +02:00
Uli Schlachter 21c864ccbf Inline x11_atom_interner_adopt_atoms() into callers
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-03-09 11:00:13 +02:00
Uli Schlachter c033970163 Save another GetAtomName round trip
Both get_atom_name() and the new atom interner required a round trip. Move
get_atom_name() into the atom interner to save one more round trip. This brings
xkb_x11_keymap_new_from_device() down to two round trips, which is the minimum
possible number.

(Also, I think the new code in keymap.c is more readable than the mess I
previously created)

With this last commit in the series, this definitely:

Fixes: https://github.com/xkbcommon/libxkbcommon/pull/217
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-03-09 11:00:13 +02:00
Uli Schlachter c8efc3d67d Also batch the XKB GetNames request
This gets rid of another round trip.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-03-09 11:00:13 +02:00
Uli Schlachter 599064cf28 Also batch the XKB-GetMapMap request
This gets rid of one more round trip.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-03-09 11:00:13 +02:00
Uli Schlachter 1b3a1c277a Remove three more round trips
There are a number of XKB requests needed to request all the information from
the X11 server. So far, the code was sending one request and waiting for the
reply. This commit starts batching the request so that we get multiple replies
with one round trip.

This removes three round trips.

Only the simple requests are converted. get_map() and get_names() use some
bitmasks that are needed for both the request and the reply. These will be dealt
with separately.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-03-09 11:00:13 +02:00
Uli Schlachter b9707c1db0 Save three more round trips in xkb_x11_keymap_new_from_device()
Instead of asking for an atom name and waiting for the reply four times, this
now sends four GetAtomName requests and waits for all the replies at once. Thus,
this saves three round trips.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-03-09 11:00:13 +02:00
Uli Schlachter 40c00b4721 xkb_x11_keymap_new_from_device: Less X11 round-trips
On my system, calling xkb_x11_keymap_new_from_device() did 78 round trips to the
X11 server, which seems excessive. This commit brings this number down to about
9 to 10 round trips.

The existing functions adopt_atom() and adopt_atoms() guarantee that the atom
was adopted by the time they return. Thus, each call to these functions must do
a round-trip. However, none of the callers need this guarantee.

This commit makes "atom adopting" asynchronous: Only some time later is the atom
actually adopted. Until then, it is in some pending "limbo" state.

This actually fixes a TODO in the comments.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/216
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-03-09 11:00:13 +02:00
Ran Benita 82a5bdc43c Bump version to 1.1.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-02-27 22:48:35 +02:00
Ran Benita 83e3a53ddc doc: add keymap-format-text-v1.md to the HTML documentation
It's incomplete but might be helpful for someone.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-02-27 22:38:21 +02:00
Ran Benita afc5370c86 doc: add note on variants in rule names
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/208
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-02-27 22:13:17 +02:00
Pierre Le Marre 30ce6c04f9 Fix a few keysymtab entries to match their comment in xkbcommon-keysyms.h
Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-02-27 22:06:42 +02:00
Ran Benita 2dd391b66e scripts: remove meson-junit-report.py
Not used since ed5a0b4fed.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2021-02-27 21:38:02 +02:00
Peter Hutterer d1ba81c4dd meson.build: replace the remaining join_paths() with the nicer / syntax
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-22 13:43:16 +02:00
Peter Hutterer 0abd430e85 test: add a keysym tester
A simple script that creates a new layout with the given keysym replacing TLDE.
Then we compile a keymap and search for the keysym being assigned to TLDE and
bail if that fails.

The list of keysyms is manually maintained but we only need to add one or two to
spot-check whenever the xorgproto is updated.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-22 13:43:16 +02:00
Peter Hutterer b4802b0642 Fix documentation for XKB_CONFIG_EXTRA_PATH
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-22 13:43:16 +02:00
Peter Hutterer 0bfc71e7b5 Update keysym definitions to latest xorgproto
As of xorgproto commit e5d8af9711516385f8346c9e077692b29c914478

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-22 13:43:16 +02:00
Peter Hutterer 3852106a8e scripts: update makeheader script for the _EVDEVK keysym defines
As of xorgproto commit 5dbb5b76597f [1], the 0x10081XXX keycode range is defined
for direct evdev kernel keycode mapping. For example, KEY_MACRO1 (0x290) is
mapped to 0x10081290. The format of the #define lines for these keys is
stable to allow for parsing:

  #define XF86XK_FooBar _EVDEVK(0x123) /* optional comment */

Update our script so we detect these new lines. Our keysym generation is a
two-step process: makeheader and then makekeys. Replacing the key with its full
value in the makeheader script means we don't have to update makekeys to handle
the _EVDEVK macro and our header file is fully resolved.

[1] https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/23

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-22 13:43:16 +02:00
Peter Hutterer 5c1f4f0da0 Update imported comments in xkbcommon-keysyms.h
Matches xorgproto commits 39eb5974 and 09602b213.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-22 13:43:16 +02:00
Peter Hutterer 069777f47f test: fix interactive evdev test invocation
rmlvos is the parent list which then fails during a list join because, well,
it's a list of lists.

Fixes #206

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-01-23 18:57:23 +02:00
Peter Hutterer d5e3695ea2 test: fill in srcdir/builddir when not set in the environment
Makes this test easier to run from the commandline. Where either of top_srcdir
or top_builddir isn't set, fill them in from the CWD or fail otherwise.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-01-23 18:57:23 +02:00
Ran Benita 44df69c928 doc/keymap: some slight editing
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-12-27 09:49:20 +02:00
Simon Zeni 7420521ff4 doc/keymap: add documentation for xkb_symbols (#205) 2020-12-27 09:48:39 +02:00
Ran Benita c60b77ea51 Bump version to 1.0.3
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-23 20:30:13 +02:00
Ran Benita fbf087ea94 keymap-dump: follow xkbcomp in printing affect=both in pointer actions
It is equivalent to nothing but good to match up.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-23 20:03:17 +02:00
Ran Benita ac6cd20c55 x11: fix type level names missing
When reading the keymap, the level names would get discarded.
Regressed in 26453b8473.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-23 18:49:49 +02:00
Ran Benita 95f8ff8355 test/data: update host.xkb to match keymap-dump style
This is needed for fixing the x11comp test.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-23 18:35:27 +02:00
Ran Benita 4aed3c6811 x11/keymap: fix case with no actions
Possible regression in f41e609bbe (not
confirmed yet).

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-23 18:24:52 +02:00
Ran Benita 13e6543ed4 Bump version to 1.0.2
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-20 21:02:44 +02:00
Ran Benita 1bd3b3c7cb x11: cache X11 atoms
On every keymap notify event, the keymap should be refreshed, which
fetches the required X11 atoms. A big keymap might have a few hundred of
atoms.

A profile by a user has shown this *might* be slow when some intensive
amount of keymap activity is occurring. It might also be slow on a
remote X server.

While I'm not really sure this is the actual bottleneck, caching the
atoms is easy enough and only needs a couple kb of memory, so do that.

On the added bench-x11:

Before: retrieved 2500 keymaps from X in 11.233237s
After : retrieved 2500 keymaps from X in 1.592339s

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-20 13:04:21 +02:00
Ran Benita f41e609bbe x11: eliminate slow divisions
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-20 12:50:50 +02:00
Ran Benita 9caa4128c2 build: combine test & bench internal deps
No need to duplicate this really.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-19 16:19:56 +02:00
Ran Benita d9a22f29c0 ci: fix windows CI failure due to add-path deprecation
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-11-19 01:31:09 +02:00
Peter Hutterer 6268ba1c77 test: catch unrecognized keysyms in the xkeyboard-config test
Prompted by
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/127

We run the keymap tool with --verbose which will print the messages from the
compiler to the log file as well. And then we can search for the warning
regarding an unrecognized keysym and fail our test based on that.
2020-10-20 11:02:03 +10:00
Peter Hutterer afdc9ceee7 xkbcomp: where a keysym cannot be resolved, set it to NoSymbol
Where resolve_keysym fails we warn but use the otherwise uninitialized variable
as our keysym. That later ends up in the keymap as random garbage hex value.

Simplest test case, set this in the 'us' keymap:
    key <TLDE>               {      [        xyz ] };

And without this patch we get random garbage:
./build/xkbcli-compile-keymap --layout us | grep TLDE:
    key <TLDE>               {      [      0x018a5cf0 ] };

With this patch, we now get NoSymbol:
./build/xkbcli-compile-keymap --layout us | grep TLDE:
    key <TLDE>               {      [        NoSymbol ] };
2020-10-20 09:23:50 +10:00
Ran Benita 21e640fbc7 doc: add note about "short" layout names (#194)
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/193
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-10-11 09:55:14 +03:00
Ran Benita 2c295b10aa Bump version to 1.0.1
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-11 15:07:49 +03:00
hhb 69713ce3e9 parser: fix another format string for int64_t (#191) 2020-09-11 15:06:23 +03:00
Ran Benita c5565bd05f tools: align xkbcli how-to-type output ourselves
Can possibly add a machine-parsable format if desired, but for now just
have it work nicely.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-09 10:11:54 +03:00
Ran Benita 6178924f28 test/tool-option-parsing: skip testing of disabled tools
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-08 09:45:34 +03:00
Ran Benita c621319e53 test/tool-option-parsing: switch from pytest to unittest
For me, installing pytest for libxkbcommon is a bit problematic, so I
end up skipping it which is not great.

Switch to unittest which is built in to Python. It's not as nice as
pytest but good enough in this case.

Note: I was too lazy to switch the plain asserts to unittest
assertions...

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-08 09:45:34 +03:00
Ran Benita c8f309a2de test/tool-option-parsing: keep isolated by using our own test data
Make it possible to run the test on all machines.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-07 22:06:22 +03:00
Ran Benita 737030ad5b build: move tests to after tools
So tests can refer to stuff set by the tools section.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-07 22:03:30 +03:00
Peter Hutterer d327475282 utils: include unistd.h where we have it
MacOS doesn't have eaccess/euidaccess but it does have unistd.h, so let's
include it to silence the R_OK redefinition compiler warnings.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-09-07 22:01:57 +03:00
Peter Hutterer a350222cc9 context: fix a compiler warning
../src/context.c:57:9: warning: variable 'err' is used uninitialized whenever
'if' condition is true [-Wsometimes-uninitialized]

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-09-07 22:01:57 +03:00
Peter Hutterer 3039d62a48 registry: mark the rxkb_log function as attribute printf
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-09-07 22:01:57 +03:00
Ran Benita db98575327 ci: enable xkbregistry on macos job
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-07 22:01:57 +03:00
Peter Hutterer 13745014c3 test: include unstd.h in the registry test to cut down the MacOS warnings
mkdtmp, rmdir and unlink are in unstd.h on MacOS. Since including that it
doesn't hurt us on Linux, let's do it without ifdefs.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-09-07 22:01:57 +03:00
Ran Benita 534e54f621 test/data: add rule registry files
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-07 11:47:34 +03:00
Ran Benita 1c3521993d test/data: sync from xkeyboard-config 2.30
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-07 11:36:49 +03:00
Ran Benita 461d727830 test/data: change quartz.xkb from CRLF to LF
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-07 11:19:45 +03:00
Peter Hutterer 850ba7e636 test: fix the xkbcli --version test
Fixes https://github.com/xkbcommon/libxkbcommon/issues/185

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-09-07 11:15:08 +10:00
Ran Benita c6df60d8a7 build: remove old pkgconfig templates
In meson these are generated instead.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-06 22:25:29 +03:00
Ran Benita 12f99d0dfe Bump version to 1.0.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-06 00:00:14 +03:00
Ran Benita 0f8ae6ecd5 xkbcli: fix interactive-x11 not showing in help
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-09-05 23:41:38 +03:00
Peter Hutterer 66e7f0da20 Revert: tools: add xkbcli-scaffold-new-layout as helper tool
While this tool is useful for users starting with a new keyboard layout, it is a
somewhat bad fit for libxkbcommon. It's the only python tool, we don't even
install it yet (because we're not sure yet what it's supposed to do) and there's
a potential for it to expand into more corner cases.

The only tie it has to libxkbcommon is that it templates the data files that
libxkbcommon reads, but those files are effectively public API.

Let's remove this tool from there and instead move it to a separate git
repository where it can go its own way.

This reverts commit d00cf64dbc
2020-09-03 18:14:16 +10:00
Peter Hutterer 4d0d509129 meson.build: define PATH_MAX where it's missing
PATH_MAX is not POSIX and can be missing on some systems, notably Windows (which
provides MAX_PATH instead tough) and Hurd. Let's define it to a sane value where
missing, i.e.  the one it's defined to in limits.h. Except on Windows where
we're limited to 260.

Fixes https://github.com/xkbcommon/libxkbcommon/issues/180

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-09-01 08:56:56 +10:00
Ran Benita 4b2a91431b ci: fix windows job not finding bison
Instead of using the unpredictable chocolatey let's just handle it
ourselves. The versions are pinned but that's arguably good.

Fixes https://github.com/xkbcommon/libxkbcommon/issues/179
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-08-31 15:28:38 +03:00
Ran Benita d5c6b58152 tools: convert man pages from man format to mdoc format
The mdoc is more semantic and consistent.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-08-31 10:02:47 +03:00
Ran Benita 5649e4ae72 PACKAGING: mention xkbcli
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-08-30 21:59:30 +03:00
Ran Benita e50c3e2cc7 build: fix meson "uses features which were added in newer versions" warning
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-08-30 21:54:21 +03:00
Peter Hutterer ae90a6a0a9 doc: add some disclaimer regarding user-specific key types and compat entries
It's a niche use-case but basically the same as adding symbols, so let's go with
a general handwavy explanation.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-08-30 21:49:41 +03:00
Peter Hutterer d00cf64dbc tools: add xkbcli-scaffold-new-layout as helper tool
This tool set ups the required directory structure and template files to add new
keyboard layouts or options. For example, run like this:

    xkbcli-scaffold-new-layout  --layout 'us(myvariant)' --option 'custom:foo'

This will up the evdev rules file, the evdev.xml file, the symbols/us file and
symbols/custom file in $XDG_CONFIG_HOME so that the user has everything in place
and can start filling in the actual key mappings.

This tool is currently uninstalled until we figure out whether it's useful.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-08-30 21:49:41 +03:00
Peter Hutterer d7b39f6ffb Add /etc/xkb as extra lookup path for system data files
This completes the usual triplet of configuration locations available for most
processes:
- vendor-provided data files in /usr/share/X11/xkb
- system-specific data files in /etc/xkb
- user-specific data files in $XDG_CONFIG_HOME/xkb

The default lookup order user, system, vendor, just like everything else that
uses these conventions.

For include directives in rules files, the '%E' resolves to that path.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-08-30 21:49:41 +03:00
Peter Hutterer 05d6efc417 xkbcomp: allow including kccgst files from other paths
Previously, a 'symbols/us' file in path A would shadow the same file in path B.
This is suboptimal, we rarely need to hide the system files - we care mostly
about *extending* them. By continuing to check other lookup paths, we make it
possible for a XDG_CONFIG_HOME/xkb/symbols/us file to have sections including
those from /usr/share/X11/xkb/symbols/us.

Note that this is not possible for rules files which need to be manually
controlled to get the right bits resolved.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-08-30 21:49:41 +03:00
Peter Hutterer bbc7005b2a xkbcomp: simplify the include path handling
Streamline the code a bit - instead of handling all the if (!file) conditions
handle the case of where we have a file and jump to the end.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-08-30 21:49:41 +03:00
Peter Hutterer 351b4b9c0b xkbcomp: move the logging of include paths into a helper function
No functional changes, prep work for some other refacturing.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-08-30 21:49:41 +03:00
Ran Benita a0c1c2f42d build: fix byacc invocation
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/133#issuecomment-670902025
Reported-by: Edward-0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-08-08 14:43:09 +03:00
Peter Hutterer 9b9c5f2094 test: fix the xkeyboard-config test
'xkbcli compile-keymap' doesn't work unless we ninja install first. But for a
test that's to be run from the test directory, that's not a useful option so
let's call the binary directly. The script adds the meson builddir to the PATH
anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-29 08:33:26 +10:00
Peter Hutterer 03ecaa6b53 test: ignore the real XDG_CONFIG_HOME during tests
Let's not have our tests fail if the user has an incompatible
$XDG_CONFIG_HOME/xkb directory.

libxkbcommon has fallbacks when XDG_CONFIG_HOME isn't set so we need to override
this with a real directory instead of just unsetting it.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-27 19:26:46 +10:00
Ran Benita fcc6b28f5f tools/interactive-evdev: fixup 64bff65
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-27 11:59:21 +03:00
Ran Benita 64bff65a6a tools/interactive-evdev: change --evdev-offset to --without-x11-offset
There is no reason to give full control rather than just enable/disable.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-27 11:51:53 +03:00
Ran Benita 81842f7fbb doc: ignore rxkb, RXBK prefixes in doxygen
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 17:21:46 +03:00
Ran Benita 0df23ea8d7 test/tool-option-parsing: remove --kccgst test, it's private for now
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 16:38:43 +03:00
Ran Benita 608e9361e3 tools: run test-tool-option-parsing.py like a regular test
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 16:37:57 +03:00
Ran Benita 9511174075 tools/compile-keymap: hide --kccgst comment on public build
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 16:37:57 +03:00
Ran Benita 2fefe558ab tools: fix strcmp mistake in 0066e38
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 16:34:52 +03:00
Ran Benita 00530bea6b build: use gnu_symbol_visibility instead of explicit -fvisibility
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 16:06:40 +03:00
Ran Benita 61772c773e build: use nicer / syntax instead of join_paths()
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 16:01:00 +03:00
Ran Benita 0066e387bc tools: make independent from src/
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 15:59:23 +03:00
Ran Benita d67c9cfffb build: use cc.get_supported_arguments()
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 15:24:40 +03:00
Ran Benita 0615c91133 build: remove explicit -Wextra
Implied by `warning_level=2`.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 15:15:31 +03:00
Ran Benita f439ce1889 tools: some minor changes to xkbcli
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 15:06:12 +03:00
Peter Hutterer ce5eb1ac6d tools: link the tools against libxkbcommon.so only
The tools previously linked against a static version (by simply recompiling
everythiong). This isn't necessary, we can link them against libxkbcommon.so.

Only exception: The xbkcli-compile-keymap tool needs a private API for the
--kccgst flag. Avoid this by disabling this flag in the installed tool and
building the same tool, statically linked but not-installed.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer a472e030ea tools: avoid use of a private api
This is merely to fill in some NULL pointers anyway, we can just use
the #defines we have available at build time.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer cd119a2824 Drop use of ronn, switch to raw roff instead
Drop the ronn source files, check in the generated files instead. This gets rid
of the ruby+gem+ronn toolchain requirement at the cost of having to edit raw man
pages.

ronn files are as-generated but with the preamble and generation date removed.
The latter isn't important enough to keep, it'll just go stale for manually
maintained files and it's not worth setting up a configure_file() just for that
date.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 31b38c3137 tools: don't mangle the path for tools, just exec directly
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer ba52e34dce tools: don't assert on 64+ commandline arguments, just return
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer d480f053d2 tools: add a test program to parse the commandline options
A pytest wrapper around our xkbcli tool - copied from libinput.
This calls our various xkbcli tools with varying options and check that they
either succeed or return the right error code. The coverage is limited, it
does not (and cannot) test for all possible combinations but it should provide a
good red flag if we have inconsistent behavior or accidentally break some
combination of flags.

Meanwhile, we can at least assume that all our commandline arguments are parsed
without segfaulting or worse.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 449ed2b8e8 tools: drop getopt vs getopt_long differentiation
On all platforms we build on where getopt.h is available, getopt_long is also
available. Only Windows doesn't have either but that's no reason for us to
differentiate between the two.

If we need to special-case getopt vs getopt_long, it's probably better to
implement our own cross-platform version of it and use that.

Fixes #161

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 7d36a3d119 tools: switch how-to-type to getopt_long
This provides consistency with the other tools that now all take long options.
Plus, it's more obvious to have the arguments spelled out.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer ab3be693b3 tools: switch interactive-evdev to getopt_long
Requiring long options for this tool means it's immediately obvious what an
invocation does, compare e.g.

  xkbcli interactive-evdev -gcd

to the equivalent:

  xkbcli interactive-evdev --consumed-mode=gtk --enalbe-compose --report-state-changes

This drops the evdev offset argument - that offset should never be anything
other than 8, having this as argument here is more likely to confuse or
produce misleading debugging logs.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 714182066d tools: consistently return 2 on invalid usage
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 29e80e7b76 tools: install our tools as xkbcli subcommands
The xkbcli tool usage help is ifdef'd out where the tool isn't built but the
man page always includes all tools. Easier that way.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer ed57fb8b86 tools: add a xkbcli tool as entry point for the various tools we have
This is the base tool, no subtools are currently connected so you only get help
and version for now. The goal here is to have a git-like infrastructure where
/usr/bin/xkbcli is the main tool, anything else will hide in libexec.

The infrastructure for this is copied from libinput. Tools themselves will
will be installed in $prefix/libexec/xkbcommon and the xkbcli tool forks
off whatever argv[1] is after modifying the PATH to include the libexec dir.

libinput has additional code for checking whether we're running this from the
builddir but it's a bit iffy and it's usefulness is limited - if you're in the
builddir anyway you can just run ./builddir/xkbcli-<toolname> directly.
So for this code here, running ./builddir/xkbcli <toolname> will execute the
one in the prefix/libexecdir.

Since we want that tool available everywhere even where some of the subtools
aren't present, we need to ifdef the getopt handling.

man page generation is handled via ronn which is a ruby program but allows
markdown for the sources. It's hidden behind a meson option to disable where
downloading ronn isn't an option. The setup is generic enough that we can add
other man-pages by just appending to the array.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 1b796a7209 meson.build: move registry-list tool down to the tools section
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 10a881a499 meson.build: only build the tools where getopt.h is available
Windows doesn't have getopt.h. This would prevent building the tools but
they are behind other checks that cause them to be disabled. The only tools
that don't need getopt.h  are interactive-wayland and interactive-x11 but
neither is particularly useful on Windows. Just hide all tools behind the getopt
check in preparation for the upcoming tool consolidation work.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 76d847ac24 meson.build: move the config.h generation to the bottom
We cannot add to configh_data after this command so let's generate this last.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 90ece8fb0a meson.build: registry list is dependent on getopt_long
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer 9cff8df2b1 meson.build: drop install:false from configure_file
meson complains because this requires 0.50.0 and we don't require that. But
since it defaults to false anyway, let's just omit it.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 11:05:14 +03:00
Peter Hutterer c3d42390f7 meson.build: add the valgrind test setup, exclude python tests
This way we can invoke the expected setup with
  meson test --setup=valgrind

And because we don't care about valgrinding python script, mark that test as
part of the "python-tests" suite and skip it during our CI valgrind run.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-25 11:01:49 +03:00
Peter Hutterer f0b1441f5e test: make the symbols-leak-test executable
Python leaks like crazy when run under valgrind. But if we make the script
executable **and** it has uses the env invocation (i.e. #!/usr/bin/env python3),
the leaks disappear. This is not the case for a shebang of /usr/bin/python3.

Why exactly this is the case I'm not sure but executables we plan to run
should have the exec bit set. So this is a janitor patch with the nice side
effect of fixing our valgrind runs.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-25 10:59:32 +03:00
Emmanuel Gil Peyrot ddd1188d97 Make path retrieval consistent in xkb_compose_table_new_from_locale() 2020-07-23 09:39:53 +03:00
Emmanuel Gil Peyrot 17ad0df14a compose: add xdg base directory support
Before reading ~/.XCompose, try to read $XDG_CONFIG_HOME/XCompose
(falling back to ~/.config/XCompose).

This helps unclutter the home directory of users who want that.
2020-07-23 09:39:53 +03:00
Peter Hutterer 2a83430572 meson.build: fix pkgconfig deprecation warning
../meson.build:239: DEPRECATION: Library xkbcommon was passed to the "libraries"
keyword argument of a previous call to generate() method instead of first
positional argument. Adding xkbcommon to "Requires" field, but this is a
deprecated behaviour that will change in a future version of Meson. Please
report the issue if this warning cannot be avoided in your case.

This was introduced in meson 0.49.0

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-23 09:28:23 +03:00
Ran Benita a4901662c3 PACKAING: remove bash
Converted to Python.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-22 20:04:10 +03:00
Ran Benita fa300b24d2 test: fix Windows CI by rewriting symbols-leak-test from bash to python
The CI started installing some wrapper instead of a real bash which is
what gets found.

See:
https://github.com/actions/virtual-environments/pull/1081

Given meson is written in python, it should always be available
hopefully.

Disabled valgrind wrapper for now because it now also applies to the
python interpreter which leaks like a sieve.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-22 13:45:17 +03:00
Ran Benita d4a17915db ci: cache chocolaty download
The bison sourceforge download is quite slow and unreliable.

Hopefully this works. Stolen directly from ruby:
https://github.com/ruby/ruby/blob/a50750c8a960ef62b3e1dbd78b12056f0512b17d/.github/workflows/windows.yml#L26

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-07-22 13:45:17 +03:00
Peter Hutterer dcb6c7b8a4 xkbcomp: return NULL, not false in place of a FILE*
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-13 18:41:00 +10:00
Peter Hutterer d4b78a5fca xkbcomp: simplify buffer handling in the include handling
Don't do the realloc dance, just asprintf to the buffer and move on. The check
is likely pointless anyway, if we run out of asprintf size, log_error will
probably blow up as well.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-13 18:41:00 +10:00
Peter Hutterer 41a7c975f8 Add asprintf_safe helper function
We only ever care about whether we error out or not, so let's wrap this into
something more sane.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-13 18:41:00 +10:00
Peter Hutterer 2cb90c958f tools: add option to print full RMLVO elements to rmlvo-to-keymap
Since the most common use-case is to provide only some elements of RMLVO, this
makes it possible to show what is actually being used in the background based on
the built-in defaults.

Print this in a format that's mostly JSON-compatible or at least easy to parse,
just in case.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-08 15:21:19 +10:00
Peter Hutterer fc2d4fa2ab tools: add ability to compile from kccgst to rmlvo-to-keymap
This obsoletes the print-compiled-keymap tool though we now require that the
kccgst components are passed via stdin, there is no file loading ability.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-08 15:21:19 +10:00
Peter Hutterer 00bb7cd36d tools: add include path handling to rmlvo-to-keymap
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-08 15:21:19 +10:00
Peter Hutterer fd39147175 tools: add ability to print the KcCGST components for rmlvo-to-keymap
This makes the rmlvo-to-kccgst tool obsolete.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-08 15:21:19 +10:00
Peter Hutterer 09d6b96540 tools: expand help output for rmlvo-to-keymap
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-08 15:21:19 +10:00
Peter Hutterer d0a29eee29 tools: add verbose logging to rmlvo-to-keymap
Since we want to log the include paths too we need to split the context init up,
otherwise include paths are added before we can set the verbosity.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-08 15:21:19 +10:00
Peter Hutterer ce286601b0 context: log include paths for debugging
Now that we're relying on various different include paths, let's log that ones
we use and the ones we failed to use.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-08 15:21:19 +10:00
Peter Hutterer 4889f550df tools: always print the rmlvo-to-keymap outcome
The most common case for this tool is to check what the keymap is for a given
RMLVO. Let's print that by default, the use-cases that just check for
compilation success can discard stdout instead.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-08 15:21:19 +10:00
Peter Hutterer e55587f4cf meson.build: always set the default variants/options
Make this more balanced with the rules/layouts so we can rely on that #define to
exist.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-08 15:21:19 +10:00
Peter Hutterer afb26e7df9 Add libxkbregistry to query available RMLVO
This library is the replacement for clients parsing evdev.xml directly.
Instead, they should use the API here so that in the future we may even
be able to swap evdev.xml for a more suitable data format.

The library parses through evdev.xml (using libxml2) and - if requested -
through evdev.extras.xml as well. The merge approach is optimised for
the default case where we have a system-installed rules XML and another file in
$XDG_CONFIG_DIR that adds a few entries.  We load the system file first, then
append any custom ones to that. It's not possible to overwrite the MLVO list
provided by the system files - if you want to do that, get the change upstream.

XML validation is handled through the DTD itself which means we only need to
check for a nonempty name, everything else the DTD validation should complain
about.

The logging system is effectively identical to xkbcommon.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-06 15:15:20 +10:00
Peter Hutterer fe88613382 utils: add streq_null() for streq that allows NULL values
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-06 15:15:20 +10:00
Peter Hutterer 9b1b0c5743 Add a snprintf_safe() helper function
Returns true on success or false on error _or_ truncation. Since truncation is
almost always an error anyway, we might as well make this easier to check.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-06 15:15:20 +10:00
Peter Hutterer d075c3e697 Factor the access check for paths out
Easier to re-use without having to duplicate ifdefs.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-06 15:15:20 +10:00
Peter Hutterer 43b9d09248 test: fix the xkeyboard-config test for the prefixed tool name
Regression introduced in 362130debb

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-07-01 08:19:40 +10:00
Ran Benita 878cc7a574 tools: don't depend on src/utils.h
The idea is to make the tools/demos as standalone as possible so that
they may serve as examples as well.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-06-28 09:50:47 +03:00
Peter Hutterer 8b8a464576 tools: allow stdin for compiling keymaps
This connects two tools to be useful together:
  xkbcommon-rmlvo-to-kccgst | xkbcommon-print-compiled-keymap  -
which will result in the full keymap generated by the former tool.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 0ecd55223d tools: print the kccgst format in a usable syntax
Might as well spit that out in the format that e.g. xkbcomp understands.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 314b6486b3 test: drop some now-obsolete functions
These were moved to tools/tools-common.c and now that all tools are switched
over, they're no longer needed.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 362130debb meson.build: prefix all tools with xkbcommon-
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 3adbe54eac tools: move the remaining tools from test to here
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer f525f9f040 test: disentangle interactive-wayland from the test headers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 1326d5add4 test: untangle interactive-x11 from the test headers
Use the new tools headers and create a custom internal lib for the x11 tool.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer c09bf36306 test: untangle interactive-evdev from the test headers
Move (sometimes duplicate) the required bits into new shared files
tools-common.(c|h) that are compiled into the internal tools library. Rename the
test_foo() functions to tools_foo() and in one case just copy the code of the
keymap compile function to the tool.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 2eb5d2c81d test: simplify error handling in interactive-evdev
Passing -errno around and having separate labels depending on failure types is
superfluous here. All the unref calls can handle NULL and nothing cares about
errno once we're out of the immediate scope. So let's simplify this and deal
with 0 and 1 only.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 6c629a10cf Use a custom internal library for the tools
This is currently identical to the internal test library, but it's a start to
disentangle the two.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer ec2bbe599c Move the various tools to a tools/ directory
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 725a31986d test: how-to-type: prefer local headers over system ones
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 928771ede0 test: untangle rmlvo-to-kccgst from the test headers
Using test helpers to init the context gives it fairly specific behavior; unless
the user sets the right environment variables and/or calls it from the right
PWD, it may or may not include the test data.

Let's drop this behavior, make it a default tool to compile a keymap. If there
is a specific need to modify the include paths, we can add this later.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer e5d4056e2f test: untangle print-compiled-keymap from the test headers
Commit 16c84cdd81 removed the getopt handling for
RMLVO arguments, so now this tool only takes a keymap file and compiles it.

Using test helpers to init the context gives it fairly specific behavior; unless
the user sets the right environment variables and/or calls it from the right
PWD, it may or may not include the test data.

Let's drop this behavior, make it a default tool to compile a keymap. If there
is a specific need to modify the include paths, we can add this later.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer 7d1aefddad test: simplify an exit path
The unref() functions take NULL as argument, so we don't need different labels
for every possible exit path.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-25 10:32:08 +10:00
Peter Hutterer bdbf1a190d Remove the gitignore file
This contained three groups entries:
- autotools stuff which no longer needed
- entries to ignore built artifacts, no longer needed with meson as everyting is
  in the builddir
- special files like cscope.out, etc. These should be handled by a user in their
  global gitignore file since they're fairly specific to a user's setup.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-22 14:14:30 +03:00
Peter Hutterer 4e544e2792 doc: correct the include path list
XKB_CONFIG_ROOT (if defined) replaces the built-in system directories.

Fixes 5fb2c6769b

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-16 11:26:49 +03:00
Peter Hutterer 5fb2c6769b doc: add documentation for user configuration
Most of this is currently hidden in the commit message for ca033a29d2, let's
make it a bit more public so we have a link to point users to.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-15 07:32:10 +03:00
Peter Hutterer a26578742c doc: add the rules-format file (as markdown)
Useful to have this as part of the documentation. The rendering isn't great but
at least not any worse than pure text. Markdown escapes % so explaining our use
of %S and %H would require a double % - not idea. Let's just wrap it as a code
block and done.

Includes two typo fixes too, yay.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-15 07:32:10 +03:00
Peter Hutterer fef179cfe7 Add an editorconfig file
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-06-02 06:46:21 +10:00
Ran Benita 892cfef834 keysyms: add XKB_KEY_XF86FullScreen
Updated using ./scripts/update-keysyms using latest xorgproto.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/147
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-05-20 20:42:02 +03:00
Ran Benita 860cfc039f 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>
2020-04-18 22:23:06 +03:00
Jon Turney 908e014f01 Fix building X11 tests on PE targets
Link libxkbcommon_x11_internal with libxkbcommon_test_internal, rather
than libxkbcommon.

This avoids some tests linking with both libxkbcommon_test_internal and
libxkbcommon, which causes duplicate symbol problems on PE targets (e.g.
Cygwin) (as all the symbols from libxkbcommon are pulled in at link
time, which clash with libxkbcommon_test_internal)
2020-04-18 22:15:51 +03:00
Ran Benita ed5a0b4fed ci: remove azure pipelines build
Broken, replaced with github actions.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-04-18 21:55:28 +03:00
Ran Benita 8dfece0cbb ci: add github actions build
We currently use Azure Pipelines. But it became out of date. Also it
requires a different account and setup than github account itself.

The configuration here is probably not very good and is less featureful
than the Azure one but it's what I managed.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-04-18 21:55:28 +03:00
Nils 0f1cae0cc4 test: use flag instead of hardcoded value in examples 2020-03-25 10:43:41 +02:00
Ran Benita 8a1709a411 test/how-to-type: some code fixes/improvements
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-03-21 12:56:13 +02:00
Ran Benita 188a1c79f1 test: add "how to type" demo program
The program takes a unicode codepoint and an RMLVO and prints out all
key + modifier combinations that would result in that codepoint.

The program was written to exercise the new
xkb_keymap_key_get_mods_for_level() function. It's handy and can be
extended in several ways, but enough for now.

Example:

    $ ./build/how-to-type -l us,il,ru 0x41 | column -ts $'\t'
    keysym: A (0x41)
    KEYCODE  KEY NAME  LAYOUT#  LAYOUT NAME   LEVEL#  MODIFIERS
    38       AC01      1        English (US)  2       [ Shift ]
    38       AC01      1        English (US)  2       [ Lock ]
    38       AC01      2        Hebrew        2       [ Shift ]
    38       AC01      2        Hebrew        2       [ Lock ]

    $ ./build/how-to-type -l de -v neo 0x3b6 | column -ts $'\t'
    keysym: Greek_zeta (0x7e6)
    KEYCODE  KEY NAME  LAYOUT#  LAYOUT NAME     LEVEL#  MODIFIERS
    56       AB05      1        German (Neo 2)  4       [ Shift Mod5 ]
    56       AB05      1        German (Neo 2)  4       [ Shift Mod2 Mod3 Mod5 ]
    56       AB05      1        German (Neo 2)  4       [ Shift Lock Mod5 ]
    56       AB05      1        German (Neo 2)  4       [ Lock Mod2 Mod3 Mod5 ]

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-03-20 19:40:14 +02:00
Ran Benita 90e5aa8bc5 doc: add missing @since tags
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-03-20 19:40:14 +02:00
Jaroslaw Kubik d92a248c48 API to query modifier set required to type a keysym
The new API is useful to implement features like auto-type and
desktop automation. Since the inputs for these features is usually
specified in terms of the symbols that need to be typed, the
implementation needs to be able to invert the keycode->keysym
transformation and produce a sequence of keycodes that can be used
to type the requested character(s).
2020-03-20 19:20:36 +02:00
Jaroslaw Kubik 0345aba082 Support translation Unicode codepoints to keysyms
In order to support features like auto-type and UI automation, the
relevant tools need to be able to invert the keycode->keysym->text
transformation. In order to facilitate that, a new API was added.
It allows querying the keysyms that correspond to particular Unicode
codepoints. For all practical purposes, it can be thought of as an
inverse of xkb_keysym_to_utf32().
2020-02-24 09:54:09 +02:00
Ran Benita 1b23a650ab build: fix build with byacc
We apparently broke byacc support in the switch to meson.

byacc only supports short option names. And to make things fun, bison
only supports long option for `--defines`.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/133
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-02-18 14:12:20 +02:00
Ran Benita c90703265f doc: must -> should
Using an out-of-range is not an error, just useless.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-02-16 13:32:09 +02:00
Ran Benita e3c3420a71 Bump version to 0.10.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-01-18 23:08:45 +02:00
Ran Benita 517464eb7a doc/rules-format.txt: document include support
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-01-18 23:06:58 +02:00
Ran Benita 335ebcadd4 docs: add missing reference to $XDG_CONFIG_HOME
Signed-off-by: Ran Benita <ran@unusedvar.com>
2020-01-18 22:59:58 +02:00
Adrian Perez de Castro d2f2e6fd5c CI: Add build instructions for Windows
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 16:12:15 +02:00
Adrian Perez de Castro 9e3045c7f5 MSVC: Provide an implementation of gettimeofday() 2019-12-28 16:12:15 +02:00
Adrian Perez de Castro f1186acfd4 MSVC: Provide implementations of [un]setenv()
Reference:
https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/putenv-s-wputenv-s
2019-12-28 16:12:15 +02:00
Adrian Perez de Castro abb2f9d978 MSVC: Provide implementations of test_{dis,en}able_stdin_echo
This provides implementations of the test_enable_stdin_echo and
test_disable_stdin_echo which do not require <termios.h>, which is
not available on Windows.
2019-12-28 16:12:15 +02:00
Adrian Perez de Castro 5354dee2f7 MSVC: Use <io.h> as an alternative for <unistd.h>
Only the input/output functions from <unistd.h> options are used, so
using <io.h> when building with MSVC should be enough. The inclusion
of the header in context-priv.c does not seem to be needed (tested
on GNU/Linux) and so it is removed.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 16:12:15 +02:00
Adrian Perez de Castro f09ae987bf build: Skip building some tests on MSVC for now
This is a stopgap measure to quickly get tests building with MSVC for
now, at some point the tests could be rewritten to avoid using getopt()
and mkdtemp() or to ship an implementation.
2019-12-28 16:12:15 +02:00
Adrian Perez de Castro 578aeac6b2 build: add some defines for MSVC to allow it to be unixy
[ran: combined some commits]
2019-12-28 16:12:15 +02:00
Ran Benita 92a7aba6ad ci: use consistent python for all jobs
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 16:05:32 +02:00
Ran Benita faac4ba7de test/data: ensure files are checked out with LF, not CRLF
The tests stringcomp and buffercomp do binary comparison on some files;
if the files are changed to CRLF on checkout, the tests fail.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 15:59:47 +02:00
Adrian Perez de Castro b30bf21c82 CI: some tweaks
[ran: extracted generic bits from Windows commit.]

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 15:32:30 +02:00
Ran Benita fadfb13c42 xkbcomp/rules: support \r\n line endings
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 14:19:22 +02:00
Ran Benita d1e39c111e test/atom: use correct format specifier for size_t
From MSVC:

test\atom.c(98): note: consider using '%zu' in the format string
test\atom.c(98): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(100): note: consider using '%zu' in the format string
test\atom.c(100): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(114): note: consider using '%zu' in the format string
test\atom.c(114): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(128): note: consider using '%zu' in the format string
test\atom.c(128): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(130): note: consider using '%zu' in the format string
test\atom.c(130): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(137): note: consider using '%zu' in the format string
test\atom.c(137): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 2 has type 'size_t'

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 14:13:52 +02:00
Ran Benita da4a90c13e Open files in binary mode
This turns off some misfeatures on Windows, and does nothing on POSIX.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 13:49:40 +02:00
Ran Benita fe417d841e test/common: avoid double // in path
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 13:40:38 +02:00
Ran Benita eb23982cab test/common: simplify test_get_path()
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-28 13:39:33 +02:00
Ran Benita 521bb498ed xkbcomp: remove cast which triggers warning on gcc
Will need some other way to take care of the warning on MSVC.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 22:09:34 +02:00
Ran Benita fbd0e643d8 xkbcomp: make a couple of casts explicit to mark them as checked
This acknowledges some "possible loss of data cast" warnings from MSVC.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 21:55:14 +02:00
Ran Benita f967d46b65 test/context: use a more portable directory-exists check
MSVC doesn't have opendir/closedir.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 15:47:49 +02:00
Ran Benita 1849158afd xkbcomp/keywords: regenerate with newer gperf
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 15:20:25 +02:00
Ran Benita 823708b73e parser: fix format string for int64_t
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 15:20:25 +02:00
Ran Benita 670566f0d4 Only add GCC diagnostic pragmas when compiler is GCC compatible
Avoid "unknown pragma" warnings on other compilers.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 15:20:25 +02:00
Ran Benita 40bea8e9fa xkbcomp: fix wrong return type
Detected by MSVC:

xkbcomp\xkbcomp.c(111): warning C4047: 'return': 'bool' differs in levels of indirection from 'void *'

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 15:04:40 +02:00
Ran Benita 6ca1a0c9f6 parser: use int64_t for all numbers
Don't use int which can have different size on different machines.
Also avoid some warnings from MSVC:

xkbcomp/parser.y(760): warning C4244: '=': conversion from 'int64_t' to 'int', possible loss of data
xkbcomp/parser.y(761): warning C4244: '=': conversion from 'int64_t' to 'int', possible loss of data
xkbcomp/parser.y(767): warning C4244: '=': conversion from 'int64_t' to 'int', possible loss of data

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 14:17:55 +02:00
Ran Benita c3ac58a941 scanner-utils: avoid possible implicit truncating of line/column
This increases the size of the struct a bit but it's not very important.

Fixes these MSVC warnings:

src\scanner-utils.h(112): warning C4267: '+=': conversion from 'size_t' to 'unsigned int', possible loss of data
src\scanner-utils.h(147): warning C4267: '+=': conversion from 'size_t' to 'unsigned int', possible loss of data

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 14:06:47 +02:00
Ran Benita 0fdd29bb7b utils: move macro defines to before they're used
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 13:55:24 +02:00
Ran Benita 64137a4ab5 utils: fix typo in strndup fallback
Fixup 93a1305 - we will have CI for this soon.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 13:52:51 +02:00
Adrian Perez de Castro d59ff39d22 meson.build: Take win_bison as a possible variant for Bison
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 13:21:34 +02:00
Ran Benita 40aab05e77 build: include config.h manually
Previously we included it with an `-include` compiler directive. But
that's not portable. And it's better to be explicit anyway.

Every .c file should have `include "config.h"` first thing.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 13:09:11 +02:00
Adrian Perez de Castro bdff8ebe3c Provide a fallback implementation of [v]asprintf()
Some environments (e.g. Windows + MSVC) do not provide asprintf() or
vasprintf(). This tries to detect their presence, and provides suitable
fallback implementations when not available.
2019-12-27 12:45:34 +02:00
Adrian Perez de Castro 93a13050d6 Provide a fallback implementation of strndup()
Some environments (e.g. Windows + MSVC) do not provide strndup(), this
tries to detect its presence and provide a fallback implementation when
not available.

[ran: some tweaks]
2019-12-27 12:45:14 +02:00
Adrian Perez de Castro a8acc2ff5c Use built-in istr[n]cmp() instead of strcase[n]cmp()
This avoids the problem that MSVC does not provide strcasecmp() nor
strncasecmp(), and at the same time avoids potential problems due to
locale configuration by using istrcmp() and istrncmp() which are
already in the source tree and written to cover only ASCII.
2019-12-27 12:36:39 +02:00
Ran Benita 34122f9f06 utils: use MIN/MAX instead of min/max
min/max symbols conflict on some systems (msvc), so just use the macros.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 12:34:49 +02:00
Ran Benita ade131307c xkbcomp: downgrade "Symbol added to modifier map for multiple modifiers" log to a warning
This condition happens in xkeyboard-config keymaps and seems hard to
fix. Currently it incessantly spams people's logs who have no idea what
to do about it. So downgrade to "warning" level, so it doesn't show up
by default.

When working on keymaps, set `XKB_LOG_LEVEL=debug XKB_LOG_VERBOSITY=10`
to see all possible messages.

Refs https://github.com/xkbcommon/libxkbcommon/issues/111
Fixes https://github.com/xkbcommon/libxkbcommon/issues/128
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-27 12:26:35 +02:00
Peter Hutterer 00f31e0d27 rules: eliminate an extra fopen/fclose cycle
FindXkbFileInPath() opens the file so we're guaranteed that the file not only
exists, but that we can read it. Changing that would alter behavior so instead
let's just pass that file handle along and do the same for include files.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-24 09:50:03 +02:00
Peter Hutterer ca033a29d2 rules: add include statements to rules files
The majority use-case for extending XKB on a machine is to override one or a
few keys with custom keycodes, not to define whole layouts.

Previously, we relied on the rules file to be a single file, making it hard to
extend. libxkbcommon parses $XDG_CONFIG_HOME/xkb/ but that only works as long
as there is a rule that matches the user-specified RMLVO. This works for MLV
but not for options which don't have a wildcard defined. Users have to copy
the whole rules file and then work from there - not something easy to extend
and maintain.

This patch adds a new ! include directive to rules files that allows including
another file. The file path must be without quotes and may not start with the
literal "include". Two directives are supported, %H to $HOME and %S for the
system-installed rules directory (usually /usr/share/X11/xkb/rules).

A user would typically use a custom rules file like this:

! option                =       symbols
  custom:foo            =       +custom(foo)
  custom:bar            =       +custom(baz)

! include %S/evdev

Where the above defines the two options and then includes the system-installed
evdev rule. Since most current implementations default to loading the "evdev"
ruleset, it's best to name this $XDG_CONFIG_HOME/xkb/rules/evdev, but any
valid name is allowed.

The include functionally replaces the line with the content of the included
file which means the behavior of rules files is maintained. Specifically,
custom options must be defined before including another file because the first
match usually wins. In other words, the following ruleset will not assign
my_model as one would expect:

! include %S/evdev

! model                 =  symbols
  my_model              =  +custom(foo)

The default evdev ruleset has wildcards for model and those match before the
my_model is hit.

The actual resolved components need only be in one of the XKB lookup
directories, e.g. for the example above:

$ cat $XDG_CONFIG_HOME/xkb/symbols/custom
partial alphanumeric_keys
xkb_symbols "foo" {
    key <TLDE> {        [      VoidSymbol ]       };
};

partial alphanumeric_keys
xkb_symbols "baz" {
    key <AB01> {        [      k, K ]       };
};

This can then be loaded with the XKB option "custom:foo,custom:bar".

The use of "custom" is just as an example, there are no naming requirements
beyond avoiding already-used ones. Also note the bar/baz above - the option
names don't have to match the component names.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-24 09:50:03 +02:00
Peter Hutterer 67b538ddc0 context: add a helper function to return the default system include path
No functional changes but we'll need that same lookup in the rules file
include handling in a future patch.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-24 09:50:03 +02:00
Peter Hutterer 3c57b3289a rules: move the matcher result handling to the caller
This shouldn't be processed in the matcher itself, especially in the glorious
future when we can have nested matchers. Only handle this once in the caller
to the original parsed file.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-24 09:50:03 +02:00
Peter Hutterer 2ec07b62b5 rules: put the scanner on the stack
This allows nesting the scanner for the future !include directive.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-24 09:50:03 +02:00
Peter Hutterer bb7551a649 rules: simplify an error path
Initialize to NULL so we don't have to care about whether the cleanups can be
called or not.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-24 09:50:03 +02:00
Peter Hutterer d9b9885624 rules: rename a variable from 's' to 'str'
To avoid name conflicts with a future patch.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-24 09:50:03 +02:00
Peter Hutterer 2a578a60b3 rules: drop the matcher_err() macro and use scanner_err directly
No functional changes, this is what the macro expanded to anyway. Prep work
for putting the scanner on the stack and removing it from the matcher struct.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-24 09:50:03 +02:00
Peter Hutterer f57c13ea4f rules: factor out the function to parse a rules file
No functional changes, this just makes the part to parse a single rules file
re-usable.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-24 09:50:03 +02:00
Peter Hutterer 13b30f4f0d keysym: handle ssharp in XConvertCase()
lowercase: LATIN SMALL LETTER SHARP S (U+00DF)
uppercase: LATIN CAPITAL LETTER SHARP S (U+1E9E)

The uppercase sharp s (XK_ssharp) is a relatively recent addition to unicode
but was added to the relevant keyboard layouts in xkeyboard-config-2.25
(d1411e5e95c)
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/144

Alas, the CapsLock behavior was broken on the finnish layout (maybe others).
This was due XConvertCase() never returning the uppercase characters.

Let's make this function return the right lower/upper symbols for the sharp s
and hope that the world won't get any worse because of it.

Corresponding Xlib issue:
https://gitlab.freedesktop.org/xorg/lib/libx11/issues/110

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-12-22 10:12:53 +02:00
Ran Benita 068e38edca meson: remove redundant malloc scribbling
Turns out meson already sets this (at least MALLOC_PERTURB) on its own
for the `test` target.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-14 13:48:10 +02:00
Ran Benita a237f4f699 parser: fix the remaining pointer chasing
Fix the TODO added in 7c42945.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-12-14 13:45:05 +02:00
Peter Hutterer 1de2f174c2 test: let rmlvo-to-kccgst take long options like rmlvo-to-keymap
The short options were left for backwards compatibility.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-18 15:32:35 +02:00
Ran Benita 7c42945e04 parser: fix quadratic pointer chasing
In the AST, lists (e.g. the list of statements in a file) are kept in
singly-linked lists -- each AST node has a `next` pointer available for
this purpose.

Previously, a node was added to the list by starting from the head,
chasing to the last, and appending. So creating a list of length N would
take ~N^2/2 pointer dereferences.

Now, we always (temporarily) keep the last as well, so appending is O(1)
instead of O(N).

Given a keymap

    xkb_keymap {
    xkb_keycodes {
    minimum = 8;
    minimum = 8;
    minimum = 8;
    minimum = 8;
    minimum = 8;
    [... repeated N times ...]
    };
    xkb_types {};
    xkb_compat {};
    xkb_symbols {};
    };

The compilation times are

N       | Before   | After
--------|----------|-------
10,000  | 0.407s   | 0.006s
20,000  | 1.851s   | 0.015s
30,000  | 5.737s   | 0.021s
40,000  | 12.759s  | 0.023s
50,000  | 21.489s  | 0.035s
60,000  | 40.473s  | 0.041s
70,000  | 53.336s  | 0.039s
80,000  | 72.485s  | 0.044s
90,000  | 94.703s  | 0.048s
100,000 | 118.390s | 0.057s

Another option is to ditch the linked lists and use arrays instead. I
got it to work, but its more involved and allocation heavy so turns out
to be worse without further optimizations.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-14 22:10:09 +02:00
Ran Benita f9b95c06c1 parser: remove an unneeded check
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-14 22:10:09 +02:00
Peter Hutterer 59d2a71383 docs: update the include path documentation
Missing from e23f1061b2 and
3a91788d92.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-14 10:17:46 +02:00
Ran Benita 3d43f4806d compat: reject interpret modifier predicate with more than one value
Given

    interpret ISO_Level3_Shift+AnyOf(all,extraneous) { ... };

Previously, extraneous (and further) was ignored. Now it's rejected.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-12 22:31:46 +02:00
Ran Benita 7d44c7a9f9 expr: fix log message on some unexpected expression types
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-12 22:09:19 +02:00
Ran Benita 406beecae5 Replace some tabs that sneaked in with spaces
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-12 22:06:02 +02:00
Ran Benita 322cd8563c parser: fix merge mode only applied to first vmod in a virtual_modifiers statement
Given

    augment virtual_modifiers NumLock,Alt,LevelThree

Previously it was expanded (directly in the parser) to

    augment virtual_modifiers NumLock;
    virtual_modifiers Alt;
    virtual_modifiers LevelThree;

Now it expands to

    augment virtual_modifiers NumLock;
    augment virtual_modifiers Alt;
    augment virtual_modifiers LevelThree;

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-12 20:37:09 +02:00
Ran Benita 400cc84911 ast: use a separate expr struct for action list
Currently it's under UnaryExpr, which just doesn't make sense.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-12 20:07:12 +02:00
Ran Benita 8c62d48c0c ast-build: get rid of unhelpful macro
Straightforward code is better here.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-12 19:16:08 +02:00
Ran Benita 4849bc1914 atom: a string is greater than its prefix
Bug accidentally introduced in 9a92b46.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 22:11:22 +02:00
Ran Benita c79c80335b atom: combine atom_intern() and atom_lookup()
Use an "add" bool parameter instead. This simplifies the code a bit.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 21:28:43 +02:00
Ran Benita adbd9c6f08 atom: correct iteration count in hash function
Fixup of ccab349 - unlike the commit message, hash a byte twice instead
of zero times, which is probably better. This is how it was before.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 13:50:59 +02:00
Ran Benita 9ebf97d706 atom: describe how this odd data structure works
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 13:13:30 +02:00
Ran Benita ccab349c99 atom: use a better hash function
FNV-1a instead of the djb2-like one from before.

Keep the unrolling since it seems quite beneficial, even though it loses
one byte if the length is odd...

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 13:01:43 +02:00
Ran Benita 9a92b4643b atom: style changes
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 12:26:19 +02:00
Ran Benita 1fe1b65385 atom: remove handling of garbage input
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 11:40:07 +02:00
Ran Benita a5f95c2b3c atom: use explicit size for fingerprint
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 11:33:45 +02:00
Ran Benita 8ea4a001d1 atom: replace an avoidable strlen
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 00:20:45 +02:00
Ran Benita 6f8bb5ee70 atom: remove redundant field
The field is redundant.

Due to alignment, this will only save memory on 32bit architectures.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-09 00:05:59 +02:00
Ran Benita 2a6155936c test/atom: increase iteration count and print random seed on failure
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-08 22:40:13 +02:00
Ran Benita 2af474e8d0 parser: get rid of "stealing" atoms
This requires (well, at least implemented by) casting away `const` which
is undefined behavior, and clang started to warn about it.

The micro optimization didn't save too many allocations, anyway.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-08 12:13:31 +02:00
Peter Hutterer 31e561fca9 test: remove a superfluous string-is-null check
A few lines above we check path_rel[0], so any null pointer will blow up
before we get here.

Found by coverity

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-07 11:10:00 +02:00
Peter Hutterer 96ef14ac94 test: fix a potential memory leak
Found by coverity

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-07 11:10:00 +02:00
Ran Benita 3515ba19a6 test: xkeyboard-config: bring back the progress bar
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-11-01 10:45:43 +02:00
Peter Hutterer 8f93e22a37 test: xkeyboard-config: invoke the python3 command (#120)
python3 is always python3, but python could be python2 in some cases. Or just
missing (e.g. RHEL8).

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-01 10:41:16 +02:00
Peter Hutterer 0609073ce0 test: xkeyboard-config: add missing variant tests
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-01 10:24:03 +02:00
Peter Hutterer f4a0f73882 test: xkeyboard-config: use universal_newlines instead of decode
This way stdin/stdout of the process are opened in text mode and we don't need
manually decode.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-01 10:24:03 +02:00
Peter Hutterer 7832cc727c test: xkeyboard-config: flake8 fixes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-01 10:24:03 +02:00
Peter Hutterer cd5a24aa38 test: xkeyboard-config: handle keyboard interrupts correctly
In python multiprocessing, each process needs to handle (and ignore) the
KeyboardInterrupt to avoid exception logging. This is a separate patch for
easier reviewing, the first hunks merely re-indent all of the
xkbcommontool/xkbcomp functions into a try/except KeyboardInterrupt block.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-01 10:24:03 +02:00
Peter Hutterer 9fc0cb8777 test: xkeyboard-config: print to stderr on failure, stdout otherwise
This is a change in behavior and requires any automated callers to adjust
accordingly. Still, much easier to get the errors that way rather than it
being mixed into a thousands-of-lines output file.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-01 10:24:03 +02:00
Peter Hutterer f53838477d test: xkeyboard-config: add a multiprocessing.Pool() to speed up the test
Collect all options into a dictionary, then process that as async actions
through a process pool. This of course requires collecting the various print
statements to avoid mangled output.

This dropped the time to completion from around 14 min to 8 min on my local
machine (unscientific single run only for the original timing).

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-01 10:24:03 +02:00
Peter Hutterer 1e13190685 test: xkeyboard-config: use argparse for the path and the tool selection
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-11-01 10:24:03 +02:00
Ran Benita 90497b84f8 scripts/makeheader: slight simplification
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-10-31 21:21:35 +02:00
Sebastian Wick f0c0cb8074 scripts/makeheader: allow overriding the prefix path of the X11 headers
with X11_HEADERS_PREFIX

Signed-off-by: Sebastian Wick <sebastian@sebastianwick.net>
2019-10-31 21:20:08 +02:00
Peter Hutterer 255200faa7 test: add test for the various default include paths
All tests create a temporary directory, set up the environment for that
directory and then check the include paths for the presence of that directory,
ideally in the right position of the list.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-10-31 19:29:30 +02:00
Peter Hutterer e23f1061b2 Use XDG_CONFIG_HOME as first XKB search path
Use $XDG_CONFIG_HOME/xkb as the primary lookup path for XKB rules. Same
motivation as in 3a91788d92, however the XDG directories are more standard
and recommended these days than application-specific dotfiles.

The XDG spec says to fall back to $HOME/.config where XDG_CONFIG_HOME is not
set so we implement that behavior as well.

Fixes #112

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-10-31 19:29:30 +02:00
Ran Benita 6d83838cc2 Bump version to 0.9.1
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-10-20 23:07:52 +03:00
Jan Alexander Steffens (heftig) 4b3783987e context: Don't fail to create the context if HOME isn't available
E.g. when Mutter has CAP_SYS_NICE and thus secure_getenv returns NULL.

Fixes https://bugs.archlinux.org/task/64191

[ran: changed to ignore error]
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-10-20 23:00:30 +03:00
Ran Benita aa118b4b97 README: update my email address
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-10-19 00:55:21 +03:00
Ran Benita a88a0710f9 Bump version to 0.9.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-10-19 00:41:36 +03:00
Ran Benita e41dc19a22 build: remove leftover autotools file
Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-10-19 00:41:36 +03:00
Ran Benita 45496c33f1 test: fix printf("%s", NULL) in error path
../test/common.c: In function ‘test_get_path’:
    ../test/common.c:171:9: warning: ‘%s’ directive argument is null [-Wformat-overflow=]
      171 |         fprintf(stderr, "Failed to allocate path (%d chars) for %s\n",
          |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      172 |                 (int) path_len, path);
          |                 ~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-10-19 00:38:43 +03:00
Ran Benita 076047b21a keymap-dump: use consistent capitalization for "Group<N>"
It's used capitalized everywhere except a couple places.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-10-16 10:36:41 +03:00
Ran Benita a6ed0304f7 keymap-dump: fix invalid names used for levels above 8
xkbcomp only accepts the "Level" prefix for a level name for levels 1 to
8, but the keymap dumping code added it always, e.g. "Level15".

The plain integer, e.g. "8", "15" is always accepted, so just use that.

Fixes https://github.com/xkbcommon/libxkbcommon/issues/113

Signed-off-by: Ran Benita <ran@unusedvar.com>
Reported-by: progandy
2019-10-16 10:36:37 +03:00
Ran Benita 3a91788d92 context: move ~/.xkb to before XKB_CONFIG_ROOT in the default include path
Previously, the default include path was XKB_CONFIG_ROOT:~/.xkb.

The ~/.xkb include path is intended to allow the local user to customize
their keymaps without having to modify system paths.

But usually, the user only wants to customize specific parts. When
XKB_CONFIG_ROOT is first, the user can only customize through the "entry
point" (the RMLVO). When ~/.xkb is first, the user can drop in a file
and it will override the system one.

The impetus for this change is the rules file. "evdev" is hard-coded
everywhere, so it not often not possible to change to something else.
And the rules files determines how the rest of the RMLVO is interpreted.
So, to enable customization, we have these options:

A: System includes user.
B: User includes system.
C: Library goes over both in one or the other order.

Option A is problematic due to backward compatibility and is also
unnatural.

Option B gives the user control and is backward compatible, so that's
what we choose. This is also how Compose files are handled, and that
seems to work fine in the wild.

Option C is actually less flexible than B, and more complicated.

(The rules file format doesn't have an include statement yet, but it's
planned).

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-10-03 17:27:00 +03:00
Alan Coopersmith 934d574172 build: Solaris needs __EXTENSIONS__ instead of _GNU_SOURCE
Fix meson build on Solaris by using __EXTENSIONS__ where Linux & other
platforms use _GNU_SOURCE.  Without this the build fails due to missing
prototypes for functions like strdup & getopt not defined in the C99
standard.  (In autoconf, this was handled by AC_USE_SYSTEM_EXTENSIONS.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-09-11 20:30:37 +03:00
Ran Benita 25cd67daf7 build: remove autotools build
We introduced meson 2 years ago, hopefully that's was enough time for
everyone to convert.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-08-10 20:20:36 +03:00
Ran Benita e7bb7045b8 ci: remove travis CI
We moved to Azure Pipelines.

Signed-off-by: Ran Benita <ran@unusedvar.com>
2019-08-10 20:20:36 +03:00
Ran Benita d486b54288 Set up CI with Azure Pipelines
[skip ci]
2019-08-09 23:15:26 +03:00
Adrian Perez de Castro cc0e3617a9 CI: Install graphviz using APT
This adds the missing graphviz dependency, from which Doxygen uses
"dot" to create diagrams for the documentation. Also, the meson
dependency is removed as it is installed using Pip, and ninja-build
added.
2019-08-09 23:01:27 +03:00
Adrian Perez de Castro c408adc229 CI: Publish test results from Meson 2019-08-09 23:01:27 +03:00
Adrian Perez de Castro f796bbb8f7 CI: Try builds both with Clang and GCC 2019-08-09 23:01:27 +03:00
Adrian Perez de Castro 510cbdd243 CI: Enable a macOS job 2019-08-09 23:01:27 +03:00
Adrian Perez de Castro af22f9dc22 CI: Make Autotools and Meson builds parallel
This splits the steps for installing dependencies into a new template
file, as well as the build steps for Autotools. Both gets used to define
two jobs which can run in parallel for both build systems.
2019-08-09 23:01:27 +03:00
Adrian Perez de Castro 789bd05c35 CI: Always try to gather test results
Resulting test logs should be always attached to the task, regardless
of whether the test suite ran successfully or not.
2019-08-09 23:01:27 +03:00
Adrian Perez de Castro ef74ee1b76 CI: Split Meson build steps into a separate YAML file 2019-08-09 23:01:27 +03:00
Adrian Perez de Castro 7413c6f577 CI: Save the Meson logs as downloadable files
This uploads the files saves to meson-build/meson-logs/ and associates
them to the pipeline task, which makes them availabl for download in the
Azure Pipelines web interface.
2019-08-09 23:01:27 +03:00
Adrian Perez 69651bf77a CI: Initial set up to use Azure Pipelines
For the moment, configure only basic builds with Ubuntu 16.04, more to be added as follow-ups. [skip ci]
2019-08-09 23:01:27 +03:00
Ran Benita ab4b4b7f12 travis: improve configuration and add macOS
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-07-25 14:34:17 +03:00
Ran Benita 7407d311bf test/symbols-leak-test: fix sed regex on macOS
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-07-25 14:18:42 +03:00
Ran Benita c68a8e2998 build: fixup autotools build after 97f41fe
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-07-25 13:34:49 +03:00
Ran Benita 97f41fe4ac test/symbols-leak-test: make it work with macOS diff
The <() stuff fails with an error:
    diff: extra operand `/dev/fd/61'

Signed-off-by: Ran Benita <ran234@gmail.com>
2019-07-25 13:24:00 +03:00
Ran Benita 6728ebca4a test/rmlvo-to-keymap: drop basename usage
It wants some libgen.h include which is POSIX only, let's just remove
it as it's hardly important.

Signed-off-by: Ran Benita <ran234@gmail.com>
2019-07-25 12:00:27 +03:00
worldofpeace 32d178b50f test/rmlvo-to-keymap.c: fix compilation on Darwin (#101)
program_invocation_short_name isn't portable.
2019-07-19 09:56:41 +03:00
Daniel Stone 909cc04d2c interactive-wayland: Port to stable xdg-shell (#100)
xdg_shell v6 was pretty close to the finalised stable version of
xdg-shell. We can now just use the stable version, which is supported
everywhere (Enlightenment, KWin, Mutter, Weston, wlroots).

This requires bumping the wayland-protocols dependency.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2019-07-02 15:48:32 +03:00
Ran Benita 06a80beed8 Merge pull request #98 from michaelforney/popcount
Use bitwise test for power-of-2 instead of popcount
2019-06-11 19:59:25 +03:00
Michael Forney 9d58bbd4ff Use bitwise test instead of popcount to check if one bit is set
We don't need to determine the total number of bits set to determine if
exactly one is set.

Additionally, on x86_64 without any -march=* flag, __builtin_popcount
will get compiled to a function call to the compiler runtime (on gcc),
or a long sequence of bit operations (on clang).

Signed-off-by: Michael Forney <mforney@mforney.org>
2019-06-10 11:15:55 -07:00
Ran Benita db33ec0d61 Merge pull request #96 from Jjagg/patch-1
Fix a few doc typos
2019-06-05 09:49:04 +03:00
Jesse 8129f3b256 Fix some doc typos 2019-06-04 23:44:42 +02:00
Ran Benita db7e79e78d Merge pull request #95 from Hi-Angel/fix-lgtm-warnings
Fix some of LGTM warnings
2019-03-24 14:05:17 +02:00
Konstantin Kharlamov 75d1110c22 symbols: add a comment to suppress warning from code analyzers
Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
2019-03-23 23:31:29 +03:00
Ran Benita 83cfbf8840 Merge pull request #94 from milloni/milloni/m4
Makefile.am: add include dir for AC_CONFIG_MACRO_DIR to work
2019-03-12 19:39:23 +02:00
milloni 10311c95ef Makefile.am: add include dir for AC_CONFIG_MACRO_DIR to work
With older versions of autotools, one needs to add this line to
Makefile.am. From the autoconf docs: "Note that if you use aclocal from
Automake to generate aclocal.m4, you must also set ACLOCAL_AMFLAGS = -I dir
in your top-level Makefile.am". [1]

I couldn't build with autoconf 2.68 without this.

[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/Input.html

Signed-off-by: milloni <milloni@preemptable.org>
2019-03-12 16:22:15 +00:00
Ran Benita 255047f757 README: usage questions are alright
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-02-26 18:32:32 +02:00
Ran Benita 6f0f9534b3 README: stop pointing at bugs.freedesktop.org
No-one filed bugs in there for a while, let's consolidate on the more
popular one.

Signed-off-by: Ran Benita <ran234@gmail.com>
2019-02-26 18:32:32 +02:00
maxice8 9badb4e4a2 meson.build: use program from build machine not host or target.
We can't always execute binaries from the host or target machine,
as is the case in cross compilation.

closes #89
2019-02-23 09:04:36 +00:00
Ran Benita d40b368b2f Bump version to 0.8.4
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-02-22 22:26:49 +02:00
Ran Benita 2d9e1751d0 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-02-22 22:26:11 +02:00
Ran Benita df28d5e8e3 build: fix meson build from tarball generated by autotools
These files are used by the meson build only. Previously, trying to
build with meson using the tarball generated by distcheck would fail.

Fixes https://github.com/xkbcommon/libxkbcommon/issues/87.

Reported-by: manesm52
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-02-22 15:46:44 +02:00
Peter Hutterer 3f5095339f meson.build: link the sources directly into libxkbcommon-x11
Similar to 75ce741ab9, just for the -x11
sublibrary.

This works around meson bug 3937, 'link_whole' arguments don't get added into
the final static library and we end up with a virtually empty 8-byte
libxkbcommon-x11.a file, see https://github.com/mesonbuild/meson/issues/3937

The internal lib is still built for the one test case that requires it.

Fixes #86

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-02-11 11:35:34 +02:00
Ran Benita 9f93ebcf2b Bump version to 0.8.3
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-02-08 12:39:01 +02:00
Ran Benita 53e7a315c3 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-02-08 12:38:02 +02:00
Ran Benita caddfdb0ad meson: make comment make sense now
Signed-off-by: Ran Benita <ran234@gmail.com>
2019-02-08 12:29:27 +02:00
Ran Benita 327fd9a1de Merge pull request #85 from whot/wip/static-lib-sources
meson.build: manually link all sources into the library
2019-02-08 12:18:00 +02:00
Peter Hutterer 75ce741ab9 meson.build: manually link all sources into the library
This works around meson bug 3937, 'link_whole' arguments don't get added into
the final static library and we end up with a virtually empty 8-byte
libxkbcommon.a file, see https://github.com/mesonbuild/meson/issues/3937

Workaround is simply to add all sources to both libraries we need them in.
This obviously compiles them twice but this year's winter was cold and
bit of extra warmth will be appreciated.

Fixes #84

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-02-08 12:21:28 +10:00
Ran Benita 73794e1e54 docs: fix a doxygen reference warning 2019-01-28 16:29:09 +02:00
Ran Benita 828cec7b8b Merge pull request #81 from whot/master
keysyms: fix comment for XKB_KEY_OCARON
2019-01-25 12:50:55 +02:00
Peter Hutterer e08d589f2c keysyms: fix comment for XKB_KEY_OCARON
Reported-by: Keve Müller
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2019-01-25 10:39:22 +10:00
Ran Benita bc04af63c0 Merge pull request #79 from jwrdegoede/add-2-new-keysyms
Sync Keysyms with recent xproto additions
2019-01-22 09:48:23 +02:00
Hans de Goede 9b85d96d2a Sync Keysyms with recent xproto additions
xproto recently has been extended with 2 new keysyms:
XF86XK_MonBrightnessCycle
XF86XK_RotationLockToggle

This commit is the result of running "scripts/update-keysyms" on a system
with the updated xproto installed.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-22 08:31:43 +01:00
Ran Benita 293c704cbe Merge pull request #69 from alanc/master
Fix off-by-one error in index check in xkb_file_type_to_string
2018-10-01 10:24:45 +03:00
Alan Coopersmith 31f1f35570 Fix off-by-one error in index check in xkb_file_type_to_string
Found by Oracle's Parfait 2.2 static analyzer:
Error: Buffer overrun
   Read outside array bounds [read-outside-array-bounds] (CWE 125):
      In array dereference of xkb_file_type_strings[type] with index type
      Array size is 56 bytes, index <= 56
        at line 734 of src/xkbcomp/ast-build.c in function 'xkb_file_type_to_string'.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-09-30 16:04:29 -07:00
Ran Benita c9a499c9c9 darray: fix unprotected macro argument
Reported-by: @msmeissn
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-08-24 09:19:29 +03:00
Ran Benita 87b0765fde Merge pull request #68 from whot/wip/xkeyboard-config-tester
xkeyboard-config combination tester
2018-08-21 09:05:09 +03:00
Peter Hutterer 878bc08559 test: allow for absolute paths to be resolved
This makes it possible to check a keymap sitting elsewhere than in the test
directory.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-21 11:31:10 +10:00
Peter Hutterer 16c84cdd81 test: drop the rmlvo ability from print-compiled-keymap
This is now handled by the rmlvo-to-keymap tool

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-21 11:31:07 +10:00
Peter Hutterer d1cb8ad409 test: add a tool to test-compile all LVO combinations from xkeyboard-config
This test contains of two parts:
- a simple program to convert RMLVO commandline arguments into a keymap (and
  print that keymap if requested).
- a python script that runs through rules/evdev.xml, and tries to compile a
  keymap for sort-of every layout/variant/option combination. Sort-of, because
  we can have multiple options and it really only does one per layout(variant)
  combination.

Same thing can be done using xkbcomp, but right now it doesn't take that as
argument, it's hard-coded.

This takes quite a while, installing python-tqdm is recommended to see fancy
progress bars instead of just miles of dumps.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-21 11:30:45 +10:00
Ran Benita d7891d0913 build: turn off strict aliasing
The benchmarks don't show any effect, so turn it off to have one less
thing to worry about. The parser does a lot of casting between AST
nodes.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-08-18 15:12:57 +03:00
Ran Benita a9ace75f64 x11: fix undefined behavior when copying the coordinates of ptr movements actions
Left shift of a negative integer. For some reason the protocol
representation here got really botched (in the spec it is just a nice
and simple INT16).

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-08-18 14:58:03 +03:00
Ran Benita f8134c8503 Bump version to 0.8.2
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-08-05 08:55:39 +03:00
Ran Benita e3f9c1b4cf Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-08-05 08:55:39 +03:00
Ran Benita a3e110d605 Merge pull request #67 from fooishbar/fix-more-fuzz
Fix more fuzz-testing fallout
2018-08-05 08:45:19 +03:00
Daniel Stone bb4909d2d8 Fail expression lookup on invalid atoms
If we fail atom lookup, then we should not claim that we successfully
looked up the expression.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2018-08-03 16:24:50 +01:00
Daniel Stone 5440aaa522 Fix signed vs. unsigned confusion in name sanitisation
Don't try to divide through a signed char when indexing an array, lest
ye try to index off the start of it.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2018-08-03 16:17:10 +01:00
Daniel Stone 4fcbc47059 darray: Don't call memcpy() on NULL
The only time we could ever hit this was with count == 0, which seems
unnecessarily pedantic. But OK.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2018-08-03 16:15:49 +01:00
Daniel Stone ae7856db48 text: NULL-terminate SI mask names
The list should have a NULL sentry. Add one.

testcase: 'interpret KP_Delete+AnyOfOrNaneo(ll)'

Signed-off-by: Daniel Stone <daniels@collabora.com>
2018-08-03 16:15:48 +01:00
Daniel Stone 38e1766bc6 xkbcomp: Don't falsely promise from ExprResolveLhs
Every user of ExprReturnLhs goes on to unconditionally dereference the
field return, which can be NULL if xkb_intern_atom fails. Return false
if this is the case, so we fail safely.

testcase: splice geometry data into interp

Signed-off-by: Daniel Stone <daniels@collabora.com>
2018-08-03 16:14:16 +01:00
Daniel Stone 4e2ee9c3f6 xkbcomp: Don't explode on invalid virtual modifiers
testcase: 'virtualModifiers=LevelThreC'

Signed-off-by: Daniel Stone <daniels@collabora.com>
2018-08-03 16:14:16 +01:00
Daniel Stone 96df3106d4 xkbcomp: Don't crash on no-op modmask expressions
If we have an expression of the form 'l1' in an interp section, we
unconditionally try to dereference its args, even if it has none.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2018-08-03 16:13:35 +01:00
Daniel Stone a8ea7a1d3d parser: Don't set more maps when we don't have any
If the scanner indicates that we might have something which looks like a
map, but the parser in fact fails to create that map, we will try to
access the map regardless. Stop doing that.

testcase: 'xkb_keymap {' -> '#kb_keymap'

Signed-off-by: Daniel Stone <daniels@collabora.com>
2018-08-03 16:13:35 +01:00
Ran Benita 87046f56ef Bump version to 0.8.1
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-08-03 13:55:52 +03:00
Ran Benita 1a138abf75 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-08-03 13:55:17 +03:00
Ran Benita 1f3666915b Merge pull request #66 from whot/master
Coverity fixes (one real bug)
2018-08-01 12:25:18 +03:00
Peter Hutterer c81682975d action: make a note that we may not null-terminate private strings
Coverity complains that a 7-byte string may not be null-terminated when copied
into act->data (size 7). This is fine, make a note of it.

All the strings in xkeyboard-config only use 6 bytes + null terminator so this
won't be an issue. The server (the only user of these) uses an 8-byte array
and forcibly null-terminates the string, see XkbDDXPrivate().

Everything else treats it as byte-array size 7 anyway so whether it's
null-terminated doesn't matter.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-01 18:50:38 +10:00
Peter Hutterer c1e5ac16e7 xkbcomp: fix pointer value for FreeStmt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-01 13:50:38 +10:00
Peter Hutterer badb428e63 keycodes: don't try to copy zero key aliases
Move the aliases copy to within the (num_key_aliases > 0) block.

Passing info->aliases into this fuction with invalid aliases will
cause log messages but num_key_aliases stays on 0. The key_aliases array
is never allocated and remains NULL. We then loop through the aliases, causing
a null-pointer dereference.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-01 13:50:38 +10:00
Peter Hutterer 9045b03598 text: init the target buffer to zero
There's a (theoretical?) path where we might end up strcpy() buf without ever
writing to it. This happens if the mask is nonzero but specifies a modifier
larger than the one in the xkb_mod_set.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-01 13:50:38 +10:00
Ran Benita 842e4351c2 compose: fix infinite loop in parser on some inputs
The parser would enter an infinite loop if an unterminated keysym
literal occurs at EOF.

Found with the afl fuzzer.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-07-30 10:35:10 +03:00
Ran Benita 917636b1d0 xkbcomp: fix crash when parsing an xkb_geometry section
xkb_geometry sections are ignored; previously the had done so by
returning NULL for the section's XkbFile, however some sections of the
code do not expect this. Instead, create an XkbFile for it, it will
never be processes and discarded later.

Caught with the afl fuzzer.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-07-30 10:35:10 +03:00
Ran Benita e3cacae7b1 xkbcomp: fix crashes in the parser when geometry tokens appear
In the XKB format, floats and various keywords can only be used in the
xkb_geometry section. xkbcommon removed support xkb_geometry, but still
parses it for backward compatibility. As part of ignoring it, the float
AST node and various keywords were removed, and instead NULL was
returned by their parsing actions. However, the rest of the code does
not handle NULLs, and so when they appear crashes usually ensue.

To fix this, restore the float AST node and the ignored keywords. None
of the evaluating code expects them, so nice error are displayed.

Caught with the afl fuzzer.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-07-30 10:35:10 +03:00
Ran Benita 1f9d1248c0 xkbcomp: fix stack overflow when evaluating boolean negation
The expression evaluator would go into an infinite recursion when
evaluating something like this as a boolean: `!True`. Instead of
recursing to just `True` and negating, it recursed to `!True` itself
again.

Bug inherited from xkbcomp.

Caught with the afl fuzzer.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-07-30 10:35:10 +03:00
Ran Benita 2cb5c2a3f3 Add fuzzing infrastructure
Though text formats aren't exactly fuzzer's strong suit, fuzzers can
catch many surface-level bugs.

The fuzz/ directory contains target programs, testcases and dictionaries
to drive the afl fuzzer.

This commit adds a fuzzer for the XKB keymap text format and the Compose
text format. On my slow machine, using a single core, a full cycle of
the XKB fuzzer takes 5 hours. For Compose, it takes a few minutes.

Fuzzing for the other file formats (rules files mostly) will be added
later.

To do some fuzzing, run `./fuzz/fuzz.sh`.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-07-30 10:35:10 +03:00
Ran Benita a54cfe087a Merge pull request #65 from heftig/pc-fix2
meson: Fix xkbcommon-x11.pc Requires versioning
2018-07-17 19:06:12 +03:00
Jan Alexander Steffens (heftig) 83a553a009 meson: Fix xkbcommon-x11.pc Requires versioning
Old meson expects an array with one dependency per element. Providing a
string containing multiple deps results in only the first dep getting
its whitespace properly applied. As a result, the output was:

    Requires.private: xcb >= 1.10 xcb-xkb>=1.10

And downstream projects failed to find a package named 'xcb-xkb>=1.10'.

Specifying an array of versioned deps results in correct output:

    Requires.private: xcb >= 1.10, xcb-xkb >= 1.10

Fixes #64.

Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
2018-07-17 17:31:55 +02:00
Jan Alexander Steffens (heftig) a3c907d389 meson: Fix xkbcommon-x11.pc Requires
The meson-generated pkgconfig file was missing Requires and
Requires.private.

[ran: adjust for older Meson versions.]

Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-07-17 09:30:43 +03:00
Ran Benita c8e17eede5 bench: simplify the bench helpers
Trim the API a bit.

Also, just always use gettimeofday(), which is portable. Hopefully the
system clock doesn't change while a benchmark is running.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-07-05 18:29:39 +03:00
Ran Benita 110d17c6be travis: pin meson to an older version so it works with Python 3.4
The CI image only has Python 3.4. It's a bit of a hassle to change this,
so let's pin meson to the version before they bumped their requirement
instead.

I suppose it's not that bad in that it will guarantee compatibility with
older meson over time.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-06-23 23:17:07 +03:00
Ran Benita 5cee660f69 keysym-utf: reject out-of-range Unicode codepoints in xkb_keysym_to_utf{8,32}
It used to be UTF-8 was defined for inputs > 0x10FFFF, but nowadays
that's the maximum and a codepoint is encoded up to 4 bytes, not 6.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/58
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/59
Reported-by: @andrecbarros
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-06-23 22:53:42 +03:00
Ran Benita b63196e91e keysym-utf: replace the Unicode characters for leftanglebracket and rightanglebracket
Looking at leftanglebracket

- The standard[1] does not specify any Unicode value for it.

- The keysym list keysymdef.h in x11proto[2] says U+27E9 MATHEMATICAL
  RIGHT ANGLE BRACKET in a comment.

- The keysym->unicode list in xkbcommon which comes from [3] has U+2329
  LEFT-POINTING ANGLE BRACKET.

- The keysym->unicode list in Xlib[4] has U+2039 SINGLE LEFT-POINTING
  ANGLE QUOTATION MARK.

[1] https://www.x.org/releases/X11R7.7/doc/xproto/x11protocol.html#Legacy_KEYSYMs
[2] https://cgit.freedesktop.org/xorg/proto/x11proto/tree/keysymdef.h
[3] https://www.cl.cam.ac.uk/%7Emgk25/ucs/keysym2ucs.c
[4] https://cgit.freedesktop.org/xorg/lib/libX11/tree/src/xlibi18n/imKStoUCS.c

The symbols we are using, {LEFT,RIGHT}-POINTING ANGLE BRACKET, are
deprecated according to Unicode[5]:

    These characters are deprecated and are strongly discouraged for
    mathematical use because of their canonical equivalence to CJK
    punctuation.

[5] https://www.unicode.org/charts/PDF/U2300.pdf

Hence, switch to the MATHEMATICAL codepoints which seem to be the best
fit.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/47
Reported-by: @bytensky
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-02-27 20:24:57 +02:00
Ran Benita b2529f2a88 build/autotools: remove redundant ACLOCAL_AMFLAGS
Will be deprecated in automake 2.0.

Replaced by AC_CONFIG_MACRO_DIR (already present) which is available
since autoconf 2.63.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-02-27 12:36:20 +02:00
Ran Benita 776cb52361 build/meson: fix x11 test/demo compilation with non-standard xcb
The x11 tests/demos did not depend on xcb and xcb-xkb directly, only
indirectly through link_with: libxkbcommon_x11_internal. So linking
worked, but the xcb and xcb-xkb cflags were *not* included when
compiling them. So when using xcb installed in a non-standard location,
what would happen is:

- Library will link with custom xcb and compile with custom xcb headers.
- Test will link with custom xcb and compile with system xcb headers (if
  exist, otherwise fail).

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/57
Reported-by: @remexre
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-02-25 11:59:04 +02:00
Ran Benita edb1c66239 build/meson: fix the -Wl,--version-script configure check
Hopefully this fixes compilation on darwin, which doesn't support
version scripts.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-02-14 15:10:03 +02:00
Ran Benita afea3dd0cd test/interactive-wayland: replace tabs with spaces
Match the style of all other files.

Signed-off-by: Ran Benita <ran234@gmail.com>
2018-01-27 20:42:44 +02:00
Ran Benita 740c66885f doc: improve the description of the consumed modifier modes
Hopefully it is more understandable now.

https://bugs.freedesktop.org/show_bug.cgi?id=104768

Reported-by: Gatis Paeglis <gatis.paeglis@qt.io>
Signed-off-by: Ran Benita <ran234@gmail.com>
2018-01-26 13:11:04 +02:00
Ran Benita 767fa86d42 Convert http:// -> https:// where possible
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-21 14:18:07 +02:00
Ran Benita 4fccdee383 x11: check and document the correct range of device IDs
The actual value is 127, not 255.

https://bugs.freedesktop.org/show_bug.cgi?id=104321

Reported-by: Gatis Paeglis <gatis.paeglis@qt.io>
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-18 16:41:21 +02:00
Ran Benita b82e3b764e Bump version to 0.8.0
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-15 21:41:51 +02:00
Ran Benita 3db1b9d501 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-15 21:40:30 +02:00
Ran Benita 8ce81c0607 README,PACKAGING: use the new meson unified command format
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-15 16:18:14 +02:00
Ran Benita 5c9042127f build: disable -Wdocumentation-deprecated-sync
We will never remove the deprecated functions and there is no real
reason to annoy users into stop using them.

If there *will* be a reason, *then* we will add the attribute.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/56
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-14 17:56:18 +02:00
Ran Benita 10e1a1b1aa travis: ensure all tests are valgrind-clean
The tests will fail if they have any memory leaks or perform invalid
accesses.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-12 15:58:32 +02:00
Ran Benita 29998c258c test/x11: properly clean up also when skipping test
To make valgrind happy.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-12 15:58:32 +02:00
Ran Benita 47f45194e4 compose/parser: be more careful when checking if sequence overrides or duplicates another
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-12 15:45:37 +02:00
Ran Benita 2963e29f0e xkbcomp/ast-build: fix memory leak when appending multi-keysyms
`syms` was not freed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-12 14:44:01 +02:00
Ran Benita 26453b8473 keymap: fix NULL dereference when dumping the default fallback type
The default fallback type uses
    type->level_names = NULL
but the keymap-dump code was not checking this case.

Instead of adding more workarounds and possible bugs (e.g. previous
commit), let's just keep the number of level names separately. This has
the additional advantage retains extraneous level name if someone adds
them for some reason.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-12 14:33:24 +02:00
Ran Benita 9f85d6b78c xkbcomp/types: fix types being assigned the wrong number of levels in some circumstances
The buggy code assigned the number of levels based on the number of
level names in the definition, instead of the actual number of levels!
This would completely break type definitions which do not give names to
levels.

This was not noticed for so long because xkeyboard-config always gives
names to all levels.

This regressed in 61fed8dab9.

Reported-by: Gatis Paeglis <gatis.paeglis@qt.io>
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-12 14:08:01 +02:00
Ran Benita 18d6aebec0 keysym: add xkb_keysym_to_{lower,upper} to public API
These can be useful in some odd cases.

There is already an implementation (+ tests) for internal use, so all
that's needed is to export them.

If xkbcommon were to provide a way to convert a Unicode codepoint to a
keysym, this could have been implemented externally as follows:

    uint32_t codepoint = xkb_keysym_to_utf32(keysym);
    uint32_t upper_codepoint = my_unicode_library_to_upper(codepoint);
    xkb_keysym_t upper_keysym = theoretical_xkb_keysym_from_utf32(upper_codepoint);

However keysym -> codepoint is not injective so such a function is not
possible strictly speaking.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-11 23:01:18 +02:00
Ran Benita 6456835f1c test/data: sync with xkeyboard-config 2.22
Some tweaks to the de(neo) keyseq tests were required. It seems to have
improved.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-12-03 13:07:21 +02:00
Ran Benita 8db924b87d Merge pull request #53 from whitslack/missing-ucs-codes
keysym-utf: Add missing codes for signifblank and permille keysyms
2017-10-03 13:28:32 +03:00
Matt Whitlock 0db1d3131a keysym-utf: Add missing codes for signifblank and permille keysyms 2017-09-28 21:31:28 -04:00
Ran Benita 5eeba0fe0d build/meson: require meson >= 0.41.0
With previous versions, the compilation fails with linker errors.

Fixes https://github.com/xkbcommon/libxkbcommon/issues/52
Reported-by: @rezso
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-09-10 09:18:54 +03:00
Ran Benita 41f1018897 expr: paper over a maybe-uninitialized warning
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-09-08 12:16:13 +03:00
Ran Benita 14686cd1a8 test/interactive-wayland: avoid unused function warning due to configuration
test/interactive-wayland.c:95:1: warning: ‘set_cloexec_or_close’ defined but not used [-Wunused-function]

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-16 20:24:27 +03:00
Ran Benita 76348754e3 build: add missing configure function checks for test/interactive-wayland
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-16 20:23:54 +03:00
Ran Benita f468f0b243 xkbcommon-compose.h: change recommended locale fallback code to treat empty string same as unset
The previous code would cause failures to find the Compose file if one
of the environment variables LC_ALL, LC_CTYPE or LANG are set to the
empty string.

The description of the fallback procedure in loclale(7) talks about
"non-null environment variable"; I interpreted this to mean the
environment variable is unset, but it actually means unset or empty (I
verified this by looking at what glibc and musl do).

A recent bug in systemd https://github.com/systemd/systemd/issues/6407
exposed this issue. It causes these these variables to be set to the
empty string in TTY sessions.

Reported by "doodoo" in https://bbs.archlinux.org/viewtopic.php?id=228658

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-13 18:03:57 +03:00
Ran Benita ba9568bdb1 Bump version to 0.7.2
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-04 16:28:36 +03:00
Ran Benita c99f6a5821 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-04 16:28:14 +03:00
Ran Benita 5c2da7795c build/autotools: fix doc installation
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-04 15:43:13 +03:00
Ran Benita fbd86e44ad test/symbols-leak-test.bash: make it easier to read
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-03 13:38:14 +03:00
Ran Benita 2a16c3c482 build/autotools: fix symbol versioning configure check
Regressed in 4309735. I thought `$top_srcdir` works in configure too,
apparently not!

See: https://github.com/xkbcommon/libxkbcommon/issues/50#issuecomment-319693694

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-02 18:34:29 +03:00
Ran Benita c665b45011 build/autotools: make doxygen's input relative
Was meant to be a part of 41bea9a.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-02 18:26:19 +03:00
Ran Benita cd642b27ac build/autotools: dist the meson build files
So that it's possible to build with meson from autotools-generated
tarballs.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-01 23:36:33 +03:00
Ran Benita fd82b89eb9 build/autotools: install documentation under html/
To be consistent with the meson build; also makes more sense as doxygen
can generate more than html (though we currently are not doing that).

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-01 23:35:22 +03:00
Ran Benita 41bea9ab2b build: make doxygen run from the source tree
I couldn't find any other way to make this work!

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-08-01 23:32:15 +03:00
Ran Benita ccc3415edd Merge pull request #49 from bluetech/meson
build: add meson build system
2017-07-31 20:57:31 +03:00
Ran Benita 86434d8498 build: add meson build system
Meson is easier to maintain, much faster, encourages better practices,
and is not built on a pile of shell scripts.

The autotools build system is kept intact for now, in order to ease the
migration. The intention is to remove it sooner rather than later, if
all goes well.

Run `meson build && mesonconf build` to see the configuration options
for the new system. Conversion should be straightforward. Environment
variables like CFLAGS work the same.

If meson is used, xorg-util-macros is not required.

In terms of functionality the two systems have about the same
capabilities. Here are some differences I noticed:

- Meson uses `-g` by default, autotools uses `-g -O2`.

- In autotools the default behavior is to install both static and shared
  versions of the libraries. In meson the user must choose exactly one
  (using -Ddefault_library=static/shared).

  It is possible to workaround if needed (install twice...), but
  hopefully meson will add the option in the future.

- Autotools has builtin ctags/cscope targets, meson doesn't.

  Easy to run the tools directly.

- Meson has builtin benchmarks target. Handy.

- Meson has builtin support for sanitizers/clang-analyzer/lto/pgo/
  coverage etc. Also handy.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 20:53:39 +03:00
Ran Benita 75ec764cee build: remove Android.mk
I don't think it will work with meson, and I also don't think anyone is
using it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 18:28:28 +03:00
Ran Benita 2f6616a571 build: remove -uninstalled pkg-config files
Meson doesn't support them directly, and I don't think anyone is using
them.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 18:28:28 +03:00
Ran Benita a0c858cda1 travis: do the build out-of-tree
To catch problems like the previous commit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 18:22:54 +03:00
Ran Benita 993f4837ad build: fix out-of-tree build
The change in d44ba48 removed -I$(top_builddir)/src/xkbcomp, but this is
needed in order to find the generated parser.h file which is put in the
build dir.

I also added -I$(top_builddir)/src in order to match the meson behavior.

Fixes https://github.com/xkbcommon/libxkbcommon/issues/50

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 18:20:58 +03:00
Ran Benita 4309735de3 build: use top_srcdir consistently
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 15:55:48 +03:00
Ran Benita 4983dbcf43 build: change doxygen target to be properly dependency-based
This hackery (thanks libinput) is clearer and more precise than the
previous hackery.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 15:55:48 +03:00
Ran Benita 0a19267f30 build: move custom targets to scripts/ and remove from makefile
These scripts generate source code that is committed to git and hence do
not really belong in the build system. A maintainer runs them as needed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 15:55:48 +03:00
Ran Benita 00b08eae82 build: rewrite the update-keysyms sed script in python
A bit more manageable this way, and the other part of the target is
already using python.

The output is the same, except I removed the reference to Makefile.am.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 15:55:48 +03:00
Ran Benita d44ba481d7 build: remove unneeded preprocessor include flags
Better to avoid these unexpected include paths.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 15:55:48 +03:00
Ran Benita 1b6fa0298a build: explain why we don't AC_DEFINE a couple of constants
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 15:55:48 +03:00
Ran Benita daebdb5e08 x11/keymap,test/interactive-evdev: fix a couple of clang-analyzer warnings
From my analysis these values cannot be null, but the analyzer cannot
see this. So assert it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 15:55:48 +03:00
Ran Benita 2d9640651a test/x11comp: fix compiler warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-07-31 15:55:48 +03:00
Ran Benita 42f800175d Merge pull request #48 from namandixit/patch-1
Fixed a minor bug in error detection in Wayland test
2017-05-27 12:23:27 +03:00
Naman Dixit 4f17fc6005 Fixed a minor bug in error detection in Wayland test 2017-05-27 09:15:26 +00:00
Ran Benita ca12d2fdd3 Merge pull request #46 from jwrdegoede/master
Sync Keysyms with recent xproto additions
2017-05-12 14:48:47 +03:00
Hans de Goede 939d0909a4 Sync Keysyms with recent xproto additions
xproto recently has been extended with 4 new keysyms:
XF86XK_Keyboard
XF86XK_WWAN
XF86XK_RFKill
XF86XK_AudioPreset

This commit is the result of running "make update-keysyms" on a system
with the updated xproto installed.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2017-05-12 12:27:05 +02:00
Ran Benita 148aec8bdf doc/compat: correct the XKB protocol version from 1.1 to 1.0
There is no XKB 1.1!

Thanks to Oded Arbel for catching this.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-04-29 15:26:38 +03:00
Ran Benita c9832d4374 test/interactive-x11: handle NULL from xcb_wait_for_event
Can happen in cases like:
- There was an error between the error check and the call.
- The internal poll() fails.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-04-28 09:33:25 +03:00
Ran Benita 6b57344c32 state: cure boolean blindness in the filter functions' result
Makes it a little easier to understand the filters.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-04-27 20:06:21 +03:00
Ran Benita 927fd8f89a state: remove unneeded NULL check
xkb_filter_new() cannot return NULL.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-04-27 19:17:53 +03:00
Ran Benita d44c3ab28e state: reorder new() functions before the set() functions in the code
So that they may be read more naturally in chronological order.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-04-27 19:16:04 +03:00
Ran Benita 5d821aed9b test/x11comp: be a bit more careful with kill()
We did it correctly but better be safe and appease clang.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-04-11 21:01:41 +03:00
Ran Benita 9d94145808 test/interactive-wayland: mark a local function static
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-04-11 21:01:41 +03:00
Ran Benita 03f4a03e71 test/interactive-wayland: handle unrecognized SHM format
The enum seems large, and we don't handle all of the values in it.
Previously if we got an unrecognized SHM format we would use an
uninitialized `stride`.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-04-11 21:01:41 +03:00
Ran Benita 0f43cfa225 test/interactive-wayland: fix uninitialized ret in error path
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-04-11 21:01:41 +03:00
Ran Benita 4812adb0b9 Merge pull request #45 from fooishbar/xdg-shell-v6
Wayland: xdg-shell v6 support
2017-04-11 21:01:03 +03:00
Daniel Stone 90bd9fdb01 interactive-wayland: Port to xdg-shell v6
Mutter only implements v6 now, and Weston also implements that. Port
interactive-wayland to this so people can keep on using it.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2017-04-11 15:09:50 +01:00
Daniel Stone ce38f96e95 Add explicit fallthrough case statements
When we fall through to another label in a case, add an explicit comment
noting so, to quiet GCC 7's warnings.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2017-04-11 15:09:23 +01:00
Ran Benita 877fe59ac3 Bump version to 0.7.1
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-01-18 20:17:46 +02:00
Ran Benita 18d53732f2 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2017-01-18 20:16:15 +02:00
Ran Benita 47d6e5a8d9 compose/doc: note that it is safe to pass the result of getenv() as locale
See the NOTES section of getenv(3). Somewhat obscure but it doesn't hurt
to reassure the readers who know about this.

Signed-off-by: Ran Benita <ran234@gmail.com>
2017-01-15 18:32:02 +02:00
Ran Benita 1ec14d0996 compose: remove the keysym_from_name cache
The hit rate is high, but either the cache is slow or the function is
not fast enough -- the cache no longer holds its weight, leading only to
very modest improvements. If it's the former, it can definitely be
improved, the code is very dumb (though it worked just as well as any
other I tried back then). But instead, let's just kill it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-12-03 00:22:05 +02:00
Ran Benita 7984a30bbc doc: note that XKB_KEYSYM_CASE_INSENSITIVE does C folding only
and not locale-dependent.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-12-03 00:02:57 +02:00
Ran Benita b5586a6c42 keysym: fix locale dependence in xkb_keysym_from_name()
We currently use strcasecmp, which is locale-dependent. In particular,
one well-known surprise even if restricted just ASCII input is found in
the tr_TR (Turkish) locale, see e.g.
https://msdn.microsoft.com/en-us/library/ms973919.aspx#stringsinnet20_topic5

We have known to avoid locale-dependent functions before, but in this
case, we forgot.

Fix it by implementing our own simple ASCII-only strcasecmp/strncasecmp.
Might have been possible to use strcasecmp_l() with the C locale, but
went the easy route.

Side advantage is that even this non-optimized version is faster than
the optimized libc one (__strcasecmp_l_sse42) since it doesn't need to
do the locale stuff. xkb_keysym_from_name(), which uses strcasecmp
heavily, becomes faster, and so for example Compose file parsing, which
uses xkb_keysym_from_name() heavily, becomes ~20% faster.

Resolves https://github.com/xkbcommon/libxkbcommon/issues/42
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-12-02 23:46:56 +02:00
Ran Benita 327364d277 utils: rename popcount to avoid conflict in NetBSD
Resolves https://github.com/xkbcommon/libxkbcommon/issues/41
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-11-14 17:37:35 +02:00
Ran Benita d596f6e3ff Bump version to 0.7.0
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-11-11 20:02:41 +02:00
Ran Benita e7f73940b5 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-11-11 20:01:43 +02:00
Ran Benita 0aa704bc75 Merge pull request #31 from bluetech/consumed-modes
Consumed modifiers modes
2016-10-31 13:07:45 +02:00
Ran Benita babc9e0c30 state: add GTK consumed modifiers mode
This is more or less what is implemented here:
https://git.gnome.org/browse/gtk+/tree/gdk/x11/gdkkeys-x11.c?h=3.19.10#n1131

The implementation here is more technically correct but should provide
the same results.

Try it out with ./test/interactive-evdev -g (modifiers prefixed with "-"
are consumed).

https://bugzilla.gnome.org/show_bug.cgi?id=754110
https://github.com/xkbcommon/libxkbcommon/issues/17

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-10-31 12:52:28 +02:00
Ran Benita a0a41332cc state: allow different modes for calculating consumed modifiers
The current functions dealing with consumed modifiers use the
traditional XKB definition of consumed modifiers (see description in the
added documentation). However, for several users of the library (e.g.
GTK) this definition is unsuitable or too eager. This is exacerbated by
some less-than-ideal xkeyboard-config type definitions (CTRL+ALT seems
to cause most grief...).

So, because we
- want to enable alternative interpretations, but
- don't want to expose too much internal details, and
- want to keep things simple for all library users,
we add a high-level "mode" parameter which selects the desired
interpretation. New ones can be added as long as they make some sense.

All of the old consumed-modifiers functions keep using the traditional
("XKB") mode. I mark xkb_state_mod_mask_remove_consumed() and as
deprecated without adding a *2 variant because I don't it is very useful
(or used) in practice.

Alternative modes are added in subsequent commits (this commit only adds
a mode for the existing behavior).

https://github.com/xkbcommon/libxkbcommon/issues/17

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-10-31 12:52:26 +02:00
Ran Benita 9061171957 utils: add popcount function
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-10-22 20:13:46 +03:00
Ran Benita 914c060a1d test/state: move wrongly-placed assert
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-10-22 20:13:11 +03:00
Ran Benita fe81dcbd2f bench: fix compilation on hurd
Patch by Samuel Thibault.

https://github.com/xkbcommon/libxkbcommon/issues/39

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-09-19 10:09:12 +03:00
Ran Benita 853b7502f4 bench/compose: tabs -> spaces
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-09-16 09:36:27 +03:00
Bryce Harrington af2c83b664 README: Add basic build directions
In particular, highlight the use of configure flags to control locating
X11 keyboard stuff when building for Wayland.

Of particular note, if the locale root is not specified, then xkbcommon
will look for them under $prefix (i.e. /usr/local/share/X11/locale).
But unless the user has specifically installed them there, it is better
to look in the standard system location, /usr/share/X11/locale.

Otherwise, xkbcommon will error when it can't find them, e.g.:

  xkbcommon: ERROR: ~/.XCompose:4:9: failed to expand %L to the locale Compose file
  xkbcommon: ERROR: ~/.XCompose:4:12: unterminated string literal

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-09-16 09:24:09 +03:00
Bryce Harrington e92e0b88c6 README: Bug *reports* are welcome
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-09-16 09:24:04 +03:00
Bryce Harrington ea9a5bcfd7 bench: Check for errors opening Compose file
Otherwise it can segfault e.g. running ./compose inside the bench
directory.

Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-09-16 09:23:43 +03:00
Ran Benita 599fd9ba39 doc/compat: (! MODIFIER) syntax is parsed but ignored
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-09-01 21:23:23 +03:00
Ran Benita c29afcc346 doc/compat.md: xkbcomp ignores multiple-keysyms these days
https://cgit.freedesktop.org/xorg/app/xkbcomp/commit/?id=e119cbec7e750ffc4d4bd08b577db2c697035a30

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-09-01 21:23:12 +03:00
Bryce Harrington d58fc90a29 doc: Also mention the wayland test client in the quick guide
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
2016-06-21 11:35:21 +10:00
Bryce Harrington 094c8dc59b doc: Declare keymap for wayland example
keymap was defined in the X11 example, but also define it in the wayland
example just to make it a bit more standalone

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
2016-06-21 11:35:21 +10:00
Bryce Harrington 832e32dc6c doc: Fix ctx type in example
xkb_context_new() returns a xkb_context pointer, so change the variable
definition to be consistent.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
2016-06-21 11:35:21 +10:00
Daniel Stone 07be44abdb PACKAGING: Update for interactive-wayland
Signed-off-by: Daniel Stone <daniels@collabora.com>
2016-06-21 11:35:21 +10:00
Ran Benita 8978ec39ed test/interactive-wayland: fix control reaches end of non-void function
AFAICS there is nothing that can fail directly in this function, so
change it to void.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-06-09 17:23:55 +03:00
Ran Benita 0dd610fbcb keymap-dump: use consistent order set/latch/lock (style)
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-06-09 16:32:32 +03:00
Ran Benita c8e6996ff9 src/state: match_mod_masks can return bool instead of int
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-06-09 15:30:21 +03:00
Ran Benita 81ee012af0 test/symbols-leak-test: use more portable shebang
Some BSDs don't want to give bash the honor of /bin and put it
elsewhere. So look it up in PATH instead.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-06-09 15:00:43 +03:00
Ran Benita 316c7e2479 test/interactive-wayland: don't ignore asprintf return value
Fixes warn_unused_result warning.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-05-05 15:43:59 +03:00
Ran Benita fc41d3d605 test: use termios instead of system() for disabling terminal echo
Takes care of GCC's annoyingly persistent warn_unused_result warnings.
But it's better to avoid system() I suppose.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-05-05 15:41:13 +03:00
Ran Benita 0da70c8d3c gitignore: ignore generated wayland protocol stubs
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-04-19 12:40:41 +03:00
Daniel Stone 48d5b44fd0 interactive-wayland: Valgrind-proofing
More meticulously free everything we create, including hooking up the
buffer-release callback so we actually free those when required. Make
sure seats are actually in the display's seat list.

The xkbcommon object-unref functions don't actually require
NULL-checking, so we can elide those.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2016-04-12 13:19:25 +01:00
Daniel Stone 7e123a10b6 test: Add interactive-wayland
interactive-wayland is very similar to x11/xev, and dumps out as much
state as possible.

It provides no titlebar and a completely random cursor, but such is
life.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2016-04-12 12:15:04 +01:00
Daniel Stone 03f5d36b44 Bump version to 0.6.1
Our most minor release yet.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2016-04-08 10:38:57 +01:00
Daniel Stone bea54b1f7d Add LICENSE to distributed files
Signed-off-by: Daniel Stone <daniels@collabora.com>
2016-03-31 16:43:58 +01:00
Ran Benita b91584a8f3 doc: update reference to compat symbol to its new name
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-26 01:56:03 +03:00
Ran Benita 3fee46a218 Bump version to 0.6.0
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-16 10:20:49 +02:00
Ran Benita 4c24f7faa8 test: assert/ignore some warn_unused_result's
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-15 20:45:05 +02:00
Ran Benita 02628607e0 Merge pull request #33 from bluetech/travis-enable-x11
travis: remove --disable-x11
2016-03-15 20:38:16 +02:00
Ran Benita ba3e6ce7f2 travis: remove --disable-x11
Looks like the CI machines can use Ubuntu 14.04, which has libxcb 1.10,
which is new enough. Lets see if it works.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-15 20:16:29 +02:00
Ran Benita 02e8b26ca0 Merge pull request #32 from fooishbar/master
doc: Fix Doxygen include for srcdir != builddir
2016-03-15 19:53:45 +02:00
Daniel Stone b04344ff63 travis: Enable documentation build
Make sure Doxygen is installed before we build.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2016-03-15 11:34:01 +00:00
Daniel Stone a2974d5f8a doc: Fix Doxygen include for srcdir != builddir
Instead of giving Doxygen a series of absolute paths to the source
files and a relative path to the output directory, run it from the
source directory with purely relative paths to the source files, and
give it an absolute path to the build directory.

This fixes the parsing of README.md with a separate build directory,
since the relative includes for doc/quick-guide.md and doc/compat.md
don't resolve otherwise. Doxygen's INCLUDE_PATH turns out not to fix
this either, since that's just a set of paths to open and parse, rather
than an analogue to cpp's -I.

Signed-off-by: Daniel Stone <daniels@collabora.com>
2016-03-15 11:21:29 +00:00
Ran Benita d627549c61 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-13 23:38:40 +02:00
Ran Benita 919b97a837 NEWS: add some spacing
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-13 23:33:18 +02:00
Ran Benita 914e84e018 build: don't run test/x11comp in make check for now
For some reason, the dumped keymap started repeating the two key types
FOUR_LEVEL_PLUS_LOCK and FOUR_LEVEL_KEYPAD. I need to investigate, but
let's disable it for now until I do (the problem would likely not be in
the xkbcommon - at most in the test itself).

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-13 23:17:23 +02:00
Ran Benita 37ee8e652b test/x11comp: fix memory leak
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-13 23:17:23 +02:00
Ran Benita fa1b454328 test: add a test that all symbol version file is updated
It is easy to forget to update these files when adding new symbols.

Stolen with slight changes from libinput (commit by Marek Chalupa):
https://cgit.freedesktop.org/wayland/libinput/commit/?id=a9f216ab47ea2f643f20ed741b741a2b5766eba3

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-13 23:17:23 +02:00
Ran Benita 1c6d21b45f Add symbol versions forgotten in 0ce17ef3ea
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-13 23:17:21 +02:00
Ran Benita 712b39ac7d build: make it easier to add non-built (e.g. script) tests
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-13 21:33:03 +02:00
Ran Benita 763e2b7e53 src/utils: check if fileno() failed in map_file
fileno() can fail, if called on e.g. fmemopen() FILEs which are not
backed by a file descriptor. This functions uses mmap to map the entire
file to memory, so using such FILEs will not work.

(There is actually no change of behavior here, since the following fstat
would have already failed with EBADF. But lets make it clear.)

Another possibility is to fall back to the !HAVE_MMAP case; but it
sounds like a better idea to leave it to the programmer to use the
new_from_string/new_from_buffer functions instead, instead of doing
double allocation behind their back.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-03-13 20:24:44 +02:00
Ran Benita 39082082f6 keymap: share LevelsSameSyms()
The function is generic enough.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-02-28 00:33:19 +02:00
Ran Benita c8a2564588 state: factor out get_entry_for_mods()
Will be useful later.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-02-28 00:09:30 +02:00
Ran Benita 9f5139b5ea state: factor out entry_is_active() check
Makes the code slightly cleaner and I plan to use the function in
another place.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-02-28 00:09:19 +02:00
Ran Benita c991a7df56 build: fix distcheck
File was renamed in 4266402.

Signed-off-by: Ran Benita <ran234@gmail.com>
2016-01-20 23:30:51 +02:00
Ran Benita e8f04f222a doc: add environment variables index
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-01-20 23:17:42 +02:00
Ran Benita 4aa50c9d88 doc: some notes about key names and aliases
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-01-20 23:17:42 +02:00
Mike Blumenkrantz 0ce17ef3ea keymap: add xkb_keymap_key_by_name(), xkb_keymap_key_get_name(), tests
xkb_keymap_key_by_name() allows finding a keycode from a given keyname and
is useful for generating keyboard events to use in regression tests
during CI

xkb_keymap_key_get_name() is the inverse of xkb_keymap_key_by_name()

Signed-off-by: Mike Blumenkrantz <zmike@osg.samsung.com>
[ran: some stylistic tweaks + another test case]
Signed-off-by: Ran Benita <ran234@gmail.com>
2016-01-20 23:17:10 +02:00
Ran Benita 7f3bb16729 doc/keymap-format-text-v1: add title and intro
Signed-off-by: Ran Benita <ran234@gmail.com>
2015-11-23 00:07:15 +02:00
Ran Benita cf337875c5 doc/quick-guide: small improvements
Signed-off-by: Ran Benita <ran234@gmail.com>
2015-11-21 23:17:55 +02:00
Ran Benita 4266402345 doc/keymap-format-text-v1: convert to markdown
Make it more readable for random browsing.

Signed-off-by: Ran Benita <ran234@gmail.com>
2015-11-21 23:12:18 +02:00
Ran Benita 8891953514 doc/keymap-format-text-v1: update info on preserve
Signed-off-by: Ran Benita <ran234@gmail.com>
2015-11-21 22:51:13 +02:00
Ran Benita 2cca028906 src/utils: change map_file to not take const string argument
map_file() uses PROT_READ, so const seems fitting; however unmap_file
calls munmap/free, which do not take const, so an UNCONSTIFY is needed.
To avoid the UNCONSTIFY hack, which is likely undefined behavior or some
such, just remove the const.

Signed-off-by: Ran Benita <ran234@gmail.com>
2015-11-19 00:44:27 +02:00
Ran Benita c7e2e6d7b4 keymap: fix outdated comment
See 725ae134d4.

Signed-off-by: Ran Benita <ran234@gmail.com>
2015-10-26 22:16:54 +02:00
Ran Benita 7bb425c14e doc/Doxyfile: explicitly set HTML_TIMESTAMP = NO
YES was the default in older version. Having a timestamp hurts
reproducible builds, and serves no purpose, so remove it.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789071

Signed-off-by: Ran Benita <ran234@gmail.com>
2015-09-08 17:28:42 +03:00
Ran Benita 7a15c0efcc doc/Doxyfile: only keep non-default values
Signed-off-by: Ran Benita <ran234@gmail.com>
2015-09-08 09:21:32 +03:00
Ran Benita 8c0d6c7960 doc/Doxyfile: sync with latest version
Signed-off-by: Ran Benita <ran234@gmail.com>
2015-09-08 09:17:16 +03:00
Ran Benita 13d232592e state: reduce scope of fake action
Also rename to "dummy" as I think it is a nicer name.

Signed-off-by: Ran Benita <ran234@gmail.com>
2015-09-07 14:45:09 +03:00
Ran Benita 6ee503261b Merge pull request #27 from nuko8/osx_test_progs
Modifications to make 'make check' test complete for Mac OS X
2015-08-28 14:20:20 +03:00
Kazunobu Kuriyama 3c12d671cc bench: Modify benchmarks for a wider range of platforms
- Add the new files bench.c and bench.h to implement a timer module.
 - Implement the module with clock_gettime(), mach_absolute_time(), or
   gettimeofday(), depending on a given platform.
 - Replace the time measurement code of the benchmark programs with the
   functions of the module.
2015-08-28 20:02:26 +09:00
Kazunobu Kuriyama 91a19905b3 test/x11comp: Fix contention between X11 and Xvfb on Mac OS X
- Abandon use of -displayfd.
 - Have x11comp itself look for an unused X11 display number instead.
2015-08-28 19:37:09 +09:00
Ran Benita 74f85d0540 test/x11comp: remove duplicate FOUR_LEVEL_KEYPAD from test keymap
The `test/data/keymaps/host.xkb` file contains a duplicate definition of
this type. On my computer (linux, xkbcomp 1.3.0, xserver 1.17.2), the
test passes as is, but if I remove the duplicate definition, the
roundtrip brings it back and the test fails. I can also reproduce it
without relation to the test, by loading `test/data/keymaps/host.xkb`
(without the duplicate) using

    xkbcomp -I $(pwd)/test/data/keymaps/host.xkb $DISPLAY

and downloading it again using

    xkbcomp $DISPLAY out.xkb

the duplicate is added. On Mac OS X however, the duplicate is removed
(correctly), so the test fails there.

xkbcommon itself, which was forked from xkbcomp, doesn't have this bug;
in fact, doing

    ./test/print-compiled-keymap -k keymaps/host.xkb

removes the duplicate if it is present.

This is (probably) a regression in xkbcomp or xserver compared to the
versions used in Mac OS X. Since getting a patch for any of these two is
hopeless from my experience, I did not try to investigate further.

I am not sure why, but if I also add a `PC_SUPER_LEVEL2` type, the
duplicate of `FOUR_LEVEL_KEYPAD` doesn't show up. Hopefully the test
will work on all platforms now.

https://github.com/xkbcommon/libxkbcommon/issues/26

Reported-by: @nuko8
Signed-off-by: Ran Benita <ran234@gmail.com>
2015-08-23 23:16:37 +03:00
Ran Benita bdf6880364 test/x11comp: small simplifications
xkbcomp doesn't need the search-path argument, since we pass an absolute
path. Keep the plain -I which clears the search path just to be sure.

Signed-off-by: Ran Benita <ran234@gmail.com>
2015-08-23 23:16:23 +03:00
Ran Benita afbe21a2ef Merge pull request #25 from mvo5/master
Add XKB_CONFIG_ROOT environment
2015-07-20 11:46:15 +03:00
Michael Vogt 7ea129fbfb Add XKB_CONFIG_ROOT environment
The XKB_CONFIG_ROOT environment allows overrding the build time
DFLT_XKB_CONFIG_ROOT path.
2015-07-20 10:31:02 +02:00
Ran Benita 257e38c821 build: don't fail if linker version scripts are not supported
Some platforms (such as OSX) do not support version scripts. In these
platforms the symbols will not be versioned, but it is OK to omit them.

https://github.com/xkbcommon/libxkbcommon/issues/24
2015-07-17 23:26:20 +03:00
Ran Benita 8e1fed6c68 compose: correctly parse modifier syntax
As described in:
http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=ddf3b09bb262d01b56fbaade421ac85b0e60a69f

Signed-off-by: Ran Benita <ran234@gmail.com>
2015-03-24 16:49:47 +02:00
Daniel Stone c8c41c0160 rename to LICENSE
GitHub uses 'LICENSE' to scrape for repository license information, cf.
https://github.com/blog/1964-open-source-license-usage-on-github-com

Rename to make it a bit easier for it.
2015-03-10 12:20:01 +00:00
Ran Benita b0450847ff doc: some editorial changes to compose documentation
Use nicer Markdown syntax, `surround` some words, fix some typos.

Signed-off-by: Ran Benita <ran234@gmail.com>
2015-02-19 17:03:06 +02:00
Ran Benita 74482de623 test/common: print keycode in decimal not hex
Keycodes are usually written in decimal, so hex is hard to compare.

Signed-off-by: Ran Benita <ran234@gmail.com>
2015-02-03 21:47:08 +02:00
Ran Benita ca58937da3 configure.ac: also print ${datarootdir} in summary
It goes something like:

    ${XLOCALEDIR} ->
    ${datarootdir}/locale/X11 ->
    ${prefix}/share/locale/X11 ->
    /usr/share/locale/X11

But AC_MSG_RESULT only performs one substitution. Instead of starting to
expand this stuff manually, just print datarootdir so all the pieces are
there.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-24 23:40:24 +03:00
Ran Benita dc275a289f PACKAGING: fix confusing typo
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-24 23:06:07 +03:00
Ran Benita 508fbcd167 doc: explain the envvars which affect compose
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-24 23:03:41 +03:00
Ran Benita 9162017947 keycodes: use correct printf format
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-23 21:03:13 +03:00
Ran Benita c03834a1c6 Reduce variable scopes
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-23 21:00:20 +03:00
Ran Benita 5e3615b246 ast-build: remove log message about allocation failure
We don't do so anywhere else, so until we have something comprehensive,
let's not so here.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 20:04:57 +03:00
Ran Benita 4a660d7f86 xkbcomp: remove file->topName
It is useless.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 19:47:19 +03:00
Ran Benita 96a29ede77 xkbcomp/keymap: remove useless free()
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 19:22:56 +03:00
Ran Benita c43c3c866e Bump version to 0.5.0
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 16:41:59 +03:00
Ran Benita 60104e7955 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 16:41:36 +03:00
Ran Benita b92f792409 Change initial symbol file versions to V_0.5.0
It will be quite confusing to use V_0.4.3 since this was already
released without symbol versioning.

Hopefully this doesn't cause any trouble for people who are using -git.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 16:40:59 +03:00
Ran Benita 47bb9fd137 compose: fill @since TBD
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 16:40:59 +03:00
Ran Benita aa41d88334 doc/compat.md: add compose incompatibilities
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 16:03:41 +03:00
Ran Benita 413954aa44 Add PACKAGING file
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 15:51:41 +03:00
Ran Benita 047d06122e Makefile.am: add symbol files to EXTRA_DIST
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 15:07:37 +03:00
Ran Benita 6337d789e6 README: we also accepts patches through github
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 15:06:16 +03:00
Ran Benita 0419f6e783 docs: make html output have a fixed width, hide footer
It's hard to read text which stretches indefinitely.

The footer is not adding much.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 15:06:16 +03:00
Ran Benita b05a05edbd README: add notes about Compose support
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 15:05:30 +03:00
Ran Benita 49dc91cedb doc/quick-guide: some improvements
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 15:05:30 +03:00
Ran Benita bac0c323b6 README: remove elaborate details from the intro
Point to the "quick guide" instead.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 15:05:30 +03:00
Ran Benita ab9cb11c91 doc/compat.md: we don't support more groups or mods yet
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 15:05:30 +03:00
Ran Benita 494a8fbf3f README: move compatibility notes to their own page
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 15:05:30 +03:00
Ran Benita 2e8ab38351 README: link to online API docs
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 14:12:45 +03:00
Ran Benita cb46189335 README: move note about xkeyboard-config to its own section
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 13:34:15 +03:00
Ran Benita 8bf1e193fc README: remove section on API stability
This was useful when we *weren't* stable. But now that we are this
should be obvious.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 13:31:32 +03:00
Ran Benita f774f819d6 Replace some strncmp's with memcmp
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 13:23:53 +03:00
Ran Benita a4cc119bf5 compose/parser: save len in keysym_from_name cache
This reduces a lot of strcmp's, and allows to use a faster memcmp.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-18 13:05:18 +03:00
Ran Benita a0d2b02976 test/keyseq: test 'map[None] = Level2;' scenario
See previous commit for an explanation.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-17 01:19:22 +03:00
Ran Benita 312182ce7d test/data: add files for model=applealu_ansi layout=us
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-17 01:19:03 +03:00
Ran Benita c6ee6371b5 test/data: sync to xkeyboard-config 2.13
(Run ./test/data/sync.sh).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-17 01:19:03 +03:00
Ran Benita 30e7445d84 state: correctly infer inactive type entries
The current test is incorrect, since 'map[None]' is entirely valid. In
most cases this doesn't cause any problems, since the default fallback
is Level1, and it's almost always 'map[None] = Level1' anyway. But in
one case in xkeyboard-config it isn't, in types/numpad(mac):

    type "KEYPAD" {
        modifiers = None;
        map[None] = Level2;
        level_name[Level2] = "Number";
    };

So before checking if no modifiers were mapped, make sure there *were*
any modifiers at all.

https://bugs.freedesktop.org/show_bug.cgi?id=85092

Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-17 01:17:59 +03:00
Ran Benita a4c667adf2 symbols: don't warn about conflicting syms if they are the same
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-17 01:17:14 +03:00
Ran Benita 2e5530ad20 parser: bring back warning about includes of files with no default
Using the same format as xkbcomp.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-17 01:17:14 +03:00
Ran Benita 57ad452b55 Merge pull request #14 from jasperla/undefined
disable -Wl,--no-undefined on OpenBSD for it doesn't have DT_NEEDED for libc
2014-10-16 13:11:26 +03:00
Jasper Lievisse Adriaanse dff65c0c70 disable -Wl,--no-undefined on OpenBSD for it doesn't have DT_NEEDED for libc 2014-10-16 11:35:18 +02:00
Ran Benita 1595f2b742 Merge pull request #13 from jasperla/librt
Make librt optional, required for at least OpenBSD
2014-10-15 22:38:17 +03:00
Jasper Lievisse Adriaanse 3e169c4726 Make librt optional, required for at least OpenBSD 2014-10-15 21:08:17 +02:00
Ran Benita c42b864654 test/compose: test include statement
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-14 11:47:25 +03:00
Ran Benita 3f489730d3 test/compose: test modifier syntax
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-14 11:36:00 +03:00
Ran Benita c6e63fd71c compose/parser: fix parsing of multiple modifiers
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-14 11:28:57 +03:00
Ran Benita d1c5dd14e0 compose/parser: parse (! mods) properly
We don't actually do anything with them. But if someone uses them we can
at least not choke.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-13 18:56:57 +03:00
Ran Benita 3c0c3afa09 compose/parser: resolve keysyms in parser instead of scanner
It will become context-sensitive.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-13 18:56:50 +03:00
Ran Benita 0b99c63cf4 compose/parser: use parameter as intended
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-13 18:54:58 +03:00
Ran Benita 8bba4b34ec compose/parser: one more skip_to_eol()
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-13 18:54:52 +03:00
Ran Benita a3116f97d0 compose/parser: fix segfault when including
The keysym cache for the new scanner was not initialized.
To avoid such errors also in the future, require passing the priv
argument in scanner_init(), instead of initializing it separately.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-13 18:54:52 +03:00
Ran Benita 65c355aa7a COPYING: add copyright notice from libX11:modules/im/ximcp/imLcPrs.c
We have used some portions of it, so add the notice.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-13 18:54:52 +03:00
Ran Benita 8a0acf2c67 scanner-utils: optimize one-line comments
Compose files have a lot of those.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-08 00:03:34 +03:00
Ran Benita 8d58e250b0 bench/compose: add new benchmark
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-05 12:56:46 +03:00
Ran Benita 5cefa5c5d0 test/interactive-evdev: add compose support
To try, do e.g.:
sudo ./test/interactive-evdev -l us -v intl -o compose:ralt -d

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-05 12:56:46 +03:00
Ran Benita 10a7a2bd69 test/compose: add new test
Some results from the benchmark (compilation of en_US.UTF-8/Compose):

$ grep 'model name' /proc/cpuinfo
model name  : Intel(R) Core(TM)2 Duo CPU     E8400  @ 3.00GHz
model name  : Intel(R) Core(TM)2 Duo CPU     E8400  @ 3.00GHz

$ uname -a
Linux ran 3.16.1-1-ARCH #1 SMP PREEMPT Thu Aug 14 07:40:19 CEST 2014 x86_64 GNU/Linux

$ ./test/compose bench
compiled 1000 compose tables in 7.776488331s

So according to the above benchmark and valgrind --tool=massif, an
xkb_compose_table adds an overhead of about ~8ms time and ~130KB
resident memory.
For contrast, a plain US keymap adds an overhead of ~3ms time and 90KB
resident memory.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-05 12:56:46 +03:00
Ran Benita edc98b5403 compose: add xkbcommon-compose - implementation
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-05 12:56:46 +03:00
Ran Benita 046c802e96 compose: add xkbcommon-compose - API
xkbcommon-compose is a Compose implementation for xkbcommon. It mostly
behaves like libX11's Compose, but the support is somewhat low-level and
is not transparent like in libX11. The user must add some supporting code
in order to utilize it.

The intended audience are users who use xkbcommon but not a full-blown
input method. With this they can add Compose support in a straightforward
manner, so they have a fairly complete keyboard input for Latin-like
languages at least.

See the header documentation for details.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-03 00:15:39 +03:00
Ran Benita 29a1a78008 scanner-utils: add priv member
For when a user of the scanner wants to pass something along with it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-03 00:15:39 +03:00
Ran Benita e8b112325c darray: add darray_shrink()
If we have a big array which can be finalized, on average we can give
back 1/4 of its size, which the allocator might be able to use.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-03 00:15:39 +03:00
Ran Benita b3f2396588 keysym: add function to test if a keysym is for a modifier
Needed for compose.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-03 00:15:36 +03:00
Ran Benita 94a8e01c52 scanner-utils: add helper for appending an entire string
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-02 22:21:06 +03:00
Ran Benita 8eb024d589 scanner-utils: add helper for hex string escape
Like the already existing oct.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-02 22:21:06 +03:00
Ran Benita bc3b4c084a Move benchmarks from tests to their own files in bench/
The tests only contain tests, and the benchmarks are more visible.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-02 22:03:28 +03:00
Ran Benita fd126551ed build: don't rebuild everything for libtest.la
We added a -fvisibilty=default to the libtest.la CFLAGS. When automake
sees that the CFLAGS are different from those of libxkbcommon.la, it
figures it should recompile all of the $(libxkbcommon_la_SOURCES),
instead of reusing the already-compiled object files.

But actually, the convenience library is not a shared object, it's just
used as an archive, thus the -fvisibility is entirely pointless. So
avoid the recompilations by just removing it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-02 21:24:29 +03:00
Ran Benita 4ed68120de scanner-utils: optimize str()/lit()
Replace the dog-slow unneeded strncasecmp() with an inlineable memcmp().

Before:
compiled 2500 keymaps in 8.348715629s

After:
compiled 2500 keymaps in 7.872640338s

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-10-01 19:24:36 +03:00
Ran Benita 725ae134d4 keymap: rename XkbKeyGroupWidth to XkbKeyNumLevels
The "width" terminology comes from the group*width+level layout of the
keysyms in a key, as used in the old implementations. We don't keep all
the keysyms of a key in one array so change it to a more accurate name.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-25 22:01:17 +03:00
Ran Benita 2c259f1782 symbols: improve FindKeyForSymbol()
A bit more involved, but can short circuit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-25 21:55:52 +03:00
Ran Benita 485b736f17 symbols: use correct max value
xkb_level_index_t was initially uint16_t, now it's 32.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-25 21:26:26 +03:00
Ran Benita 9c088df3b3 doc: disable alphabetical data structure index
It is useless - we have very little data structures.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-22 15:46:13 +03:00
Ran Benita 805ed4e71b doc: disable BRIEF_MEMBER_DESC
It's easier to quickly go through the functions in a module this way.
The names provide enough "brief description" to get someone to click for
the full description.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-22 15:31:51 +03:00
Ran Benita 08d05799dd doc: disable tree view
It is redundant with the header navigation.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-22 15:27:13 +03:00
Ran Benita 0b448548a8 doc: linkify some references
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-22 15:24:15 +03:00
Ran Benita f088d23f1e x11, doc: add note about Key{Press,Release}->state field
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-22 11:54:04 +03:00
Ran Benita 7831fe2198 x11, doc: add note about per-client flags like detectable autorepeat
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-22 11:54:04 +03:00
Ran Benita 68962aa1f9 keymap-dump: combine modifier_map's with the same modifier
A bit less efficient, but makes for shorter, nicer output.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-22 00:05:38 +03:00
Ran Benita 0224283fdf rules: fix mlvo-not-used warning
An mlvo can also be used in an expansion, but we didn't mark them in
this case in commit d8a4f52cb9. This caused wrongful warnings on
something like -l ch -v fr -- the `fr` is only added via expansion.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-21 17:09:58 +03:00
Ran Benita f0cd7abcff quick-guide: fix xkb_state_key_get_syms() example
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-21 00:59:11 +03:00
Ran Benita 51ae4a172a quick-guide: fix Java-esque array syntax
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-21 00:56:33 +03:00
Ran Benita d8a4f52cb9 rules: warn when an RMLVO component isn't used
Due to wildcard matches in the rules file, this is only really useful
for misspelled or missing options, e.g.

$ ./test/rmlvo-to-kccgst -o comprose:ralt > /dev/null
xkbcommon: ERROR: Unrecognized RMLVO option "comprose:ralt" was ignored

Although it is more of a warning, it indicates a misconfiguration which
the user probably wants to see. Therefore the log level is ERROR.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-20 16:18:26 +03:00
Ran Benita d0c6fce24d parser: use "atom" instead of "sval" in yylval
"sval" is already used for "struct sval".

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-20 15:06:13 +03:00
Ran Benita 1ba7d9ecda doc: reorder "Keymap Components" functions
Put the general keymap stuff before key-specific functions.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-19 12:52:45 +03:00
Ran Benita 494e318946 doc: move consumed modifier description to its own section
With small edits.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-19 00:59:01 +03:00
Ran Benita 0aeb109518 doc: order the modules better
Explicitly specify the files in INPUT so that "X11 Support" appears
after the main modules.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-18 21:14:40 +03:00
Ran Benita c00df88577 x11, doc: fix typo
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-18 12:14:43 +03:00
Ran Benita ab4df099ca x11, doc: add overview
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-18 11:59:27 +03:00
Ran Benita 24846080db test/keyseq: add test
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-11 14:08:12 +03:00
Ran Benita 64fec8f31a configure.ac: add -Wdocumentation
It's supported by clang and warns about bad doxygen comments.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-11 12:15:31 +03:00
Ran Benita 5f8ccd18f6 doc: fix @param display for xkb_x11_setup_xkb_extension()
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-11 12:09:57 +03:00
Ran Benita 1054962d4c symbols: use darray_foreach_from for nicer loop
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-11 02:57:37 +03:00
Ran Benita f03dcf9fb6 Remove compatibility symbols
Remove the deprecated symbols that were used for ABI compatibility
during the transition period to the first stable version, 0.2.0.

The old *names* can still be used, programs which use the old names will
continue to work, as long as they were compiled against a stable
version (as they have been #defined to the new names from the start; see
xkbcommon/xkbcommon-compat.h). Namely, this will break binaries which:

1. Were compiled against a pre-stable version of libxkbcommon, and
2. Are linked against the next version of libxkbcommon, and
3. Expect to work.

This scenario is very unlikely, and will break in many other ways
anyway. Also, retaining support for these means including them in the
new symbol version file, which I would like to avoid.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-10 19:11:41 +03:00
Jan Engelhardt 5444f6a8ca build: use symbol versioning
Symbol versions provide a means by which ELF utilities can determine
whether a program is incompatible with a too-old library version so
that package management tools can autodetect version-based
dependencies and suggest upgrade paths.

[ran: swap xkbcommon.map and xkbcommon-x11.map]

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-10 18:52:13 +03:00
Ran Benita a931740cc7 keycodes: fix keymap compilation with no aliases and malloc(0)==NULL
If the keymap doesn't have any key-aliases (which is certainly
possible), the calloc(num_key_aliases, ...) is allowed to return NULL
according to the C standard, but this is not an error.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-10 13:44:33 +03:00
Ran Benita 7a87c202b7 ast-build: fix leak in error path
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-10 13:10:33 +03:00
Ran Benita ba98562909 test: make most tests portable by copying linux/input.h locally
There is really no reason to deny these tests from different platforms
only for a few #defines.

The only linux-only test (or test program, it is not run by make check)
is interactive-evdev, which actually uses evdev.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-06 11:29:15 +03:00
Pino Toscano e95fb475eb Remove <linux/input.h> include from test/x11comp.c
libxkbcommon 0.4.3 introduces a new test, x11comp, which does not build
on non-Linux OSes because of the unconditional <linux/input.h> include.

This seems not needed even on Linux, so attached there is a simple patch
to remove it.

https://bugs.freedesktop.org/show_bug.cgi?id=83551

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-06 11:11:13 +03:00
Ran Benita 00733da377 Merge pull request #11 from michaelforney/master
Fix typo in default-variant configure option
2014-09-02 01:12:18 +03:00
Michael Forney 76ae9fb948 Fix typo in default-variant configure option 2014-09-01 13:09:29 -07:00
Ran Benita fc95057c5f test/x11comp: don't hang if Xvfb is not available
If Xvfb is not present, posix_spawn still forks, but the child fails.
In that case, since we left the write fd of the pipe open in the parent,
we just kept waiting on the read() without noticing that the other side
is dead.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-09-01 17:20:40 +03:00
Ran Benita 527bf96f9b keymap: fix typo
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-24 10:16:41 +03:00
David Herrmann c62cde57f5 keymap: fix description of xkb_keymap_key_get_syms_by_level()
The @level argument is restricted by xkb_keymap_num_levels_for_key(). Fix
the description to no longer mention xkb_keymap_num_layouts_for_key().

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
2014-08-24 10:14:07 +03:00
Ran Benita 76016d5121 Bump version to 0.4.3
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-19 20:17:16 +03:00
Ran Benita 537c1700d6 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-19 20:17:16 +03:00
Ran Benita f3597f1b62 test/state: add test_update_mask() test
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-18 21:51:57 +03:00
Ran Benita a1f0595a68 state: make sure the mods are fully resolved after xkb_state_update_mask()
Virtual modifiers can have "mappings" to real modifiers, e.g. NumLock
may also set Mod2. In a normal turn of events, the various components
(depressed, latched, locked, and consequently effective) include the
mapped mods, because the masks are pre-resolved everywhere. However,
xkb_state_update_mask() accepts arbitrary mod masks, which may not be
resolved (if it comes from somewhere other than
xkb_state_serialize_mods()). So let's always resolve them ourselves.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-18 21:46:39 +03:00
Ran Benita 99184f1614 Make the effective mod mask calculation available to other files
We will want to use that function in state.c as well.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-18 20:26:19 +03:00
Ran Benita 80ae8e61ff state: no need for loop in xkb_state_update_mask()
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-18 20:08:53 +03:00
Ran Benita a95c4e83e4 test/x11comp: server writes \n to displayfd
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-18 19:47:10 +03:00
Ran Benita 4df720b464 test/x11-keyseq: new test
It is like test/stringcomp, only instead of using
xkb_keymap_new_from_string(), it uses xkbcomp to upload the keymap to a
dummy Xvfb X server and then xkb_x11_keymap_new_from_device().

If any of these components are not present or fails, the test is shown
as skipped.

The test is messy, fragile, limited and depends on external tools, but I
will improve on that later -- it's better to have a test.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-09 22:57:24 +03:00
Ran Benita 56de0115e6 x11/keymap: handle private actions
Previously we treated them as NoAction().

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-09 22:42:45 +03:00
Ran Benita ead816e515 utils: add a STATIC_ASSERT macro
It'd be nicer to use C11's static_assert(), but it's easier to roll our
own C99 version using a trick I saw in xv6.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-09 22:42:45 +03:00
Ran Benita d38ff018b1 keymap: remove "flags" field of xkb_private_action
Private actions have no flags - only serialized data.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-09 22:42:45 +03:00
Ran Benita f00e779ab5 x11/keymap: be more defensive about the number of modifiers
There can be at most 16 vmods, and we rely on the facts that #vmods +
NUM_REAL_MODS (8) <= XKB_MAX_MODS (32) when accessing keymap->mods.mods.
But msb_pos() can potentially return up to #vmods = 32 if the server is
malicious, so we need to truncate it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-08 17:29:42 +03:00
Ran Benita 01753c0475 x11/keymap: don't forget to add the vmod offset in get_vmods
The first 8 modifiers in keymap->mods are the real modifiers; the virtual
 modifiers are then at slots 8-24. But XkbGetMap's virtualMods mask
starts the virtual modifiers at zero, so we need to add an offset (like
we do correctly in get_vmod_names()).

https://github.com/xkbcommon/libxkbcommon/issues/9

Reported-by: @rtcm
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-08-08 16:50:11 +03:00
Ran Benita 9db1432326 docs: move keysym-transformations page to a better position
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-28 18:04:34 +03:00
Ran Benita b629576266 docs: fix self-reference
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-28 10:03:48 +03:00
Ran Benita 5058620c88 interactive-evdev: don't use sysexits.h
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-27 16:36:11 +03:00
Ran Benita 40f109af56 ast-build: make sure InterpDef is freeable
With the following two rules:

    InterpretDecl   :       INTERPRET InterpretMatch OBRACE
                                VarDeclList
                            CBRACE SEMI
                            { $2->def = $4; $$ = $2; }
                    ;

    InterpretMatch  :       KeySym PLUS Expr
                            { $$ = InterpCreate($1, $3); }
                    |       KeySym
                            { $$ = InterpCreate($1, NULL); }
                    ;

And the fact that InterpCreate doesn't initialize ->def, if the
VarDeclList fails, the %destructor tries to recursively free the
uninitialized ->def VarDef. So always initialize it.

That was the only problematic code in the parser for %destructor (I'm
pretty sure).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-27 14:32:18 +03:00
Ran Benita 37cf20c906 parser: silence bison "unused value" warnings
Previous commit triggered these for some reason:

/home/ran/src/libxkbcommon/src/xkbcomp/parser.y:555.25-33: warning: unused value: $1 [-Wother]
 CoordList       :       CoordList COMMA Coord
                         ^^^^^^^^^

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-26 22:49:30 +03:00
Ran Benita 7ec00933c1 parser: don't leak AST nodes for discarded symbols
If the parser has symbols on the stack, and then enters an error, it
discards the symbols and fails. But their actions which allocate AST
nodes had already ran. So we must free these to avoid leaks.

We use %destructor declarations, see
http://www.gnu.org/software/bison/manual/html_node/Destructor-Decl.html

Note: byacc only supports %destructor when compiled with
--enable-btyacc. Also, it doesn't support using the parse-param in the
destructor. So we might revert this commit before the next release, or
forget about byacc.

https://github.com/xkbcommon/libxkbcommon/issues/8

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-26 22:46:01 +03:00
Ran Benita f5182bbd74 test: add file with a syntax error
We didn't really have any. It also a exposes a memory leak, since the
parser doesn't clean up the AST nodes of the discarded symbols.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-26 22:29:22 +03:00
Ran Benita 61fed8dab9 Replace darray_mem with a new darray_steal
That's a more declarative interface.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-26 00:19:34 +03:00
Ran Benita fbd9286036 ast-build: use cast instead of ->common
Missed in 1b2bb204e0.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-26 00:13:54 +03:00
Ran Benita 5f5b960c71 types: refactor CopyKeyTypesToKeymap
So it's OOM-safe and doesn't clobber keymap on failure.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-25 23:45:04 +03:00
Ran Benita 320e5ffaf1 keycodes: split CopyKeyInfoToKeymap to several functions
It's a bit easier to read and self-documenting. Also handles OOM better.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-07-25 23:45:04 +03:00
Ran Benita cb4bae714e parser: don't shadow "str"
It's a name of a function in scanner-utils.h and also of some
parameters.

https://bugs.freedesktop.org/show_bug.cgi?id=79898

Reported-by: Bryce Harrington <b.harrington@samsung.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-06-30 14:52:30 +03:00
Ran Benita 9c30d6da4e x11: don't iterate on empty batches
If count % SIZE == 0 we did a useless iteration where start==stop. It's
harmless but strange, so don't do that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-06-15 15:30:51 +03:00
Ran Benita 67d884ec14 Remove unnecessary !!(expressions)
_Bool already does that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-06-01 15:24:10 +03:00
Ran Benita d6f2d8ecd0 rules: fix leak on failure
matcher_match() builds up the kccgst's, and we steal the memory on
success. But on error we didn't free it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-05-28 20:36:58 +03:00
Ran Benita 76e1fca20a Bump version to 0.4.2
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-05-15 12:07:00 +03:00
Ran Benita 1aea81c273 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-05-15 12:06:46 +03:00
Ran Benita e3f751be66 x11: fix out-of-bounds access in adopt_atoms() error handling
Two problems:

- `j` can be >= `SIZE`, and needs to be wrapped like in the rest of the
   code.

- `cookies[j % SIZE]` is not initialized if there's no atom in `from[j]`.

The is manifested when:

- We've already gone through one batch (>= 128 atoms) (in fact this
  cannot happen in call to `adopt_atoms` in the current code).

- An XCB request failed in the middle of a batch.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-05-14 12:02:13 +03:00
Ran Benita 86cfef63ca ast-build: don't leak on OOM in BoolVarCreate
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-05-11 09:47:56 +03:00
Ran Benita 2e561c3f25 parser: show the keysym in "unrecognized keysym" messages
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-30 08:57:16 +03:00
Ran Benita 770f3e4bda doc: fix new doxygen version warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-25 01:21:09 +03:00
Ran Benita 67323f41a6 keycodes: fix uninitialized variable
Happened in one of the previous commits. For some reason, gcc doesn't
warn about this, but clang does...

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-25 01:14:31 +03:00
Ran Benita 07fb6a6c19 xkbcomp: don't align enum values
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-22 18:19:01 +03:00
Ran Benita 28a22ba226 xkbcomp: use straight assignment instead of CopyModSet
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-22 18:11:16 +03:00
Ran Benita 9014cf8cd8 keymap, keycodes, compat: don't use darray for LEDs
Use a static array of size XKB_MAX_LEDS instead, as in xkb_mod_set.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-22 14:58:42 +03:00
Ran Benita 787faf3665 keymap: don't use darray in xkb_mod_set
Instead just statically allocate the mods array (of size MAX_MOD_SIZE =
32). The limit is not going anywhere, and static allocations are nicer
(nicer code, no OOM, etc.). It's also small and dense enough.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-22 14:56:44 +03:00
Ran Benita 6b1cdee107 keymap: add and use xkb_mods_{foreach,enumerate}()
To iterate over an xkb_mod_set. Slightly nicer interface and makes
transitioning from darray easier.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-22 14:56:01 +03:00
Ran Benita 0f6bca2b37 keymap: rename xkb_foreach_key to xkb_keys_foreach
We'll use the format xkb_foos_foreach and xkb_foos_enumerate for the
various iterators.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-22 14:56:01 +03:00
Ran Benita 9b1a68eca9 keymap: protect xkb_foreach_key macro params
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-22 14:56:01 +03:00
Ran Benita decb291553 darray: remove unused darray_foreach_reverse()
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-22 14:56:01 +03:00
Ran Benita 00f084b6ec utils: detect overflow in memdup()
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-22 14:56:01 +03:00
Ran Benita 95aabeecb1 symbols: use xkb_mod_set instead of entire keymap
The keymap is not removed entirely from the Info (just constified),
since it is still needed in AddKeySymbols() for looking up aliases. This
dependency will be removed in the future.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 17:07:34 +03:00
Ran Benita f2cbeda9f0 types: use xkb_mod_set instead of entire keymap
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 16:23:48 +03:00
Ran Benita bf2878d227 compat: use xkb_mod_set instead of entire keymap
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 16:23:48 +03:00
Ran Benita b5655b3d67 vmod: take xkb_mod_set instead of the entire keymap
This is the only place where the modifier information is modified. We
will make it local to a given XKB file (after which it will be merged
into the keymap). Currently it changes the keymap directly, which
sidesteps the abstraction and leaves side-effects even if the XkbFile's
compilation fails.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 16:23:48 +03:00
Ran Benita 0b7c8d6198 action: take xkb_mod_set instead of the entire keymap
A couple of modiifer actions need this information, but not the entire
keymap.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 16:23:48 +03:00
Ran Benita 9fbcf6bb18 expr: take xkb_mod_set instead of the entire keymap
The modifier-resolving functions only need the modifier information.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 16:23:46 +03:00
Ran Benita edc0aef57d text: take xkb_mod_set instead of the entire keymap
The modifier printing functions only need the modifier information, they
don't care about keys or leds, etc.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 16:23:04 +03:00
Ran Benita ca3170ad38 Add struct xkb_mod_set
The only thing that the compilation phase needs the keymap for currently
is for access to the modifier information (it also modifies it in
place!). We want to only pass along the neccessary information, to make
it more tractable and testable, so instead of passing the entire keymap
we add a new 'mod_set' object and pass a (const) reference to that.
The new object is just the old array of 'struct xkb_mod'.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 16:20:09 +03:00
Ran Benita 3d7aff5fcd keymap: rename wrap_group_into_range -> XkbWrapGroupIntoRange
It better fits with the naming convention in keymap.h.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 16:15:05 +03:00
Ran Benita 51a1df2f21 keymap: move ModNameToIndex from text.c and use it in keymap.c
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-19 16:12:26 +03:00
Ran Benita 120c5c317e symbols: separate ctx
Same as was done for compat and types.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-17 22:16:34 +03:00
Ran Benita 659eacc9fc compat: separate ctx
Same as was done for types.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-17 22:16:34 +03:00
Ran Benita 36cbecc5b5 types: separate ctx
Separate the ctx object to its own field in CompatInfo, instead of doing
keymap->ctx.

The compilation functions should not have direct access to the keymap;
instead they should process the files with their own independent state
(in the *Info structs) as much as possible, and only at the end should
they be copied (i.e. commited) to the keymap. If the compilation fails,
it leaves no by-products. It's also just good form.

This was seemingly the original author's intention, but I suppose he cut
a few corners (mostly with the handling of virtual modifiers, which are
threaded through types -> compat -> symbols).

This commit is the first step and may look artificial; however the
'keymap' field will be removed shortly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-16 23:19:49 +03:00
Ran Benita 999f3792ac action: convert a few missed unsigned -> enum xkb_action_type
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-16 23:19:49 +03:00
Ran Benita 9c8fcee195 expr: fix handling of unknown integer binary operator
We can't reach the default branch but at least make it do something
sensible.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-16 21:25:40 +03:00
Ran Benita 89fbf979f1 doc: explain keysym/string transformation
The documentation should be clear about what is happening, even if it's
rather unlikely anyone will really dig into the details.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-12 00:22:47 +03:00
Ran Benita da83e678ab doc: add @since annotations for API added since 0.3.0
And also add release dates to the NEWS.

We're adding API freely, so this can make life easier for anyone who
wants to stay compatible with an older version.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-11 19:09:48 +03:00
Ran Benita 3013633bbb Add .travis.yml file
This CI service https://travis-ci.org/ builds the project in several
configurations, runs the tests, and if something fails it sends an email.
Testing on some other systems is always good, and there don't seem to
be any drawbacks to this, so why not.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-04-06 17:20:04 +03:00
Ran Benita 99af72fd09 configure.ac: fix enable_x11 handling
Explicitly passing --enable-x11=yes would actually disable it.

Reported-by: Quentin Glidic
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-31 18:01:35 +03:00
Ran Benita b5b86b6e7a Bump version to 0.4.1
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-27 21:00:58 +02:00
Ran Benita b636987cf0 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-27 21:00:58 +02:00
Ran Benita 240fa418fb build: trim down generated doxygen docs
Remove the huge verbatim copies of the header files.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-27 21:00:58 +02:00
Ran Benita 2a610ff411 build: add docs to EXTRA_DIST
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-27 20:37:43 +02:00
Ran Benita 5417440970 state: fix consumed modifier calculation
The current calculation is in short:
    entry ? (entry->mask & ~entry->preserve) : 0

This changes it be
    type->mask & ~(entry ? entry->preserve : 0)

This is what Xlib does. While less intuitive, it is actually more
correct, if you follow this deduction:

- The key group's type->mask defines which modifiers the key even cares
  about. The others are completely irrelevant (and in fact they are
  masked out from all sided in the level calculation). Example: NumLock
  for an alphabetic key.

- The type->mask, the mods which are not masked out, are *all* relevant
  (and in fact in the level calculation they must match *exactly* to the
  state). These mods affect which level is chosen for the key, whether
  they are active or not.

- Because the type->mask mods are all relevant, they must be considered
  as consumed by the calculation *even if they are not active*.

Therefore we use type->mask instead of entry->mask.

The second change is what happens when no entry is found: return 0 or
just take preserve to be 0? Let's consider an example, the basic type

    type "ALPHABETIC" {
        modifiers = Shift+Lock;
        map[Shift] = Level2;
        map[Lock] = Level2;
        level_name[Level1] = "Base";
        level_name[Level2] = "Caps";
    };

Suppose Shift+Lock is active - it doesn't match any entry, thus it gets
to level 0. The first interpretation would take them both to be
unconsumed, the second (new one) would take them both to be consumed.
This seems much better: Caps is active, and Shift disables it, they both
do something.

This change also fixes a pretty lousy bug (since 0.3.2), where Shift
appears to apparently *not* disable Caps. What actually happens is that
Caps is not consumed (see above) but active, thus the implicit
capitalization in get_one_sym() kicks in and capitalizes it anyway.

Reported-by: Davinder Pal Singh Bhamra
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-27 19:38:30 +02:00
Ran Benita 806dbeac81 Reformat README markdown
So that github displays it as markdown, and correctly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-27 17:11:49 +02:00
Ran Benita aa3e823642 doc: add a quick guide to the library
This is a nice intro to the documentation, and also preferably gently
pushes users to the "proper way" of using the library, which can be
confusing.

See also: http://fooishbar.org/tell-me-about/xkbcommon-intro/

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-27 17:11:48 +02:00
Ran Benita 3cfa7fdac8 state: apply control transformation on utf8/utf32 keysym strings
This is required by the specification:
http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
and clients expect this to happen.

https://bugs.freedesktop.org/show_bug.cgi?id=75892

Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-22 20:07:30 +02:00
Ran Benita b973d71e82 state: add xkb_state_key_get_{utf8,utf32}() API functions
These functions generally have the same effect as
xkb_state_key_get_syms() + xkb_keysym_to_utf{8,32}().

So why add them?

- They provide a slightly nicer interface, especially if the string is
  the only interest.

- It makes the handling of multiple-keysyms-to-utf8 transparent. For the
  designated use-case of multiple-keysyms (unicode combining
  characters), this is a must. We also validate the UTF-8, which the
  user might not otherwise do.

- We will need to apply some transformation on the resulting string
  which depend on the xkb_state. This is not possible with the
  xkb_keysym_* functions.

With these functions, the existing xkb_keysym_to_utf{8,32}() are not
expected to be used by a typical user; they are "raw" functions.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-22 17:17:16 +02:00
Ran Benita 2bbaf7c7d1 Add utf8.{c,h} for common UTF-8 util functions
We need to validate some UTF-8, so this adds an is_valid_utf8()
function, which is probably pretty slow but should work correctly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-22 02:10:28 +02:00
Ran Benita f604314962 configure.ac: fix message when X11 support is disabled
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-21 19:54:30 +02:00
Ran Benita 3c14d23367 x11: relax XkbGetNames requirements
It is valid for a keymap to not have key aliases, group names and
various other things. But the current test requires all of them to be
present in the reply, which causes us the fail on such keymaps (as the
XQuartz one).

Instead, require only what we really need. The virtual-mods names may
not be strictly required, but it seems safer to leave it in for now.

https://bugs.freedesktop.org/show_bug.cgi?id=75798

Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-06 13:43:02 +02:00
Ran Benita fdb4de1f85 doc: extend xkb_rule_names default-value description
Especially a mention of the XKB_DEFAULT_* envvars was missing.

Reported-by: Paeglis Gatis <Gatis.Paeglis@digia.com> (thanks!)
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-04 19:30:09 +02:00
Ran Benita e086ba9416 doc: remove possibly confusing comment
There are valid reasons to use the other keymap-creation functions, if
one needs them. On the other hand, if one is supposed to use RMLVO, it
is more or less the only choice, so the comment is not needed in this
case as well.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-03-04 18:24:11 +02:00
Ran Benita 6adf17bd5a interactive-x11: beef up select_events a bit
- Specify in detail which parts of the events we care about. In theory
  the X server should not bother us with things we didn't ask for. In
  practice it still does, but oh well.

- Use the _aux version of select_events. This is the correct one to use,
  the non-aux version is useless.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-28 15:30:49 +02:00
Ran Benita d7c91a15f8 doc: add comments about update_key() and get_syms() order
I remember we had a comment about this, but I can't find it. So add it
again.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-28 14:50:48 +02:00
Ran Benita caf8f3be98 symbols, keycodes: fix int return type when bool is intended
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-22 23:45:52 +02:00
Ran Benita 09bcf0ffc0 symbols: cleanup SetSymbolsField
Normalize the style and error message levels.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-22 23:45:52 +02:00
Ran Benita 35dea49b0a symbols: fix possible use of uninitialized value
Nothing bad can come out of it, but for some reason this error didn't
return early (inherited from xkbcomp).
Also promote the log message to an error, as it clearly is.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-22 23:45:31 +02:00
Jasper St. Pierre 4fb7b06b0f state: Add xkb_state_key_get_consumed_mods
This retrieves the mask of consumed modifiers for a given key and state,
which is helpful for toolkits without having them to do it one modifier
at a time, or pass in 0xFFFFFFFF to xkb_state_remove_consumed_mods to
"reverse-engineer" the consumed mods.
2014-02-22 02:23:37 +02:00
Ran Benita 1fa7d6d3ab action: unify SetLatch and Lock handler functions
This is a little shorter and follows easier from the spec flag
description table.
Also a few were too permissive (like allowing LatchToLock in SetMods).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-16 18:39:31 +02:00
Ran Benita af75353a88 action: add a common CheckBooleanFlag function
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-16 11:05:34 +02:00
Ran Benita 18191702ae keymap: change action flag NO_ACCEL -> ACCEL
It's easier to deal with, but we need to set it as "factory default".

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-16 11:05:32 +02:00
Ran Benita af261cb605 action: fix SwitchScreen "same" field handling
This used to *unset* a flag called "SwitchApplication"; we changed the
flag to "same" but forgot to switch the cases.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-16 11:05:17 +02:00
Ran Benita 8d3db622b8 keymap-dump: add missing support for NoLock and NoUnlock flags
Based on a libxkbfile patch by Andreas Wettstein.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-15 23:50:21 +02:00
Ran Benita 11a9f76bf2 keymap-dump: don't print "affect=lock" in PtrLock
It's the same as no flags, so might as well not print it.
(In fact it is slightly harmful, because it actively *clears* the affect
flags, which might have been set in some other manner. But in practice
this cannot happen).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-15 23:31:54 +02:00
Ran Benita be27b60306 keymap-dump: unbreak some complex lines
It's very hard to read as-is. Apologies for those reading over a VT100.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-15 23:13:21 +02:00
Ran Benita b95df2a6cc expr: simplify ExprResolveButton
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-15 22:59:12 +02:00
Ran Benita efe2880e85 action: don't pass a keymap where a ctx is sufficient
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-15 22:47:57 +02:00
Ran Benita 3acea3b3bb action: add missing array_ndx checks
Only the "data" field can have them, and every other field needs to
error out if it appears. But some didn't check.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-15 22:47:57 +02:00
Ran Benita 477407f710 action: move array_ndx errors into the Check functions
Makes more sense and flows more nicely this way.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-15 22:47:57 +02:00
Ran Benita 7c5e79159b action: fix missing support for "affect" field
Support for setting this field was missing from the LockMods and
LockControls actions.

Based on a xkbcomp patch by Andreas Wettstein.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-15 21:48:31 +02:00
Ran Benita 1b2bb204e0 ast: cast to ParseCommon explictly instead of using ->common
Some tools were getting mighty confused with what we were doing.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-14 00:37:15 +02:00
Ran Benita 6248b09feb action: simplify Check* functions
Instead of using those t1 t2 variables, pass the final destinations
directly (while making sure they are not modified in case of error).

This also ensures the types are right, e.g. in CheckGroupField it should
be int32_t, not xkb_layout_index_t (and indeed it takes a negation!).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-14 00:37:13 +02:00
Ran Benita d3d55f1c4e darray: fix indentation
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-12 11:07:39 +02:00
Ran Benita 5bd273a724 vmod: bring back support for direct vmod -> real mod mapping
This brings back the functionality that was removed in
b9c87eb710. Though it is not used in
xkeyboard-config, from our current perspective it can be quite useful to
be able to set the mappings directly, thus sidestepping the ugly and
legacy-ridden modifier_map statement.

Here's an example of how to get rid of modifier_map statements (though
that would break core-X11 applications, since they must have the
mappings through keysyms):
    virtual_modifiers NumLock = Mod2;
    virtual_modifiers Alt = Mod1;
    // Would be nice to map these to Alt, but that would be
    // incompatible with xkbcomp and somewhat complicated
    virtual_modifiers LAlt = Mod1;
    virtual_modifiers RAlt = Mod1;
    virtual_modifiers LevelThree = Mod5;
    virtual_modifiers RControl = Control;
    virtual_modifiers LControl = Control;
    virtual_modifiers Super = Mod4;
    virtual_modifiers Meta = Mod1;
    virtual_modifiers Hyper = Mod4;
    virtual_modifiers AltGr = Mod5;
    virtual_modifiers LShift = Shift;
    virtual_modifiers RShift = Shift;

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-12 10:00:16 +02:00
Ran Benita aed3469474 build: small fixes and formatting of Makefile.am
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-11 17:44:11 +02:00
Ran Benita 9c48d3033a build: fix libtest AM_CLFLAGS typo
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-11 17:16:40 +02:00
Ran Benita e55a0cead1 Move src/xkbcomp/scanner-utils.h to src/
As we'll use it for things unrelated to xkbcomp.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-10 20:57:27 +02:00
Ran Benita 1aabc52235 build: fix configure test for yacc
It only works if 'bison' or 'byacc' are provided, but sometimes byacc
is installed as plain 'yacc'. The check fails for that.

I broke this in bdd8c11, restore Daniel's retrospectively clever check.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-10 20:50:58 +02:00
Ran Benita 28d5f7708c scanner: sort out scanner logging functions
First, make the rules and xkb scanners/parsers use the same logging
functions instead of rolling their own.

Second, use the gcc ##__VA_ARGS extension instead of dealing with C99
stupidity. I hope all relevant compilers support it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-10 20:33:34 +02:00
Ran Benita c4259ff268 rules: always %-expand kccgst values
Previously the early-exit codepath might have left some values
unexpanded, and we'd go looking for e.g "%l%(v)".

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-10 15:18:22 +02:00
Ran Benita 067c8c25c4 test/rmlvo-to-kccgst: use default RMLVO values in translation
The tool's supposed to display exactly the same results as the library
code.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-10 13:15:58 +02:00
Ran Benita 2ecc0f8316 context: add xkb_context_sanitize_rule_names()
We want all the default logic in a test, so encapsulate it in this
function, and make all the get_default_* functions static.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-10 13:15:58 +02:00
Ran Benita c11f05e064 rules: print full path in error messages
There can be multiple include paths. But it's nicer in any case.
This also makes scanner_error actually use log_err instead of log_warn -
oops.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-10 12:26:40 +02:00
Ran Benita 537564cb10 rules: include the path in failed-to-map error message
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-10 12:26:40 +02:00
Ran Benita 043eda874d context: fix wrong VARIANT instead of LAYOUT getenv
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-10 12:26:40 +02:00
Ran Benita 16aab829bb ast: remove unneeded 'ctx' param to XkbFileCreate
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-09 23:21:19 +02:00
Ran Benita 8be2608a26 x11: don't trust keycode before testing its range
The assert is not very useful access the key just before.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-09 18:02:11 +02:00
Ran Benita 27a245891b keymap: reduce padding in struct xkb_sym_interpret
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-09 17:49:30 +02:00
Ran Benita 71a2593162 symbols: steal keys and modmaps when merging if possible
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-09 17:20:32 +02:00
Ran Benita a7d753e45a compat: steal interps and leds when merging if possible
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-09 17:20:28 +02:00
Ran Benita 35cab168f7 types: steal types when merging if possible
Like we do everywhere else. Removes some unnecessary allocations and
copying.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-09 16:49:45 +02:00
Ran Benita 3923aa71c2 doc: move some file comments into txt files in doc/
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-09 14:09:44 +02:00
Ran Benita e89516e976 state: check wrap_group_into_range() return value
It returns XKB_LAYOUT_INVALID in case num_groups == 0. So we shouldn't
just save it in the state.
Note, though, that this condition is generally impossible.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-09 14:09:42 +02:00
Ran Benita d53eef0d94 x11: add 0 < ctrls->numGroups <= 4 assertion
This only happens if something is wrong in the server; a valid keymap
cannot be had in any case.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-09 14:05:59 +02:00
Ran Benita 032f8b67f5 Remove m4/.gitkeep
Now there's a file in there.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 22:44:59 +02:00
Ran Benita 3d56aa3e60 keysym: use safe keysym comparison function
Instead of thinking about signed <-> unsigned an whatnot.
bsearch() is inline in glibc, so gcc optimizes this away anyway.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 17:58:39 +02:00
Ran Benita 68b0309792 scanner: make line and column unsigned
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 17:22:14 +02:00
Ran Benita cf513f70a2 rules: get rid of struct location
Use the scanner token_{line,column} like we do in the other places.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 17:15:37 +02:00
Ran Benita 973b8fd47e api: deprecate XKB_MAP_COMPILE_PLACEHOLDER, and use KEYMAP instead of MAP
The PLACEHOLDER was not meant to be used, but c++ doesn't like passing 0
to enums, so it was used. For this reason we add all the NO_FLAGS items,
so the PLACEHOLDER shouldn't be used anymore.

Second, XKB_MAP is the prefix we used ages ago, KEYMAP is the expected
prefix here. So deprecate that as well.

The old names may still be used through the xkbcommon-compat.h header,
which is included by default (no need to include directly).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 16:40:20 +02:00
Ran Benita 8cc9434fd2 x11: make sure not to use compat header
src/keymap.h already defines the necessary header guard, so just reverse
the include order.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 16:38:18 +02:00
Ran Benita ac42103b0d x11: make some #defines unsigned
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 16:25:22 +02:00
Ran Benita 8fcb44b8a6 x11: fix truncation of xkb controls mask off the wire
It's uint32_t, not uint16_t, so we were losing flags (not that it
matters in this case).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 16:19:47 +02:00
Ran Benita f5465b56a3 x11: make msb_pos return unsigned
It was initially returning -1 for all-zero arguments, but now it returns
0.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 16:12:09 +02:00
Ran Benita a088c9ba77 keysym: fix types in bin_search
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 16:03:06 +02:00
Ran Benita 04bacf87ba state: optimize xkb_state_led_update_all()
Before:
    ran@ran:~/src/libxkbcommon$ ./test/bench-key-proc
    ran 20000000 iterations in 6.623018074s

After:
    ran@ran:~/src/libxkbcommon$ ./test/bench-key-proc
    ran 20000000 iterations in 4.762291091s

Not that anyone needs to process millions of keys per second...

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 15:57:22 +02:00
Ran Benita 769b91c580 Use (1u << idx) instead of (1 << idx) where appropriate
It doesn't matter (I think), since the implicit conversion doesn't have
any effect (e.g. sign-extension). But it's better to be aware of the
type.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 15:30:05 +02:00
Ran Benita 50b73ec0e7 Use unsigned int for saving darray_size return value
See: b9b3593cbd
So these should be unsigned int's now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 15:10:09 +02:00
Ran Benita e2c336cb96 action: fix misleading cast
The type is uint8_t and so is the checked range.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 15:06:28 +02:00
Ran Benita bbd2a9c048 action: fix printing of underflowed value in error message
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 15:05:05 +02:00
Ran Benita 27e2066229 scanner-utils: add some likely/unlikely annotations
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 12:42:17 +02:00
Ran Benita 10643d8aa4 Define likely()/unlikely() macros
It serves as nice "hotspot" annotations, and can also help things, so
why not.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 12:42:16 +02:00
Ran Benita 0e20cfed67 Partially revert "ast: pack the ParseCommon struct"
This reverts commit 1e6e5669c6.

It's probably safe, but let's not take any chances, as I don't have any
esoteric arch to test on. But keep the ATTR in case it's ever useful.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 02:02:32 +02:00
Ran Benita 8aa2202d9d build: add -Wextra warnings
If it gets annoying, we can disable it. But for now it's clean.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 01:51:38 +02:00
Ran Benita 6ea15719d1 ast: use more suitable types in a few ast nodes
The int ones cannot be signed (they come as such from the scanner, and
NEGATE is never applied to them).

The uint32_t one is really an atom, but presumably the type was never
converted to xkb_atom_t.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 01:50:22 +02:00
Ran Benita b9b3593cbd darray: use unsigned int instead of size_t for array size
size_t is too large; if we ever need it, that's the least of our
problems. Besides, when we roll our own (e.g. in keymap.h) it's already
unsigned int. Instead, add some emergency overflow check. So, why?

- It plays nicer with all the other uint32_t's and unsigned int's (no
  extensions, etc.).
- Reduces keymap memory usage by 5% or so as a bonus.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 01:50:22 +02:00
Ran Benita 94e0be0dc7 test/state: fix tautological test
test/state.c:376:5: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 00:54:53 +02:00
Ran Benita 623b10f8c5 Fix sign-compare warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 00:54:53 +02:00
Ran Benita 893f01301b symbols: reduce some loop iterators scope
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 00:19:12 +02:00
Ran Benita 5547a82f2a parser: fix unrecognized keysym handling
Integer may be negative, so also need to test >= 0.
Also, $$ was left uninitialized if the keysym wasn't recognized.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 00:11:44 +02:00
Ran Benita 5dbd136435 action: change xkb_pointer_button_action::button to uint8_t
In XkbPtrBtnAction it is unsigned char, don't know how it became signed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 00:11:42 +02:00
Ran Benita fa87cdb8bd darray: cleanup
We have quite diverged from the upstream file, so let's make it at least
easier to look at. Remove some unused macros and rename some for
consistency.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 00:10:56 +02:00
Ran Benita 6f2df7df8c ast: make symsMapIndex unsigned
It doesn't need to be signed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-08 00:10:56 +02:00
Ran Benita e9e3993221 action: Use ResolveInteger for PtrBtn.count, not ResolveButton
It's not a button.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-07 18:51:35 +02:00
Ran Benita e0137caceb action: check range of MovePtr X,Y values
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-07 18:48:16 +02:00
Ran Benita b82a0a8650 scanner: avoid strlen in keyword lookup, we know the len
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-07 18:12:29 +02:00
Ran Benita 2abff2a098 state: use the XKB_MOD_MASK constant
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-07 17:29:34 +02:00
Ran Benita ed18f7dde6 x11: add #actions == #syms check
This must always hold (but if there are no actions, #actions==0), and
explicitly ensures there won't be a division-by-zero a bit below.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-07 17:13:03 +02:00
Ran Benita 125bb19ede x11: add explicit cast in mods conversion
Explicit is better and all.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-07 17:11:49 +02:00
Ran Benita 623602cb78 test: don't print control characters in interactive tests
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-07 01:35:56 +02:00
Ran Benita 779eec3b8b x11: add missing #ifdef __cplusplus to header
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-04 22:18:12 +02:00
Ran Benita 109fe7059c Use secure_getenv when available
We probably don't want to get a privileged process to compile arbitrary
keymaps. So we should be careful about the envvars which control include
paths or default RMLVOs. But then secure_getenv is more sensible for
everything we do.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-04 02:53:05 +02:00
Ran Benita bdd8c113a5 build: some fixes in configure.ac
- Use 'test =' instead of 'test ==' in the x11 test. The second one
  might not work with e.g. dash, whoops.

- Use AS_IF instead of 'if'. It actually blends in better..

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-04 02:52:31 +02:00
Ran Benita be16858c92 Bump version to 0.4.0
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-02 12:13:26 +02:00
Ran Benita a15b4a5535 Update README
- Remove outdated information about API/ABI stability. If we ever break
  API or ABI, we'll do a major release. But currently everything is
  stable.

- Remove outdated warnings about internal symbols. You simply cannot
  access them...

- Briefly mention xkbcommon-x11 existence.

- Update git and bug URLs.

- Add myself as maintainer :)

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-02 12:08:43 +02:00
Ran Benita 87e0e47462 Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-02 12:05:35 +02:00
Ran Benita 70717c5686 build: add configure summary
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-02 11:21:18 +02:00
Ran Benita 2f93c78894 x11: add a couple of tests
Add two tests:

    ./test/interactive-x11
which is like test/interactive-evdev, but should behave exactly like your
X keyboard and react to state and keymap changes - in other words, just
like typing in xterm. Press ESC to exit.

    ./test/x11
which currently should only print out the same keymap as
    xkbcomp $DISPLAY out.xkb
(modulo some whitespace and some constructs we do not support.)

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-02 11:16:40 +02:00
Ran Benita eb34825560 x11: add XKB protocol keymap and state creation support
These are function to create an xkb_keymap directly from XKB requests
to the X server. This opens up the possibility for X clients to use
xcb + xcb-xkb + xkbcommon as a proper replacement for Xlib + xkbfile for
keyboard support.

The X11 support must be enabled with --enable-x11 for now.
The functions are in xkbcommon/xkbcommon-x11.h. It depends on a recent
libxcb with xkb enabled. The functions are in a new libxkbcommon-x11.so,
with a new pkg-config file, etc. so that the packages may be split, and
libxkbcommon.so itself remains dependency-free.

Why not just use the RMLVO that the server puts in the _XKB_RULES_NAMES
property? This does not account for custom keymaps, on-the-fly keymap
modifications, remote clients, etc., so is not a proper solution in
practice. Also, some servers don't even set it. Now, the client just
needs to recreate the keymap in response to a change in the server's
keymap (as Xlib clients do with XRefreshKeyboardMapping() and friends).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-02-02 11:16:40 +02:00
Ran Benita ddbefda383 build: error out on undefined symbols
This helps ensure we don't ship a library with undefined symbols, which
can easily happen with multiple inter-dependent DSOs.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-13 18:24:24 +02:00
Ran Benita a9c56f643d context: split private functions to context-priv.c
(Same as keymap-priv.c).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-13 17:22:15 +02:00
Ran Benita 7210497c63 keymap: split private functions to keymap-priv.c
This makes it easier to share the private functions in other DSOs
without relying (too much) on dead code elimination, exported symbols,
etc.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-13 17:22:02 +02:00
Ran Benita 4884a8e636 keymap: move XkbEscapeMapName() to keymap.c.
So we can use it outside src/xkbcomp; it is not really specific to it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-13 17:21:56 +02:00
Ran Benita d63e0ab838 test: rename test/interactive to interactive-evdev
And share the key-printing functions. In preparation for adding more
interactive-* variants.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-13 17:21:56 +02:00
Ran Benita 917c751523 context: remove mostly useless log wrappers
Just use xkb_log directly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-12 14:37:39 +02:00
Ran Benita 101720a2bc parser: shutup some 'may be used uninitialized' warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-12 13:18:39 +02:00
Ran Benita bbc69b6342 action, types: remove unused Report functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-12 11:26:16 +02:00
Hardening e77712bd27 Add a constant for NumLock
This trivial patch adds the name of the Numlock modifier
2014-01-11 17:29:02 +02:00
Ran Benita 4841ea0c29 test/state: fix some *_{is,are}_active() tests
These functions also return -1 on invalid input. The original tests
didn't check that, but used !tests instead. Since then we've changed
them, but some were missed, and for some we forgot to remove the ! (or
you can say they were extra clever).

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-11 17:01:39 +02:00
Ran Benita 31430670df Fix some cppcheck warnings
Someone was nice enough to run this for us:

ftp://ftp.sunet.se/pub/Linux/distributions/Debian/debian/pool/main/libx/libxkbcommon/libxkbcommon_0.3.1.orig.tar.gz
[libxkbcommon-0.3.1/src/keymap.c:86]: (style) The scope of the variable 'j' can be reduced.
[libxkbcommon-0.3.1/src/keymap.c:87]: (style) The scope of the variable 'key' can be reduced.
[libxkbcommon-0.3.1/src/keysym-utf.c:843]: (style) The scope of the variable 'mid' can be reduced.
[libxkbcommon-0.3.1/src/state.c:992]: (style) The scope of the variable 'str' can be reduced.
[libxkbcommon-0.3.1/src/xkbcomp/action.c:467]: (style) The scope of the variable 'absolute' can be reduced.
[libxkbcommon-0.3.1/src/xkbcomp/rules.c:468]: (style) The scope of the variable 'consumed' can be reduced.
[libxkbcommon-0.3.1/src/xkbcomp/rules.c:862]: (style) The scope of the variable 'mlvo' can be reduced.
[libxkbcommon-0.3.1/src/xkbcomp/rules.c:863]: (style) The scope of the variable 'kccgst' can be reduced.
[libxkbcommon-0.3.1/src/xkbcomp/rules.c:865]: (style) The scope of the variable 'match_type' can be reduced.
[libxkbcommon-0.3.1/src/xkbcomp/symbols.c:753]: (style) The scope of the variable 'toAct' can be reduced.
[libxkbcommon-0.3.1/src/xkbcomp/symbols.c:1573]: (style) The scope of the variable 'key' can be reduced.
[libxkbcommon-0.3.1/test/common.c:80]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.
[libxkbcommon-0.3.1/test/interactive.c:358]: (style) The scope of the variable 'nevs' can be reduced.
[libxkbcommon-0.3.1/test/interactive.c:236]: (style) Checking if unsigned variable 'nsyms' is less than zero.
[libxkbcommon-0.3.1/test/interactive.c:226]: (style) Unused variable: unicode

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-11 17:01:39 +02:00
Ran Benita 1d5ae2263a makekeys: mark keysym_names as static
Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-11 00:26:58 +02:00
Ran Benita 51c9f8e24d keysym: clarify slightly confusing comparison functions
Make it clear what the search key type and array types are.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-02 01:19:25 +02:00
Jasper St. Pierre 0628b9b2b3 makekeys: Add a gcc pragma to ignore -Woverlength-strings 2014-01-01 13:03:33 -05:00
Jasper St. Pierre eef3ab2364 makekeys: Put a comment describing the origin of the file 2014-01-01 13:03:32 -05:00
Jasper St. Pierre 68c61e7f7d ks_tables: Put all keysym names in one giant block
This makes the file take two segments instead of potentially many, causing
relocation issues.
2014-01-01 13:03:29 -05:00
Jasper St. Pierre 938a2c379b makekeys: Move all of the table generation to Python
This makes it easier to run the Python script manually.
2014-01-01 13:01:18 -05:00
Jasper St. Pierre 870913c234 makekeys: Remove some semis
Python doesn't have these
2014-01-01 13:01:18 -05:00
Ran Benita 53e7a135c2 keysyms: add German T3 layout keysyms from xproto
Reference:
http://cgit.freedesktop.org/xorg/proto/xproto/commit/?id=6d4acb0e3a6568a8faaa651d4e3d32f917b9067b

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-01 10:40:09 +02:00
Ran Benita e18e760846 keysym: fix search for lexicographically larger strings
Probably a copy/paste error from a few lines above.

Signed-off-by: Ran Benita <ran234@gmail.com>
2014-01-01 10:38:14 +02:00
Ran Benita 1e6e5669c6 ast: pack the ParseCommon struct
This shows a measurable improvement in memory and performance for free,
on 64bit at least. Packing is (or should be) safe in this case.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-14 17:47:12 +02:00
Ran Benita 9a3c115be0 atom: don't malloc every node separately
Instead of having a darray of pointers to malloc'ed atom_node's, make it
a darray of atom_node's directly.

This makes the code a bit simpler, saves on some malloc's, and the
memory gain/loss even out.

Unfortunately, we are no longer Three Star Programmers ;(
http://c2.com/cgi/wiki?ThreeStarProgrammer

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-02 17:41:49 +02:00
Ran Benita b246edc688 test/atom: add test for atom table
Mostly a random test.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-02 15:13:59 +02:00
Ran Benita 1374b50ed7 atom: tiny style fixes
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-02 14:26:37 +02:00
Ran Benita 048ee7031d atom: allow passing NULLs to find_node_pointer()
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-02 14:26:37 +02:00
Ran Benita d873693ba6 atom: allow interning empty string
Which is different than XKB_ATOM_NONE, as in "" != NULL.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-02 14:15:58 +02:00
Ran Benita 58345f4e9c atom: drop {xkb_,}atom_strdup
Even though in 112cccb18a I said it might
be useful, it's not. So remove it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-02 14:14:41 +02:00
Ran Benita b63fa3b1e7 expr: make Expr creation naming and file location consistent
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-01 13:32:51 +02:00
Ran Benita 07334f4db6 expr: add wrapper macro for ExprCreate
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-01 13:29:30 +02:00
Ran Benita 972395b856 expr: split expression types and allocate them separately
Currently, we have one ExprDef type, which contains a tagged union with
the value of all expression types. Turns out, this union is quite
wasteful memory-wise. Instead, create separate types for all expressions
(e.g ExprBinary, ExprInteger) which embed the common fields
(ExprCommon), and malloc them per their size; ExprDef then becomes a
union of all these types, but is just used as a generic pointer.

[Instead of making ExprDef a union, another option is to use
ExprCommon as the generic pointer type and then do up-castings, like we
do with ParseCommon. But this makes the code much uglier.]

The diff is mostly straightforward mechanical adaptations. It could have
been much smaller with the help of C11 anonymous structs (which were
previously a gnu extension). This will have saved all of the 'op' ->
'expr->op', etc changes. But if we can be a bit more portable for a
little effort, we should.

Before (./test/rulescomp, x86 32 bit, -O2):
==12974==   total heap usage: 145,217 allocs, 145,217 frees, 10,476,238 bytes allocated

After:
==11145==   total heap usage: 145,217 allocs, 145,217 frees, 8,270,358 bytes allocated

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-01 12:58:01 +02:00
Ran Benita 068016e4dd parser, symbols: drop unnecessary casts
It's casted into ExprDef and then uncasted for no reason.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-01 11:20:35 +02:00
Ran Benita 4a7bfb6844 expr: use ExprCreate in more places
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-01 11:20:34 +02:00
Ran Benita fd98d64bba parser: remove 'uval' yylval type
We don't care about DoodadType.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-01 10:47:56 +02:00
Ran Benita c24b642025 expr: add constructor for boolean expressions
Also add a 'bool set' to the ExprDef union, instead of using 'ival' as a
bool.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-01 10:47:56 +02:00
Ran Benita c5d859385f expr: add constructors for more expression types
This makes the parser a bit more declarative. But really it might make
error handling easier.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-12-01 10:47:56 +02:00
Ran Benita dbd8b1ef8d expr: add 'ident' value to ExprDef union
This distinguishes between an identifier expression and a string
expression in the union.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-11-30 22:28:13 +02:00
Ran Benita 9dc5b8cb60 Resolve keysyms early in parser
Instead of having the parser passing strings to the AST, and
symbols/compat etc. resolving them themselves. This simplifies the code
a bit, and makes it possible to print where exactly in the file the bad
keysym originates from.

The previous lazy approach had an advantage of not needlessly resolving
keysyms from unrelated maps. However, I think reporting these errors in
*any* map is better, and the parser is also a bit smarter then old
xkbcomp and doesn't parse many useless maps. So there's no discernible
speed/memory difference with this change.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-11-27 13:52:54 +02:00
Ran Benita ba7530fa90 scanner: restore lost DIVIDE token
I don't know how this could have happened. Luckily this token is
completely useless.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-11-27 13:45:15 +02:00
Ran Benita 1651e5af46 symbols: modernize LookupKeysym
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-11-27 13:12:19 +02:00
Ran Benita 64b8da4b9a symbols: rename info.modMaps -> modmaps
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-11-27 12:52:20 +02:00
Ran Benita 5a5e4915b0 NEWS: add missing 'New API' entries for NO_FLAGS
Forgot to add this.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-11-26 12:10:05 +02:00
Ran Benita 8deff4f0ab Bump version to 0.3.2
Add a NEWS file, with some retroactive entries. Also add 'check-news' to
configure.ac, though this might be a bit annoying.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-11-22 21:02:24 +02:00
Alan Coopersmith 044d4b5f66 Make XkbFileCreate argument types match between header & implementation
Fixes build failure with Solaris Studio compilers:
"src/xkbcomp/ast-build.c", line 492: identifier redeclared: XkbFileCreate
  current : function(..., enum xkb_map_flags)
  previous: function(..., unsigned int) : "src/xkbcomp/ast-build.h", line 98

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-11-09 10:08:49 +02:00
Ran Benita 739567522a scanner-utils: remove outdated comment
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-27 20:50:18 +02:00
Ran Benita 65f9980b24 rules: fix scanning of line-continuation without leading space
We were failing to scan something like\
this correctly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-14 19:05:24 +03:00
Ran Benita dcdd4e1030 Replace ctype.h functions with ascii ones
ctype.h is locale-dependent, so using it in our scanners is not optimal.
Let's be deterministic with our own simple functions.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-14 18:59:53 +03:00
Ran Benita 14382a62ab configure.ac: add AM_PROG_CC_C_O
Older Automakes give this error without this directive:

Makefile.am: C objects in subdir but `AM_PROG_CC_C_O' not in `configure.ac'

In newer autotools this is included under AC_PROG_CC, but it's harmless
to add.

https://github.com/xkbcommon/libxkbcommon/issues/3

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-13 22:25:24 +03:00
Ran Benita f813bdbfdc rulescomp: increase BENCHMARK_ITERATIONS from 1000 to 2500
1000 is a bit too low for statistical significance on this 6 years old
CPU. Since the benchmark is run manually this shouldn't be a problem.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-10 22:02:30 +03:00
Ran Benita a45f531aa7 keymap: call strlen on keymap string instead of SIZE_MAX
I wanted to avoid the strlen, but we'd better keep the scanner a bit
less surprising and encourage people to use xkb_keymap_new_from_buffer()
instead of they do in fact have access to the size.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-10 22:02:30 +03:00
Ran Benita ca0d388f99 rules: simplify a bit of code
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-10 22:02:30 +03:00
Ran Benita fbed22e881 rules: use strlen_safe
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-10 22:02:30 +03:00
Ran Benita efe5b036ee rules: improve error logging macros
Improve safety with parenthesis, make the matcher macros use the scanner
ones, and make the 1 variant use %s instead of embedding the msg; this
way the compiler can reuse the string in the binary.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-10 22:02:30 +03:00
Ran Benita 5af688e694 rules: reduce variable scopes
There are some big functions there, and this might help reduce the
cognitive load a bit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-10 22:02:30 +03:00
Ran Benita c35c388b79 scanner: remove unnecessary cast
'tok' is already an int now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-10 22:02:21 +03:00
Siddharth Heroor 27f2743cf1 keysym-utf: Fix a warning about shadowing
Change variable names to avoid the name clash. The warning seen is

src/keysym-utf.c: In function 'bin_search':
src/keysym-utf.c:841: warning: declaration of 'min' shadows a global declaration
src/utils.h:109: warning: shadowed declaration is here
src/keysym-utf.c:842: warning: declaration of 'max' shadows a global declaration
src/utils.h:115: warning: shadowed declaration is here

Signed-off-by: Siddharth Heroor <heroor@ti.com>
2013-10-07 21:00:33 +03:00
Ran Benita 1e52bf7995 symbols: fix use of uninitialized variable
'tmp' is stack allocated so tmp->merge is used uninitialized by
AddModMapEntry(). The value doesn't matter much, but it used to
make some modmap merging decision (which doesn't have many
conflicts usually).

Bug inherited from xkbcomp.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-10-03 10:02:49 +03:00
Ran Benita 8e14bff0a1 parser: add some notes about byacc working
We now also work with byacc (version tested: 20130925) which some people
prefer, perhaps due to its license (public domain) or performance
(haven't compared).

When using byacc, currently the following warning comes up:
    src/xkbcomp/parser.c:954:14: warning: declaration shadows a variable in the global scope [-Wshadow]
        YYSTYPE  yylval;
                ^
    src/xkbcomp/parser.c:37:20: note: expanded from macro 'yylval'
    #define yylval     _xkbcommon_lval
                    ^
    ./src/xkbcomp/parser.h:96:16: note: previous declaration is here
    extern YYSTYPE _xkbcommon_lval;

This is due to a bug in byacc - it shouldn't output that extern line in
%pure-parser mode. So the warning stays.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-09-29 01:41:52 +03:00
Ran Benita 8dcb30e564 parser: add a workaround for byacc
Unlike bison, byacc outputs its own parser code *after* our own parser.y
code, which includes the #undef. So this fix is needed for the 'scanner'
-> 'param->scanner' translation to work in the parser.c code generated
by byacc.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-09-29 01:29:47 +03:00
Ran Benita 409f27d783 parser: don't use %locations
byacc doesn't support this feature.

We print the line/col of the last scanned token instead. This is slightly
less in case of *parser* errors (not syntax errors), but I couldn't make
it point to another line, and this are pretty cryptic anyways. So it's
good enough. Also might be a bit faster, but haven't checked.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-09-29 00:41:17 +03:00
Ran Benita 13da6da0e7 parser: drop %name-prefix, use -p yacc argument instead
Even though the %name-prefix is more sensible, byacc doesn't support it,
but both bison and byacc support the -p argument.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-09-29 00:24:50 +03:00
Ran Benita cfd7e7c160 parser: use %pure-parser instead of %define api.pure
Both bison and byacc support this syntax. Bison manpage says something
about this giving more or less options, but we don't care.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-09-29 00:22:20 +03:00
Ran Benita e4c00e90ab parser: don't use enum yytokentype
byacc doesn't support this, it just puts out #define's for the tokens.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-09-29 00:19:32 +03:00
Ran Benita 0dbe20ae96 Makefile.am: drop AM_LFLAGS
We don't use a lex/flex anymore so this is not used.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-09-29 00:16:39 +03:00
Wander Lairson Costa ac59e735eb Make C++ happy.
For most functions taking an enum flags parameter, we use 0 value to
indicate that no flags should be applied.

C++ has a stronger type system than C and will not implicitly convert
int's to enum's. Thus, we create valid 0 enum values for enum types
where it makes sense.

Signed-off-by: Wander Lairson Costa <wander.lairson@gmail.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-09-26 15:54:53 +03:00
Ran Benita 59fb79e75e test/state: fix missing xkb_state_unref
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-09-25 10:05:26 +03:00
Ran Benita dbf07de14d doc: use 'indices' instead of 'indexes' consistently
We use 'indices' in some function names so use that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-29 19:49:40 +03:00
Ran Benita b4cc33941d doc: try to explain leds and shift levels
Remove the @todo's.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-29 19:48:35 +03:00
Ran Benita 5d2b268dc1 build: distribute makekeys.py and keywords.gperf
This was an oversight: even though we ship the pre-built files, it is
still good behavior to include the original generators / source files in
the tarball.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-29 19:07:25 +03:00
Ran Benita 2a2a8d7da1 state: apply capitalization transformation on keysyms
The xkbproto spec says:
http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier

    If the Lock modifier is not consumed by the symbol lookup process,
    routines that determine the symbol and string that correspond to
    an event should capitalize the result.

This was not an issue until now, because most xkeyboard-config keymaps
do not utilize this "feature", and specify the keysyms for the Lock
modifier explicitly instead. However, some keymaps do depend on it, e.g.
ch(fr) for eacute and others.

The spec goes on to describe two options for doing this transformation:
locale-sensitive and locale-insensitive. We opt for the latter; it is
less desirable but we don't want *that* headache.

Also, only xkb_state_key_get_one_sym() is changed;
xkb_state_key_get_syms() is left as-is, and always reports the
untransformed keysyms. This is for the following reasons:

- The API doesn't allow it, since we return a const pointer directly to
  the keymap keysyms table and we can't transform that.

- The transformation doesn't make sense for multiple-keysyms.

- It can be useful for an application to get the "raw" keysyms if it
  wants to (e.g. maybe it wants to do the transformation itself).

Finally, note that xkb_state_mod_index_is_consumed() does *not*
report Lock as consumed even if it was used in the transformation. This
is what Xlib does.

This definitely doesn't fall under the "hard to misuse" API rule but
it's the best we can do.

https://bugs.freedesktop.org/show_bug.cgi?id=67167

Reported-By: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-15 09:58:50 +03:00
Ran Benita 9e92319db4 test/interactive: use xkb_state_key_get_one_sym() when there's only 1
Kind of odd, but get_one_sym() will be getting a different behavior.
Real life users *should* pick one or the other.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-15 09:58:50 +03:00
Ran Benita 1499eedd82 keysym: add xkb_keysym_to_{lower,upper}
These functions are needed later; they are not API functions. The
capitalization is not locale sensitive.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-15 09:58:50 +03:00
Ran Benita 884e0079e0 build: use build-aux as autom4te cache directory
Remove the generated directory ./autom4te.cache by reusing ./build-aux
as cache directory.

This was stolen from a libxcb commit by Daniel Martin:
http://lists.freedesktop.org/archives/xcb/2013-July/008431.html

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-15 09:58:50 +03:00
Ran Benita f505c4314e build: use AC_CONFIG_AUX_DIR([build-aux])
Less clutter, why not?

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-15 09:58:50 +03:00
Ran Benita 5b7f766898 build: build libtest.la only on 'make check'
For those just running 'make', compiling libtest is wasted heat.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-15 09:36:12 +03:00
Ran Benita 9c697f804a doc: tweak the wording on xkb_state/xkb_keymap relationship
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-14 11:37:58 +03:00
Ran Benita 9cef902dab test: make sure keycode 0 works fine
It is a legal keycode but we never tried it actually.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-14 11:37:57 +03:00
Ran Benita d83fe702d2 doc: un-clarify one subtle point
Including the X server is a bit of a borderline case; we should mostly
encourage people to use update_mask() only when xkbcommon itself
serializes the state on the other side. But it's not entirely wrong
either.. So rephrase a bit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-13 15:17:59 +03:00
Ran Benita 7caa1af25e scanner: don't fail over unknown escape sequence
This is too strict, and causes symbols/cz to fail parsing. Instead, just
emit a warning (not shown by default):
    xkbcommon: WARNING: cz:75:19: unknown escape sequence in string literal

https://bugs.freedesktop.org/show_bug.cgi?id=68056

Reported-By: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-13 14:52:11 +03:00
Ran Benita 869c9b582d xkbcomp: improve a few log messages
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-13 10:01:22 +03:00
Ran Benita aa9c91943e scanner: fix compiler warning
src/xkbcomp/scanner.c:158:17: warning: comparison of constant -1 with expression of type 'enum yytokentype' is always true
      [-Wtautological-constant-out-of-range-compare]
        if (tok != -1) return tok;
            ~~~ ^  ~~

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-02 14:41:19 +03:00
Ran Benita 9bb1d0bc1d build: make all symbols in libtest visible
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-02 12:37:45 +03:00
Ran Benita c25bdc3fca build: use AM_LDFLAGS for general flags
We want -no-undefined for every library so do it implictly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-02 12:37:36 +03:00
Ran Benita e91d2653dd scanner: allow empty key name literals
Some keymaps actually have this, like the quartz.xkb which is tested. We
need to support these.

https://bugs.freedesktop.org/show_bug.cgi?id=67654

Reported-By: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-02 11:40:27 +03:00
Ran Benita e731b2514b xkbcomp: handle empty keymaps
We should handle empty xkb_keycode and xkb_symbol sections, since
xkbcomp handles them, and apparently XQuartz uses it. There are also
files for it in xkeyboard-config (rules=base model=empty layout=empty,
which translate to keycodes/empty and symbols/empty).

https://bugs.freedesktop.org/show_bug.cgi?id=67654

Reported-By: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-02 11:39:39 +03:00
Ran Benita d2383d3852 keymap-dump: use correct format specifiers
For keycodes, groups, levels, etc, which are unsigned. The really proper
inttypes.h ones seem a bit much though.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-01 21:49:48 +03:00
Ran Benita c0589be69b log: change the log prefixes to be more library-like
"Error: " is not very informative when intermingled with other logs. The
format that seems most suitable is:
    "xkbcommon: ERROR: %s"

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-31 10:58:25 +03:00
Ran Benita 990c09a3d0 keymap: update builtin fields directly in src/keymap.c
This fields are part of our API and every keymap should have them, not
just xkbcomp/ ones.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-31 10:58:25 +03:00
Ran Benita 5f787e5e91 keymap: be more careful in xkb_keymap_unref
To allow calling _unref on the keymap in whatever limbo state it happens
to be in.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-31 10:58:25 +03:00
Ran Benita be38862b2a keymap: remove struct xkb_key_redirect_action
The file src/xkbcomp/action.c already doesn't handle this action type
and fails if it encounters it. So lets not pretend to do something with
it, and ignore it rather than failing.

If we/someone wants this we can consider implementing it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-31 10:58:25 +03:00
Ran Benita 3a0adc0f5c doc: try to clarify some subtle points
Which to choose: xkb_state_update_key() / xkb_state_update_mask(). If you
use update_mask(), you don't (and shouldn't) use update_key().
If you use update_key(), be careful not to have unmatched UP/DOWN
calls; this can bring about stuck modifiers etc.

Probably want to use XKB_STATE_{MODS,LAYOUT}_EFFECTIVE. The others are
only useful in very special cases.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-31 10:55:20 +03:00
Ran Benita 7f1b7a1c36 test/keyseq: add de(neo) Level{6,7,8} tests
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-25 13:21:33 +03:00
Pino Toscano ec9a02a239 Get rid of the usage of PATH_MAX
PATH_MAX is optional in POSIX, so avoid its unconditional usage
allocating and freeing buffers as needed.
To avoid too many malloc/free in the for loop in FindFileInXkbPath,
a buffer is grown according to the size needed at each iteration.
2013-07-24 12:08:11 +03:00
Ran Benita 806d24b1a5 keymap: move RANGE_WRAP to be the first in the enum
This is the reasonable "zero-default" for this enum.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-23 11:36:01 +03:00
Ran Benita 0c8e9e0c9c test: sync test/data from xkeyboard-config 2.9
Needed for some tests. The tests need some adjustment, mostly because of
the resolution of xkeyboard-config bug
https://bugs.freedesktop.org/show_bug.cgi?id=50935

Also add the 'ch' symbols file for future tests.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-22 22:28:01 +03:00
Ran Benita c00ea5ff8e atom: really work with non-NUL-terminated strings
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-22 11:02:20 +03:00
Ran Benita 9e801ff782 ctx: adapt to the len-aware atom functions
xkb_atom_intern now takes a len parameter. Turns out though that almost
all of our xkb_atom_intern calls are called on string literals, the
length of which we know statically. So we add a macro to micro-optimize
this case.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-21 17:07:41 +03:00
Ran Benita 7e0ae4b4d5 atom: allow interning non-NUL-terminated strings
We need this later. The strlen was calculated anyway, so no loss here.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-21 17:07:41 +03:00
Ran Benita 9cd29453ae atom: expand variable names
A bit easier to understand at a glance.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-21 17:07:41 +03:00
Ran Benita 9ffe9dae1d keymap: don't use darray for sym_interprets
We want xkb_keymap to be easy to handle everywhere.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-21 10:00:37 +03:00
Ran Benita 4b560287f8 xkbcomp: escape the section names before storing them in the keymap
This ensures the names are escaped before having any interaction with
the user.

This was caught by noticing dump(compile(dump())) != dump. Since that's
a nice test we add it to stringcomp.

https://bugs.freedesktop.org/show_bug.cgi?id=67032

Reported-By: Auke Booij
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-07-18 14:50:21 +03:00
Daniel Stone 6bb727b227 Resync keysym database
xproto 7.0.24 adds XF86AudioMicMute.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-07-17 22:47:32 +01:00
Ran Benita 6f06eb5944 doc: Update Doxyfile
It gives:

Warning: Tag `SYMBOL_CACHE_SIZE' at line 346 of file doc/Doxyfile has become obsolete.
To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u"

So run 'doxygen -u' as suggested.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-06-19 21:14:41 +03:00
Daniel Stone 9f01bd1e72 Bump version to 0.3.1
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-06-03 16:43:43 +01:00
Matthias Clasen b06de3072b Add keycode min/max and iteration API
Add three new pieces of API:
  - xkb_keymap_min_keycode does what it says on the tin
  - xkb_keymap_max_keycode likewise
  - xkb_keymap_key_for_each calls the provided function once for every
    valid key in the keymap

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-05-09 15:31:21 +01:00
Daniel Stone 17a956d807 Widen keycode range to 8/255 if possible (bug #63390)
If the keycode range is smaller than 8 → 255, artifically widen it when
dumping the keymap as not to displease X.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-05-09 14:47:09 +01:00
Ran Benita a392d2682b Replace flex scanner with a hand-written one
The scanner is very similar in structure to the one in xkbcomp/rules.c.
It avoids copying and has nicer error reporting.

It uses gperf to generate a hashtable for the keywords, which gives a
nice speed boost (compared to the naive strcasecmp method at least). But
since there's hardly a reason to regenerate it every time and require
people to install gperf, the output (keywords.c) is added here as well.

Here are some stats from test/rulescomp:

Before:
compiled 1000 keymaps in 4.052939625s
==22063==   total heap usage: 101,101 allocs, 101,101 frees, 11,840,834 bytes allocated

After:
compiled 1000 keymaps in 3.519665434s
==26505==   total heap usage: 99,945 allocs, 99,945 frees, 7,033,608 bytes allocated

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-04-01 18:20:57 +01:00
Ran Benita e4bceec880 utils: add {un,}map_file to read an entire file
This wraps the current mmap call and adds a fallback implementation for
systems which do not have mmap (e.g. mingw).

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-04-01 18:20:56 +01:00
Ran Benita 99f6e6fc28 Add scanner-utils.h for common scanner functions
We want to share the same functions for another scanner.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-04-01 18:20:54 +01:00
Daniel Stone 27a11762ab Bump version to 0.3.0
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-04-01 18:04:06 +01:00
David Herrmann 36f55c494e keymap: add xkb_keymap_new_from_buffer()
The current API doesn't allow the caller to create keymaps from mmap()'ed
files. The problem is, xkb_keymap_new_from_string() requires a terminating
0 byte. However, there is no way to guarantee that when using mmap() so a
user currently has to copy the whole file just to get the terminating zero
byte (assuming they cannot use xkb_keymap_new_from_file()).

This adds a new entry xkb_keymap_new_from_buffer() which takes a memory
location and the buffer size in bytes.

Internally, we depend on yy_scan_{string,byte}() helpers. According to
flex documentation these already copy the input string because they are
wrappers around yy_scan_buffer().
yy_scan_buffer() on the other hand has some insane requirements. The
buffer must be writeable and the last two bytes must be ASCII-NUL. But the
buffer may contain other 0 bytes just fine.

Because we don't want these constraints in our public API,
xkb_keymap_new_from_buffer() needs to create a copy of the input memory.
But it then calls yy_scan_buffer() directly. Hence, we have the same
number of buffer-copies as with *_from_string() but without the
terminating 0 requirement.
The explicit yy_scan_buffer() call is preferred over yy_scan_byte() so the
buffer-copy operation is not hidden somewhere in flex.

Maybe some day we no longer depend on flex and can have a zero-copy API. A
user could mmap() a file and it would get parsed right from this buffer.
But until then, we shouldn't expose this limitation in the API but instead
provide an API that some day can work with zero-copy.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>

[ran: rebased on top of my branch]
Conflicts:
	Makefile.am
	src/xkbcomp/xkbcomp.c
2013-04-01 18:04:06 +01:00
Ran Benita 094f1dc29a xkbcomp/keymap: silence a gcc warning
src/xkbcomp/keymap.c:127:12: error: 'found' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Not really, but why not.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-04-01 17:50:08 +01:00
Daniel Stone 38654f5e74 Add key-sequence checking to rulescomp
Make sure we're actually getting the keymaps we're hoping to
compile.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-04-01 17:50:08 +01:00
Daniel Stone 4d7600bd0c test: Add va_list variant of test_key_seq
For use when chaining tests.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-03-19 10:59:38 +00:00
Daniel Stone 40c46ecd5b Allow NULL rmlvo for xkb_keymap_new_from_names
Previously we allowed you to pass a names struct with five NULL members,
but not just pass NULL for the struct itself.  This was pretty dumb. :(

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-03-19 10:54:23 +00:00
Daniel Stone 22ba1fa1a6 test: Add environment checking to rulescomp
To ensure that overriding RMLVO from the environment works.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-03-19 10:54:23 +00:00
Daniel Stone 964b2a4023 test: Suppress RMLVO environment inheritance by default
But add a flag to allow it for later usage.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-03-19 10:54:23 +00:00
Daniel Stone fbe5e6751e Add environment overrides for default RMLVO
You can now set default values in the environment, as well as a context
option to ignore the environment, e.g. for tests.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-03-19 10:53:37 +00:00
Daniel Stone d4c22ecc8a test: Use test_get_context() in log.c
Since the only behavioural change is overriding default includes.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-03-19 10:34:28 +00:00
Daniel Stone 54f95f496f test: Add flags argument to test_get_context()
Allowing overriding of environment suppression, at first.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-03-19 10:28:23 +00:00
Daniel Stone a1f203c031 test: Move test_key_seq to common.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2013-03-19 10:25:52 +00:00
Ran Benita 0513686b5d rules: be more paranoid in scanner
This can't happen, but better safe than sorry. The optimizations were
noticeable but negligible.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:06 +00:00
Ran Benita 0e200bd507 rules: quiet a gcc warning
src/xkbcomp/rules.c:620:36: error: 'idx' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Can't happen but no harm done.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:06 +00:00
Ran Benita 559252a1a8 keyseq: add a couple of tests
Tests the filter refcounting.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:06 +00:00
Ran Benita 9f75e0ab2e state: use stdbool in filters
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:06 +00:00
Ran Benita e8c0396f97 doc: use README as doxygen main page overview
The doxygen page looked a bit dead, the README fills it nicely, and is
already written in the markdown format which doxygen uses (I think?).

Unfortunately the USE_MDFILE_AS_MAINPAGE doxygen config doesn't seem to
do anything.. So we just add a {#mainpage} tag at the top of the README
which isn't so bad. BUT we still need some config option (the
no_extension=md part) so that doxygen will accept README instead of
README.md or somesuch. And that requires an even newer release, 1.8.3.1,
released 2013-01. But if an older version is used, it doesn't spew out
warnings but just skips the README, which is fine.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:06 +00:00
Ran Benita 40e5de9ac4 doc: update Doxyfile template to one from newer version
We want to use the USE_MDFILE_AS_MAINPAGE option which was introduced in
doxygen 1.8.3 (released 2012-12).

Right now the new options are commented, otherwise older doxygen spews
these these warnings, which can be ignored:

warning: ignoring unsupported tag `USE_MDFILE_AS_MAINPAGE =' at line 794, file doc/Doxyfile
warning: ignoring unsupported tag `MATHJAX_FORMAT         =' at line 1210, file doc/Doxyfile
warning: ignoring unsupported tag `EXTERNAL_SEARCH        =' at line 1257, file doc/Doxyfile
warning: ignoring unsupported tag `SEARCHENGINE_URL       =' at line 1265, file doc/Doxyfile
warning: ignoring unsupported tag `SEARCHDATA_FILE        =' at line 1271, file doc/Doxyfile
warning: ignoring unsupported tag `EXTERNAL_SEARCH_ID     =' at line 1278, file doc/Doxyfile
warning: ignoring unsupported tag `EXTRA_SEARCH_MAPPINGS  =' at line 1287, file doc/Doxyfile

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:06 +00:00
Ran Benita e33dd591bb doc: some improvements
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:06 +00:00
Ran Benita 57bfde3aff keymap: rename xkb_kt_map_entry to xkb_key_type_entry
That's a better name and fits more nicely.
Also change type->map to type->entries.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:06 +00:00
Ran Benita 6a39a0657d Fix pointer style nit
(I really dislike this one for some reason..)

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita 56ba986613 Remove file_id entirely
It is not used anymore.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita 64c002627d symbols: remove file_id
See previous commits.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita 4921eb7416 compat: remove file_id
See previous commit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita 2b6e576f26 types: remove file_id
See previous commit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita 2ddb9e4f98 types: put all copy-to-keymap code in one function
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita 4bd0610f13 keycodes: remove KeyNamesInfo::merge
Not used.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita b06ef2b826 keycodes: unwrap KeyNameInfo
We don't need the struct any more, it only contains one field now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita a78c1f0a04 keycodes: remove file_id
The file_id thing is used to identify the XkbFile some statement
originally came from. This is needed to avoid spurious warnings; for
example, if you write the same alias twice in a file, that's redundant,
and you'd want a warning about it. However if intentionally override it
from another file, that's fine, and you shouldn't get a warning. So by
comparing the file_id's the needed log verbosity is changed.

However, the file_id mechanism is really not needed, because we already
have that info! Each KeyNamesInfo corresponds to one XkbFile, so if the
conflict occurred while handling that one file -> same_file = true, and
if it occurs while merging two Info's -> same_file = false.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita f8d3ec9f6f keymap: don't use darray for key aliases
With a little tweak to the copy-to-keymap routine in keycodes.c we can
use a normal array.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita ea3cf26db5 keycodes: don't do unnecessary copies while merging
If 'into' in empty we can just steal 'from'.

Also move the alias-merging into the big function, it's nicer this way.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:05 +00:00
Ran Benita cd6a71fc63 state: small style fix
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita 71eb033eef Move a couple of general keymap functions from keycodes.c
To get a key by name and resolve an alias - this makes sense for
everyone.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita 82c3e39360 keycodes: remove unneeded alias conflict check
This is already checked when adding a new alias and merging aliases, so
it can never happen when we get to copying to the keymap.

Also the log verbosity decision there is quite useless, we should just
warn always and be done with it. So we can remove the file_id from
AliasInfo, and collapse the alias functions together.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita 614f60e3fa xkbcomp: handle XKB file include's better
The 'merge_mode' situation is quite messy, and we've introduced a
regression compared to original xkbcomp: when handling a composite
include statement, such as
    replace "foo(bar)+baz(bla)|doo:dee"
and merging the entire resulting *Info back into the including *Info,
we actually use the merge mode that is set by the last part (here it is
"augment" because of the '|'), when we should be using the one set for
the whole statement (here "replace").

We also take the opportunity to clean up a bit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita a7b1f80d34 Build cleanly with clang
clang doesn't like the use of typeof with out default flags, so just
don't use it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita 79329e1022 Don't try to build linux-specific tests on non-linux
Some tests use linux/input.h (and epoll), but we're building on some
other kernels (e.g. debian freebsd). We could just copy the file but
it's GPL. We could also skip the tests (exit code 77) but it doesn't
really matter.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita 14842d6dc9 keymap: abstract a bit over the keymap format
Make it a bit easier to experiment with other formats.

Add a struct xkb_keymap_format_operations, which currently contains the
keymap compilation and _get_as_string functions. Each format can
implement whatever it wants from these.

The current public entry points become wrappers which do some error
reporting, allocation etc., and calling to the specific format. The
wrappers are all moved to src/keymap.c, so there are no XKB_EXPORT's
under src/xkbcomp/ anymore.

The only format available now is normal text_v1.

This is all not very KISS, and adds some indirection, but it is helpful
and somewhat cleaner.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita d1eae42ac5 text: some style changes
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita 4e8dcca86d text: clean up and fix the *MaskText functions
The snprintf trick that LedStateText and ControlMaskText do cannot work,
because you can't use the buffer as an argument to write to itself!
(posix at least has 'restrict' there). So those two actually never
worked for more than one value (i.e. with a +).

Fix that, and do the same cleanup to ModMaskText. Now we have 3
functions which look exactly the same, oh well.

Also increase the context text buffer size, you never know.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita 540feef3bb More spelling errors
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita a0fc9066ef test/rmlvo-to-kccgst: free memory before exit
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:04 +00:00
Ran Benita b36d5b23d2 parser: also skip 'section' ELEMENT
It's for geometry only.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita 35657c660a ast-build: remove malloc_or_die
This should be fixed properly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita a7b9c73d28 keycodes: fix spelling in error message
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita 958b27284f Remove list.h
We don't use it anymore and it's easy to add back if needed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita 2b352c11dd Makefile.am: don't create INSTALL and ChangeLog
It may be xorg standard but it's completely useless and clutter the
directory.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita 98ccbf9aff keymap-dump: move writing 'key {}' in symbols to its own function
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita 4a59c84e43 keymap-dump: remove some ugly empty lines
xkbcomp prints them too, but that's just annoying. Also xkb_keycodes
doesn't have it already.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita e95dac76f2 keymap-dump: don't indent after xkb_keymap {
xkbcomp doesn't indent there, so it's easier to diff.
Also saves some horizontal space which is sorely needed when looking at
these files (especially the xkb_symbols).

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita 9842b7a58a keymap-dump: style cleanups
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita d1f7100bcf ast: add error handling to XkbFileFromComponents
And try to not repeat ourselves.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:03 +00:00
Ran Benita a46e4cc163 Fix dead assignments
"Value stored to 'stmt' is never read"
"Value stored to 'grp_to_use' is never read"

And change 'grp' to 'group' if we're here.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita c7aef16649 keysym: print unicode keysyms uppercase and 0-padded
Use the same format as XKeysymToString.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita dd81d5e0c0 Change some log functions to take ctx instead of keymap
They don't need the keymap, only the context.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita a4904ee1b7 keycodes: some minor style
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita 60bb639bbe action: s/hndlrType/handler_type
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita fab28da39f compat: make it clear which 'dflt' is meant
Also s/dflt/default.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita b5c1b1d221 symbols: make it clear which 'dflt' is meant
A bit easier at a glance. Also, vowels are cool, so just say 'default'.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita fc56b5134f ast: constify argument
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita 164cec6636 symbols: fix bad 'merge' assignment
Bug introduced in 2a5b0c9dc1, was causing
some keys to be merged incorrectly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita 8cee749000 Change 'indicator' to 'led' everywhere possible
The code currently uses the two names interchangeably.
Settle on 'led', because it is shorter, more recognizable, and what we
use in our API (though of course the parser still uses 'indicator').

In camel case we make it 'Led'.
We change 'xkb_indicator_map' to just 'xkb_led' and the variables of
this type are 'led'. This mimics 'xkb_key' and 'key'.
IndicatorNameInfo and LEDInfo are changed to 'LedNameInfo' and
'LedInfo', and the variables are 'ledi' (like 'keyi' etc.). This is
instead of 'ii' and 'im'.

This might make a few places a bit confusing, but less than before I
think. It's also shorter.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita 10c351f516 test/interactive: change variable name for 'xkb' to 'keymap'
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:02 +00:00
Ran Benita 089c3a1811 state: fix unbound virtual modifier bug
Recent xkeyboard-config introduced the following line in symbols/level3:
    vmods = LevelThree,
However, the XKM format which xkbcomp produces for the X server can't
handle explicit virtual modifiers such as this:
https://bugs.freedesktop.org/show_bug.cgi?id=4927

So by doing the following, for example:

setxkbmap -layout de (or another 3-level layouts)
xkbcomp $DISPLAY out.xkb
xkbcomp out.xkb $DISPLAY

The modifier is lost and can't be used for switching to Level3 (see the
included test).

We, however, are affected worse by this bug when we load the out.xkb
keymap. First, the FOUR_LEVEL_ALPHABETIC key type has these entries:
    map[None] = Level1;
    map[Shift] = Level2;
    map[Lock]  = Level2;
    map[LevelThree] = Level3;
    [...]
Now, because the LevelThree virtual modifier is not bound to anything,
the effective mask of the "map[LevelThree]" entry is just 0. So when
the modifier state is empty (initial state), this entry is chosen, and
we get Level3, instead of failing to match any entry and getting the
default Level1.

The difference in behavior from the xserver stems from this commit:
acdad6058d
Which removed the entry->active field. Without bugs, this would be
correct; however, it seems in this case we should just follow the
server's behavior.

The server sets the entry->active field like so in XKBMisc.c:
    /* entry is active if vmods are bound */
    entry->active = (mask != 0);
The xkblib spec explains this field, but does not specify how to
initialize it. This commit does the same as above but more directly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:01 +00:00
Ran Benita 0ad8bf573f test/interactive: also print the level
Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:01 +00:00
Ran Benita bc7b2ff2fb test/keyseq: re-add de(neo) level5 test
See:
https://bugs.freedesktop.org/show_bug.cgi?id=50935
This works now after syncing with recent xkeyboard-config.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:01 +00:00
Ran Benita 4058110676 Sync test data from xkeyboard-config
Sync the files again from xkeyboard-config 2.8, since there have been
some changes we should test against.

Also added a script test/data/sync.sh if we want to do it again in the
future.

Signed-off-by: Ran Benita <ran234@gmail.com>
2013-03-18 22:20:01 +00:00
Ran Benita 3d731eba5c configure.ac: add xkbcommon.com url to AC_INIT
Why not.
Also forgot to update the xorg-utils error message when bumping the
requirement.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Changed to xkbcommon.org.]
2012-12-13 14:02:12 +00:00
Daniel Stone bb620df7aa Parser: Initialise geometry elements for VarDecl
We were using uninitialised memory whilst parsing geometry, leaving
random contents as the return for shape/overlay/etc sections.  Somehow
this actually worked everywhere but under Java.

https://bugs.freedesktop.org/show_bug.cgi?id=57913

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-12-06 15:04:15 +11:00
Ran Benita f159846943 state: rename state->cur to state->components
'cur' doesn't make sense anymore. 'components' is a bit long for this,
but not too bad, and nothing better comes to mind.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-11-11 16:14:30 +02:00
Ran Benita 7372c9f181 state: don't keep the previous state components in xkb_state
There is really no need to keep this in the struct, we can just allocate
it on the stack when we need to.
Don't know why I did it this way.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-11-11 16:09:05 +02:00
Ran Benita 60bd92021b keymap: wrap the layout parameter if it is out of range for the key
The functions num_levels_for_key() and get_syms_by_level() have a
'layout' parameter. Currently it is expected that this value is always
legal for the key, as determined by num_layouts_for_key(). However,
there are legitimate use cases for passing an out-of-range layout there,
most probably passing the effective layout, and expecting to get the
keysyms/levels for just this layout. So we wrap it just as we do in the
xkb_state_* functions.

This is also useful for stuff like this:
http://developer.gnome.org/gdk/stable/gdk-Keyboard-Handling.html#gdk-keymap-lookup-key

If this behavior is not desired, the user has the option to check
against num_layouts_for_key herself.

https://bugs.freedesktop.org/show_bug.cgi?id=56866

Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-11-11 00:32:16 +02:00
Daniel Stone 324d4dbd99 Only distribute .tar.xz archives
We definitely don't need .gz anymore, and .bz2 seems on its way out.
Mirror what Wayland does, and move to .xz exclusively.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-11-09 14:26:49 +11:00
Ran Benita 577612258a Don't use trailing enum comma in public headers
Pretty annoying, but C89 doesn't support that (officially), and it might
cause warning with -pedantic, etc. (though you need -Wsystem-headers to
see them usually). Removing them is not a big deal.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-11-07 18:59:41 +02:00
Ran Benita d87035adac test/keysym: '\e' is non-standard
test/keysym.c:139:43: warning: non-ISO-standard escape sequence, '\e'
Didn't warn about it before..

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-11-07 18:59:41 +02:00
Ran Benita eea0eaebfa doc: clarify that keysym_to_utf8 returns size including '\0'
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-11-06 23:01:44 +02:00
Ran Benita d9317d5f32 keysym-utf: mark keysymtab array as static
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-11-05 21:50:38 +02:00
Ran Benita 7891c9170b keysym-utf: also translate special keysyms like Tab and Return
The keysym2ucs.c file apparently leaves out some keysyms, which libX11
deals with separately (like in _XkbHandleSpecialSym()).
The problematic keysyms are the keypad ones (for which we already added
some support) and keysyms which use 0xff** instead of 0x00** < 0x20.
This code should fix them properly, as much as I could gather from
libX11 and http://www.cl.cam.ac.uk/~mgk25/ucs/keysym2ucs.c and other
sources (which are not aware of locale).

https://bugs.freedesktop.org/show_bug.cgi?id=56780

Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-11-05 21:34:59 +02:00
Ran Benita fb201645b2 Add some explanations on consumed modifiers
This should hopefully clarify this somewhat subtle point to the
uninitiated users.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-11-04 16:14:47 +02:00
Ran Benita 998c957a3c action: don't allow private actions with a known type
Some obscure bug having to do with Private actions; see the comments.
This was prompted by:
https://bugs.freedesktop.org/show_bug.cgi?id=56491

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-30 18:25:08 +02:00
Damien Lespiau 860fb171a9 build: Require xorg macros 1.16
For XORG_TESTSET_CFLAG and XORG_MEMORY_CHECK_FLAGS.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Cc: Daniel Stone <daniel@fooishbar.org>
2012-10-30 15:08:14 +02:00
Damien Lespiau 2f7385d0e0 build: Make autoreconf honour ACLOCAL_FLAGS
When running autoreconf, it's possible to give flags to the underlying
aclocal by declaring a ACLOCAL_AMFLAGS variable in the top level
Makefile.am.

Putting ${ACLOCAL_FLAGS} there allows the user to set an environment
variable up before running autogen.sh and pull in the right directories
to look for m4 macros, say an up-to-date version of the xorg-util macros.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Cc: Daniel Stone <daniel@fooishbar.org>
2012-10-30 15:08:14 +02:00
Ran Benita 94155878ec test/keyseq: add test for setting depressed group
Tests the SetGroup action is working properly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-29 20:20:51 +02:00
Ran Benita 7261f404d2 state, context: allow passing NULL to *_unref()
For error handling code, it's nice to be able to pass NULL to these
function without worrying about segfaults ensuing. free() sets the
precedent here.

Also document this fact.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-29 01:20:04 +02:00
Ran Benita a51ee70419 state: don't use xkb_keymap_num_layouts internally
Clearer and more greppable this way.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-26 16:34:39 +02:00
Ran Benita b935d3610f doc: fix wrong comment
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-26 16:16:18 +02:00
Ran Benita ee6f3f2809 state: don't use xkb_state_serialize_* internally
The code in these cases is clearer when done directly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-26 16:12:28 +02:00
Ran Benita 92360016fe Makefile.am: move test.h to libtest_la_SOURCES
Rather than EXTRA_DIST, where it doesn't belong.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-26 15:09:57 +02:00
Ran Benita 22b868fd75 Makefile.am: split sed script into multiple lines
To make it visible on one screen.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-26 15:09:54 +02:00
Ran Benita 0a5e9d90e7 configure.ac: don't tramp on user's CFLAGS
The configure test shouldn't touch CFLAGS, because they come last on the
command line and allow to users to override settings if needed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-26 14:43:15 +02:00
Ran Benita a851ef1ed9 configure.ac: add explicit PKG_PROG_PKG_CONFIG
We still use pkg-config to get the xkb_base variable from
xkeyboard-config, but we removed all of the other PKG_ macro calls. This
still works now, because XORG_DEFAULT_OPTIONS runs it somehow. But we
shouldn't rely on it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-26 14:25:17 +02:00
Ran Benita c1c1b720b0 test: add key processing benchmark
This runs a bunch of random keys against xkb_state_update_key() and
xkb_state_key_get_one_sym(), in a fairly unintelligent way.

It might be nice to check when modifying this code path, or changing it,
to see things haven't slowed down considerably. However, given the
numbers this benchmark gives, it is pretty clear that we are not going
to be the bottleneck for anything. So this can more-or-less be ignored.

Incidentally, this also turned out to be a poor man's fuzzer, because it
turned up the fix in the previous commit. Maybe we should consider
beefing it up with an actual 'break stuff' intention and running it as
part of 'make check'.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-24 23:27:40 +02:00
Ran Benita 6f093ad56b state: fix possible index-out-of-bounds in action dispatch table
The current code assumes that action->type always falls in the range of
the xkb_action_type enum. But keymaps can also have Private actions,
which are allowed to set their own type number.

So with a default xkeyboard-config keymap, keycode 86 at level 4, which
triggers such an action, causes us to crash.

Fix it by always checking the bounds.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-24 23:09:26 +02:00
Daniel Stone a35d322322 More README
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-10-24 17:38:28 +11:00
Daniel Stone 202f560691 README updates
Good thing I didn't check this before I made a release.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-10-24 17:00:24 +11:00
Daniel Stone 5be22ad641 Bump to 0.2.0
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-10-24 03:13:46 +11:00
Ran Benita 3eac759989 doc: various fixes
Just moving around / fixing syntax / grammar.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-23 17:22:13 +02:00
Ran Benita 33bba36821 doc: move include_path functions to a separate group
These are 'special intrest' function, like the logging functions, so
it's nice to have them in their own logical group.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-23 17:22:13 +02:00
Ran Benita e24ed49c72 test/interactive: use num_layouts_for_key()
This is the more appropriate for a specific key (also considering the
num_layouts() is a bit of a made-up value).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-23 17:22:13 +02:00
Ran Benita f76859bc87 keymap: use plain array for keymap->group_names
Again it is not resized.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-23 17:22:13 +02:00
Ran Benita 867992cd21 state: fix typo in state component copying
Gladly no-one should have been fast enough to hit this.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-23 17:22:13 +02:00
Daniel Stone 6bc9480ad1 autogen: use --force instead of --symlink
--force copies and installs all the autotools support files, rather than
making symlinks, which can sometimes break things when upgrading your
system autotools.  This is what xserver does.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-10-24 00:59:37 +11:00
Ran Benita 0c98237f02 Change update_mask arguments to read 'depressed' instead of 'base'
Just to be consistent, as we use 'depressed' everywhere else in the API.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-22 22:23:29 +02:00
Ran Benita a807494e47 test/interactive: add option to show state changes
Pass -c to see.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-22 22:23:29 +02:00
Ran Benita 4b81c9f3e3 Report which components of the state have changed
We add a return value to the xkb_state_update_key and
xkb_state_update_mask, which reports to the caller which of the state
components have changed as a result.

This restores the XKB functionality of the XkbStateNotify and
XkbIndicatorsStateNotify events. See:
http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Events
It is quite useful in some situations. For example, it allows an
application to avoid doing some work if nothing of relevance in the
state has changed. Say, a keyboard layout applet. Also useful for
debugging.

The deltas themselves are not provided, because I can't see a use case.
If needed, it should be possible to add some API for that.

In xkbcommon, keymaps are immutable, so all of the other *Notify events
from XKB are irrelevant.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-22 21:58:03 +02:00
Ran Benita 550cb24d3c state: add struct state_components
This holds all of the state component fields in the state in one struct.
We will later want to keep the previous state components after updates,
so this will allow us to do it without duplicating the fields.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-22 21:55:43 +02:00
Ran Benita 6a94b122a4 Split the mods, layout, leds parts of xkb_state_components
Note first:
This commits breaks the ABI somewhat. If an application is run against
this commit without recompiling against the updated header, these break:
    - xkb_state_layout_*_is_active always retuns false.
    - xkb_state_serialize_mods always returns 0.
So it might break layout switching in some applications. However,
xkbcommon-compat.h provides the necessary fixes, so recompiling should
work (though updating the application is even better).

Split the enum to its individual components, which enables us to refer
to them individually. We will use that later for reporting which
components of the state have changed after update.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-22 21:48:40 +02:00
Ran Benita 3a5f87b8e9 doc: add note about X11 vs. extended keycodes
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-22 17:53:44 +02:00
Ran Benita 0779d9dcad Silence a couple of warnings
These appear to come and go randomly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-21 17:13:25 +02:00
Ran Benita bb82759c90 Move _text() functions from keymap-dump to text.c
And make them use context_get_buffer() instead of using a static char
array.

This was the last non-thread-safe piece we had, as far as I can tell.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-18 23:12:24 +02:00
Ran Benita e6946ae2c5 Remove a couple more uses of static char buffers
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-18 22:55:17 +02:00
Ran Benita 714e95e144 Contextualize GetBuffer()
Instead storing the buffer in a non-thread-safe static array, we move it
to the context.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-18 22:51:10 +02:00
Ran Benita eb748ab643 Clean up xkb_sym_interpret a bit
First we split the LEVEL_ONE_ONLY bit off of the 'match' field, which
allows us to turn enum xkb_match_operation to a simple enum and remove
the need for MATCH_OP_MASK.

Next we rename 'act' to 'action', because we've settled on that
everywhere else.

Finally, SIMatchText is changed to not handle illegal values - it
shouldn't get any. This removes one usage of the GetBuffer hack.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-18 21:04:27 +02:00
Ran Benita 5d9a5cb003 Commit and distribute ks_tables.h
The ks_tables.h file is generated by makekeys.py from
xkbcommon-keysyms.h, which in turn is generated initially by 'make
update-keysyms'. The xkbcommon-keysyms.h file is commited to git and
distributed in the tarball. Since ks_tables.h should only ever change
when xkbcommon-keysyms.h changes, it is more sensible to update them
together and treat them the same, instead of generating ks_tables.h
every time for every builder with 'make', as we do now.

This means we don't need python as a build dependency (only the one
running update-keysyms, i.e. no one, needs this), and we can be
sure exactly the same file is used by everyone. We also don't need to
run makekeys.py on every build.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-17 20:09:09 +02:00
Ran Benita 179855116d utils: add and use ARRAY_SIZE macro
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-16 21:31:25 +02:00
David Herrmann 7b3bd11f92 Add xkb_keysym_from_name() flags argument for case-insensitive search
This adds a flags argument to xkb_keysym_from_name() so we can perform a
case-insensitive search. This should really be supported as many keysyms
have really weird capitalization-rules.

However, as this may produce conflicts, users must be warned to only use
this for fallback paths or error-recovery. This is also the reason why the
internal XKB parsers still use the case-sensitive search.

This also adds some test-cases so the expected results are really
produced. The binary-size does _not_ change with this patch. However,
case-sensitive search may be slightly slower with this patch. But this is
barely measurable.

[ran: use bool instead of int for icase, add a recommendation to the
doc, and test a couple "thorny" cases.]

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-10-16 21:29:09 +02:00
Ran Benita 5fff637e07 makekeys: replace helper with python script and binary search
This removes the complicated and undocumented hash-table creation-helper
and replaces it with an autogenerated sorted array. The search uses simple
bsearch() now.

We also tried using gperf but it turned out to generate way to big
hashtables and when reducing the size it isn't really faster than
bsearch() anymore.

There are no users complaining about the speed of keysym lookups and we
have no benchmarks that tell that we are horribly slow. Hence, we can
safely use the simpler approach and drop all that old code.

Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-10-16 21:10:04 +02:00
Ran Benita 3477d9e448 Finish first round of API documentation
There are a few @todo's, but nothing serious.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-13 14:03:29 +02:00
Ran Benita f43b33c02f state: make mod_index_is_consumed() return -1 on invalid input
Like all the other functions.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-13 13:13:55 +02:00
Ran Benita 523e46f41a Change log env vars to XKB_LOG_LEVEL/VERBOSITY
A bit more consistent and descriptive.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-12 10:17:57 +02:00
Ran Benita bde066b920 doc: use JAVADOC_AUTOBRIEF
Don't have to type @brief all the time.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-11 21:51:08 +02:00
Ran Benita 89523789ca ast: simplify AppendStmt
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-11 21:51:08 +02:00
Ran Benita bbf388ec1f Make xkb_keymap_num_leds return the index range instead of active count
Currently xkb_keymap_num_leds() returns a count of valid (settable)
leds. Because the indexes might be non-consecutive, and some leds
might not be settable, it is incorrect to use this function for
iterating over the leds in the keymap. But this is the main use case of
this function, so instead of the current behavior we adapt the function
to the use case by making it return the needed range of iteration.
The caller needs to handle invalid intermittent indexes, though.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-11 16:54:17 +02:00
Ran Benita b6ddd10568 keymap: rename keymap->sym_interpret -> sym_interprets
This can be a bit confusing.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-11 14:05:49 +02:00
Ran Benita e43f53a698 compat: add documentation for interpret's
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-11 14:03:03 +02:00
Ran Benita 90b1984cba compat: don't forget to copy XKB_MATCH_NONE interpret's
Commit a8d462e366 accidentally removed the
OR with XKB_MATCH_NONE. It is in fact unused though.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-11 12:10:26 +02:00
Ran Benita a86fa17aeb build: change to AM_MAINTAINER_MODE([enable])
Disabled maintainer mode is annoying, we have no reason to do it. The
old behavior can still be had with --disable-maintainer-mode.
See:
http://lists.x.org/archives/xorg-devel/2012-September/033757.html
http://www.gnu.org/savannah-checkouts/gnu/automake/manual/html_node/maintainer_002dmode.html

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-10 21:01:15 +02:00
Ran Benita 2c188833c6 build: honor $NOCONFIGURE in autogen.sh
Using NOCONFIGURE=1 ./autogen.sh can prevent it from running ./configure
on its own, which is sometimes useful.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-10 21:00:36 +02:00
Ran Benita a05fbc17c5 stringcomp: test compilation of a dump of a keymap created from rules
This would have caught the regression fixed in 2ac319c.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-10 19:44:23 +02:00
Ran Benita 9197eb0fb3 Remove the XKB_NUM_INDICATORS limit
Use a darray instead of a static array of size 32.
We still enforce XKB_MAX_LEDS because of the size of xkb_led_mask_t.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-10 19:44:23 +02:00
Ran Benita f3732d8349 keymap: don't use darray for keymap->keys
It's never resized.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-10 17:51:06 +02:00
Ran Benita bdea377c93 Rename XKB_NUM_GROUPS to XKB_MAX_GROUPS
This is a more appropriate name now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-10 17:30:15 +02:00
Ran Benita 1dbb2c4a9a keycodes: refactor AddIndicatorName
Make it shorter and fix the XXX.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-10 12:25:23 +02:00
Ran Benita 2f4db8a95b keymap, state: don't assume led index < xkb_keymap_num_leds
xkb_keymap_num_leds() returns the number of leds that have any
possibility of being set. Even if a led is defined but can not be set in
any way, it is not counted.

In a few places currently we assume that led indexes are smaller than
this number, which is wrong both for the above reason and for the fact
that the xkb format actually allows explicitly setting the indicator
index, which means that the indexes might be non-consecutive.

We don't really have good API to iterate on leds, now, because
xkb_keymap_num_leds is pretty useless. To work around that we use
sizeof(xkb_led_mask_t) * 8.

This makes the "Group 2" led work (try switching to a layout other than
the first in test/interactive).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-10 10:10:45 +02:00
Ran Benita 9179fed76b keysym: fix xkb_keysym_is_upper/lower() to work properly
Our current code (taken from the xserver) doesn't handle unicode keysyms
at all, and there seem to be some other changes compared to libX11,
which is what xkbcomp uses. So we just copy the code that does that from
libX11.
It would be much better to not have to hardcode unicode tables like
that, but it's probably better than dealing with glibc locale stuff for
now. It also doesn't affect our binary size much.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-09 21:39:16 +02:00
Ran Benita 2ac319c54a compat: fix bad interpret predicate mods "all" calculation
Commit 9984d1d03c changed the type of
interpret->mods to xkb_mod_mask_t, but this bit of code assumes that the
type is uint8_t.
This code is not usually run (for example by our tests), but when it
does keymap-dump would print out all of the modifiers (including the
virtual ones) which causes recompilation of the output to fail
miserably.

https://bugs.freedesktop.org/show_bug.cgi?id=55769

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-09 10:36:48 +11:00
Ran Benita 9984d1d03c keymap: use xkb_mod_mask_t for interpret->mods and modmap
These are both real modifier masks, but we keep this information only in
the program logic now so when we change it we don't have to worry about
the type.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:42:42 +02:00
Ran Benita fcceeeafa8 symbols: refactor AddModMapEntry
It really asks for it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:42:00 +02:00
Ran Benita 6d74e66e3f Replace 0xff with MOD_REAL_MASK_ALL
To make it easier to see where it's used. The name is just to match
MOD_REAL.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:42:00 +02:00
Ran Benita a1124b5991 expr: unify the real and virtual modifier functions
This again pushes the mod type annotation to the original call site, to
make it easier to grep to see where the real/virtual distinction
matters.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:42:00 +02:00
Ran Benita 39232e6dae Remove now-unneeded mod type annotations
Most of the mod type annotations can now be changed to MOD_BOTH, because
if you pass a mask which can only contain real mods in the first place to
e.g. ModMaskText, then MOD_REAL and MOD_BOTH will give the same result.

In the cases where MOD_BOTH is only ever the argument, we just remove
it. What's left is where it really "matters".

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:42:00 +02:00
Ran Benita e6e3bda393 expr: share code for modifier functions
We can make more use of the functions in text.c now and remove some
cruft.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:42:00 +02:00
Ran Benita 9ebd2f67f4 text: explicitly take mod_type in mod functions
This essentially "tags" each invocation of the functions with the
modifier type of the argument, which allows for easy grepping for them
(with the aim being, to remove anything but MOD_BOTH).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:59 +02:00
Ran Benita 6d580127d8 text: share code for modifiers
Add static common functions which take enum mod_type, and change the
existing ones to use them.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:59 +02:00
Ran Benita 424de613af Keep real and virtual mods in the same table in the keymap
We change the keymap->vmods array into keymap->mods, and change it's
member type from struct xkb_vmod to struct xkb_mod. This table now
includes the real modifiers in the first 8 places. To distinguish
between them, we add an enum mod_type to struct xkb_mod.

Besides being a more reasonable approach, this enables us to share
some code later, remove XKB_NUM_CORE_MODS (though the 0xff mask still
appears in a few places), and prepares us to flat out remove the
distinction in the future. This commit just does the conversion.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:59 +02:00
Ran Benita 1005b320f1 Don't use shifted virtual modifier masks
Modifier masks can be confusing in some places. For example,
key->vmodmap only contains virtual modifiers, where the first is in
position 0, the second in 1 etc., while normally in a xkb_mod_mask_t the
virtual modifiers start from the 8th (XKB_NUM_CORE_MODS) position. This
happens in some other places as well.

Change all of the masks to be in the usual real+virtual format, and when
we need to access e.g. keymap->vmods we just adjust by
XKB_NUM_CORE_MODS. (This also goes for indexes, e.g.
interpret->virtual_modifier).

This makes this stuff easier to reason about.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:59 +02:00
Ran Benita 6974e1f9ac expr: don't expose LookupModIndex
The Lookup* functions should remain a private implementation detail of
the expr.c file.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:59 +02:00
Ran Benita aed3140e8d Remove VModInfo for now
VModInfo currently is only used to track which virtual modifiers were
declared in the file which owns the VModInfo. This, in turn, is only
used in ResolveVirtualModifier, which in turn is only used to resolve
the virtualModifier field in an interpret statement (compat.c). In other
words, it is used to ensure that interprets can only use a vmod which
was declared in the same map.

We remove this now, because it doesn't do much and distracts from other
changes; we will later re-add it properly. Specificly, we will make it
so that virtual modifiers are not the exception in that they modify the
keymap directly, instead of keeping the changes in some *Info struct and
commiting them to the keymap at the end of the compilation. (This is bad
because if a vmod is added to the keymap, and then the compilation of
this specific file fails, the change sticks around nonetheless).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:59 +02:00
Ran Benita 9a2ce2a5ad vmod: don't allow to add a vmod with the name of a real mod
Otherwise strange thing might ensue.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:59 +02:00
Ran Benita b65980ccff state: don't needlessly fetch the xkb_key
It's a leftover.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:59 +02:00
Ran Benita 1f4009d4e9 vmod: remove merge argument from HandleVModDef
It's unused and unneeded.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:59 +02:00
Ran Benita a75989b96e Omit struct '_Name' from non-recursive struct typedefs
Just a pet peeve.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:58 +02:00
Ran Benita 1401b0fb5e expr: don't allow "none" in LookupModIndex
LookupModMask handles this before calling LookupModIndex, and the only
other user in symbols.c doesn't handle this return value at all.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:58 +02:00
Ran Benita 239a5be10e keysym-utf: make keysym->unicode table a bit smaller
Saves a few kbytes, and unlikely to change.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:58 +02:00
Ran Benita dd29b14e11 Remove the XKB_NUM_VIRTUAL_MODIFIERS limit
Turn the virtual modifiers arrays in the keymap to a single darray,
which doesn't use this limit. The number of virtual modifiers is still
limited by the size of xkb_mod_mask_t, so we make sure not to go over
that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:58 +02:00
Ran Benita 8016c6f4f1 state: simplify xkb_state_mod_index_is_active
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:58 +02:00
Ran Benita e5b6055b34 state: don't ignore type argument in xkb_state_mod_*_are_active
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:58 +02:00
Ran Benita 1a6b1e0788 state: fix bad EFFECTIVE check in *_is_active()
This is a regression introduced in ed78fbcb30.
XKB_STATE_EFFECTIVE is just a OR of the other states, so using & here is
completely wrong. So test/state shows for example:
    dumping state for LCtrl down:
            group English (US) (0): effective depressed latched locked
            mod Control (2): depressed latched locked
    dumping state for LCtrl + RAlt down:
            group English (US) (0): effective depressed latched locked
            mod Control (2): depressed latched locked
            mod Mod1 (3): depressed latched locked
    dumping state for RAlt down:
            group English (US) (0): effective depressed latched locked
            mod Mod1 (3): depressed latched locked
    dumping state for Caps Lock:
            group English (US) (0): effective depressed latched locked
            mod Lock (1): depressed latched locked
            led Caps Lock (0): active
    dumping state for Alt-Shift-+
            group English (US) (0): effective depressed latched locked
            mod Shift (0): depressed latched locked
            mod Mod1 (3): depressed latched locked
which is bogus.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:58 +02:00
Ran Benita fe1faa143e Use our types instead of int/uint32_t in a few places
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-10-06 21:41:58 +02:00
Ran Benita 1c88088766 Don't scan and parse useless maps
One physical xkb file may (and usually does) contain multiple maps. For
example, the us symbols file contains a map for every variant.
Currently, when we need a map from a file (specific or default), we
parse the entire file into a list of XkbFile's, find the map we want and
discard the others. This happens for every include statement. This is a lot
of unnecessary work; this commit is a first step at making it better.

What we do now is make yyparse return one map at a time; if we find what
we want, we can stop looking and avoid processing the rest of the file.

This moves some logic from include.c to parser.y (i.e. finding the
correct map, named or default). It also necessarily removes the
CheckDefaultMap check, which warned about a file which contains multiple
default maps. We can live without it.

Some stats with test/rulecomp (under valgrind and the benchmark):

Before:
==2280==   total heap usage: 288,665 allocs, 288,665 frees, 13,121,349 bytes allocated
compiled 1000 keymaps in 10.849487353s

After:
==1070==   total heap usage: 100,197 allocs, 100,197 frees, 9,329,900 bytes allocated
compiled 1000 keymaps in 5.258960549s

Pretty good.

Note: we still do some unnecessary work, by parsing and discarding the
maps before the one we want. However dealing with this is more
complicated (maybe using bison's push-parser and sniffing the token
stream). Probably not worth it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-30 15:26:00 +02:00
Ran Benita 26e685daae scanner: don't strdup the file name
We don't modify it and there's no way to modify the original in the
scanner_extra life time.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-30 15:25:56 +02:00
Ran Benita ee4ab30ea2 scanner: share code in XkbParse{File,String}
Some refactoring to prepare for changes in the parse() function.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-30 15:25:25 +02:00
Ran Benita 471ebad623 scanner: remove uselss 'last symbol' error message
It never shows something useful. Besides, you already get the line
number, which is enough.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-30 14:29:49 +02:00
Ran Benita 22684cd1dd parser: remove XkbCompMapList rule
This rule allows you to put several xkb_keymaps in one file.
This doesn't make any sense: only the default/first can ever be used,
yet the others are fully parsed as well.
Different keymaps should just be put in different files.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-30 14:20:16 +02:00
Ran Benita 3b5ada233b parser: remove XkbConfig rule
This rule allows you to write file maps as:
    xkb_keycodes
    <BLA> = 5;
    [...]
instead of the usual format which is:
    xkb_keycodes {
        <BLA> = 5;
        [...]
    };

This is not documented, It is also not used in xkeyboard-config, and I
have never run into it otherwise. It also only allows one map per file.

It *might* be used in some obscure place, but probably nothing we should
care about; the simplified grammar is more useful for us now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-30 14:20:16 +02:00
Ran Benita 693a1f57d1 test/interactive: allow -k to get any absolute path
Instead of looking for a keymap in test/data.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-30 14:20:16 +02:00
Ran Benita 26cc2f400a Don't use %z printf format
Some libc's don't support it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-30 14:20:16 +02:00
Ran Benita ed1203dfef rules: always initialize idx variable
gcc didn't catch this one.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-30 12:44:52 +02:00
Ran Benita 92e07726b2 test: add keycodes files which map directly to evdev codes
This is a proof-of-concept for the long key names. The keycodes in the
file evdev-xkbcommon are autogenerated from linux/input.h, and uses the
names given there; all of the previous names are aliased to the new
names, so they continue to work with the symbols files, etc.

You can try it with 'sudo ./test/interactive -r evdev-xkbcommon -n 0'
The -n 0 means that we don't offset the evdev scan codes - just feed
them directly. The -r evdev-xkbcommon just means to use a new rules file
which makes us use the new keycodes file. (The only problem I can see is
with the MENU and LSGT names which has some conflicts).

Maybe some day xkeyboard-config could ship something similar, so that
the 8 offset is unneeded.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-27 21:41:54 +02:00
Ran Benita 32c19f4b44 keymap-dump: make it look better with long key names
Not worth messing around with too much, just make it legible.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-27 21:31:33 +02:00
Ran Benita 984ebf9838 test/interactive: allow to set evdev offset
If we want to test a keymap without the usual 8 offset.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-27 21:12:08 +02:00
Ran Benita 41a7fed3f8 Fix type of keycode in parser and ast
For some reason keycodes were listed under mapFlags in the yylval union.
Fix it and some sanity checks.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-27 21:12:08 +02:00
Ran Benita 3b389b15bf Don't limit key names to 4 characters
Currently you can't give a key in xkb_keycodes a name of more than
XKB_KEY_NAME_LENGTH (= 4) chars. This is a pretty annoying and arbitrary
limitation; it leads to names such as <RTSH>, <COMP>, <PRSC>, <KPAD>
etc. which may be hard to decipher, and makes it impossible to give
more standard names (e.g. from linux/input.h) to keycodes.

The purpose of this, as far as I can tell, was to save memory and to
allow encoding a key name directly to a 32 bit value (unsigned long it
was).

We remove this limitation by just storing the names as atoms; this lifts
the limit, allows for easy comparison like the unsigned long thing, and
doesn't use more memory than previous solution. It also relieves us from
doing all of the annoying conversions to/from long.

This has a large diffstat only because KeyNameText, which is used a lot,
now needs to take the context in order to resolve the atom.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-27 21:12:08 +02:00
Ran Benita 53cfe8c362 xkbcomp/keymap: use default interpret in ApplyInterpsToKey
This makes the code easier to follow and does more explicitly what the
xkblib spec says:
     If no matching symbol interpretation is found, the server uses a
     default interpretation where:
        sym =	0
        flags =	XkbSI_AutoRepeat
        match =	XkbSI_AnyOfOrNone
        mods =	0
        virtual_mod =	XkbNoModifier
        act =	SA_NoAction

If a level doesn't have any keysyms, we don't apply anything to it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-27 21:12:08 +02:00
Ran Benita 11df063265 state: add missing const in get_one_sym
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-27 21:12:08 +02:00
Daniel Stone 5aaf65b74e Add xkb_state_key_get_one_sym
The trivial wrapper around xkb_state_key_get_syms that every user to
date has implemented.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-27 23:27:49 +10:00
Daniel Stone 29a8b1ceac Fix size_t vs. %d warning
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-26 10:28:52 +10:00
Ran Benita cfa6d25cb5 symbols: get rid of autoType
The autoType variable is supposed to tell us whether the type was
explicitly specified by the user or was detected automatically according
to the keysyms. It then allows us to know whether to prints the type
when we dump the keymap to a string or not.

Right now it is not always set when we find an automatic type, according
to some apparently legacy rules. We change it to simply this: type
computed automatically? -> don't print.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-25 11:49:23 +02:00
Ran Benita 76478418bc symbols: separate type-finding logic from CopySymbolsDef
It's easier to follow this in isolation. Besides, previously the error
reporting wasn't done very well.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-25 11:35:59 +02:00
Ran Benita 5d2659267a keymap: remove some more unneeded macros
It clearer to just access the needed data directly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 14:57:30 +02:00
Ran Benita c955f8e2f9 keymap: store a pointer to the type in xkb_group instead of index
Gets rid of some more unneeded indirection, including the XkbKeyType
macro.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 14:41:09 +02:00
Ran Benita 01b00d7540 keymap, symbols: improve xkb_key memory layout
Add struct xkb_group and xkb_level for use in xkb_key, to mirror how
it's done in KeyInfo, GroupInfo, LevelInfo in symbols.c. This
corresponds more nicely to the logical data layout (i.e. a key has
groups which have levels), and also removes a lot of copying and ugly
code due to the index indirections and separate arrays which were used
before.

This uses more memory in some places (e.g. we alloc an action for every
level even if the key doesn't have any) but less in other places (e.g.
we no longer have to pad each group to ->width levels). The numbers say
we use less overall.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 12:46:51 +02:00
Ran Benita e44cd2e93b symbols: move keysyms into LevelInfo
Instead of maintaining a syms array in the GroupInfo + sym_index's in
the levels. This simplifies the code somewhat.
In order not to alloc for every level instead of every group, we only do
it if the level has more than one keysym (with a union). Since for now
this is a special case, it actually works out better memory-wise.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 12:33:06 +02:00
Ran Benita eaf9515229 symbols: fix index-out-of-bounds in FindAutomaticType
If we enter this branch, we have 3 <= width <= 4, so if the width is 3
than syms[3] is out of bounds.

Happily inherited from xkbcomp.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 10:19:02 +02:00
Ran Benita 504853de3b symbols: remove unneeded optimization
The levels will be resized to the number of levels of the type anyway,
so removing useless levels from the end here is unneeded.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:14:35 +02:00
Ran Benita e0573c766d keymap: use our type for keymap->enabled_ctrls
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 08:24:29 +02:00
Daniel Stone a8b6b08afb Add missing declaration for _xkbcommon_parse (aka yyparse)
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-24 14:36:46 +10:00
Ran Benita 1d47cbfc4a keymap.h: add note on why XKB_NUM_GROUPS is still there
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:13:32 +10:00
Ran Benita d941bc0c03 keymap, symbols: use darray for num_groups
Instead of using a static array of size XKB_NUM_GROUPS, because we want
to get rid of this limit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:13:32 +10:00
Ran Benita 79bbf6f758 symbols: avoid possible access-out-of-bound due to explicit_group
The code that handles group name statements currently does this:
    info->group_names[grp - 1 + info->explicit_group] = name;
Other than the fact that this addition makes no sense, it actually can
reach out of the bounds of the array (which is of size XKB_NUM_GROUPS)
in the (non-realistic) case where (grp - 1) is not 0 (i.e. the statement
is not name[Group1] = "foo").

We also change explicit_group to be XKB_LAYOUT_INVALID if not set
otherwise, instead of initializing it to 0; this is clearer and if
someone happens to write 'us:1' for some reason, it will discard the
other groups in the file as it should.

This entire explicit_group thing was clearly bolted on as an
afterthought.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:13:32 +10:00
Ran Benita 6d97d0ce5e symbols: rename SymbolsInfo groupNames to group_names
Just to match the matching field in the keymap.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:13:32 +10:00
Ran Benita 7a90f9e225 keymap: don't use XKB_NUM_GROUPS for key->kt_index
One unneeded XKB_NUM_GROUPS less.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:13:32 +10:00
Ran Benita 9a18b87251 Add format argument to xkb_keymap_get_as_string
This function really needs a format argument, for symmetry with the
keymap creation functions. If we add new formats, we will almost
certainly want to add support for serializing it into a string. It would
also allow to convert from one format to another, etc.

The in the common case, the user would just want to use the format she
used to create the keymap; for that we add a special
XKB_KEYMAP_USE_ORIGINAL_FORMAT value, which will do that (it is defined
to -1 outside of the enum because I have a feeling we might want to use
0 for something else). To support this we need to keep the format inside
the keymap. While we're at it we also initialize keymap flags properly.

This changes the API, but the old xkb_map_get_as_string name works as
expected so this is the best time to do this.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:13:32 +10:00
Ran Benita 5d31b9e3e7 Add return value the xkb_keysym_get_name
This is useful to see whether the function was successful and whether
truncation occurred.
It just changes void -> int so shouldn't break API or ABI.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:13:32 +10:00
Ran Benita 25b8384404 Improve API doxygen documentation
To make it look better and a bit more structured and informative.
Not all of the functions are converted to doxygen format, so this is not
finished.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:13:32 +10:00
Ran Benita 108fa1c793 Add support for building doxygen API documentation
Simple HTML docs generated from the doxygen comments.
After running 'make' or 'make doc', try firefox doc/html/index.html to
see it (if you have doxygen). It's also installed with 'make install'.
You can use --enable-docs or --disable-docs, or specifically
--with-doxygen or --without-doxygen (autodetected, default yes).

The docs are currently not distributed in the tarball, because I
couldn't make it work properly in all cases :/

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:13:32 +10:00
Ran Benita 0dd40125c5 API: add _context prefix to log-related functions
This is to follow the general scheme set by all of the other API
functions.
Since no one is using these functions yet, we don't (actually better
not) add the old names to xkbcommon-compat.h.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:54 +10:00
Ran Benita be3cbc993e keymap: remove XkbKeyGetKeycode
Because we keep the keycode inside the xkb_key now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:54 +10:00
Ran Benita 428c6f313f symbols: convert KeyInfo->groups to darray
Before it was a static array of size XKB_NUM_GROUPS.

The previous cleanups made this transition a bit easier. This is a
first step for removing the XKB_NUM_GROUPS hardcoded limit; but for now
we still check that the groups are < XKB_NUM_GROUPS (e.g. in
ResolveGroup and GetGroupIndex) until the keymap, etc. is worked out as
well.

This also makes us alloc quite a bit less (this is just rulescomp):
Before:
==51999==   total heap usage: 291,474 allocs, 291,474 frees, 21,458,334 bytes allocated
After:
==31394==   total heap usage: 293,595 allocs, 293,595 frees, 18,150,110 bytes allocated
This is because most rmlvo's don't use the full 4 layouts that KeyInfo
had always alloced statically before.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:54 +10:00
Ran Benita f671ce07ff symbols: fix memleak from default KeyInfo
If the default KeyInfo gets any keysyms or actions, it needs to be
free'd.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:54 +10:00
Ran Benita a12b5f6224 symbols: disallow changing global defaults from within a key statement
Pretty much like e5fdbcbb99, again it isn't used.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:54 +10:00
Ran Benita b70abcaf36 symbols: fold PrepareKeyDef into CopySymbolsDef
The function is big enough already but it's nicer to read sequentially.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:54 +10:00
Ran Benita 419a497554 state: missing XKB_EXPORT on xkb_state_key_get_level
And some error handling.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:54 +10:00
Ran Benita 70a82afa73 configure.ac: use XORG_TESTSET_CFLAG for -fvisibility=hidden
Probably shouldn't use CFLAGS for that but o well.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:54 +10:00
Ran Benita 18a433223e configure.ac: add XORG_MEMORY_CHECK_FLAGS
Adds some memory checking (e.g. MALLOC_PERTURB_) to tests.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:54 +10:00
Ran Benita 414007ca67 configure.ac: remove XORG_CHECK_MALLOC_ZERO
We don't use its result.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita 31c7427209 configure.ac: fix bug report url
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita 67b03cea0b state: correctly wrap state->locked_group and ->group
These values weren't wrapped before, which caused group_index_is_active
to stop working after a few group switches.

Also, the current group-wrapping function didn't take into consideration
actions such as LockGroup=-1, which need to wrap around, etc.
xkb_layout_index_t is unsigned, but it was used to hold possibly
negative values (e.g. locked_group is 0 and gets a -1 action).

This group wrapping function should now act like the XkbAdjustGroup
function from xserver, and at least ./test/interactive doesn't bring up
any problems with group switching any more.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita 7d1db12dbb state: separate group wrapping/clamping to a function
We'll need this function for wrapping our global effective group as
well.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita ed78fbcb30 state: special case effective group in layout_is_active
Currently, xkb_state_layout_{index,name}_is_active may report multiple
groups as effective, because at looks at base,latched,locked separately.
But there can only be one effective group, which is computed from the
other three. So if XKB_STATE_EFFECTIVE is requested, just compare to the
effective group we have computed.

We also modify mod_{index,name}_is_active similarly, just for symmetry
(there the effective mask is just an OR of the other three so the
current test is correct).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita a8b932a032 symbols: remove useless identical groups optimization
What this code does is, in case someone compile a keymap like -layout
'us,us,us' then only one group would be created. If there is anything
which differentiates between any of the groups (e.g. a variant, another
layout), then this is not done.
This is pretty obscure, only saves a few kbytes in the final keymap, and
if the user asked for it, why not let her?

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita 95b2344849 symbols: avoid reverse iteration in PrepareKeyDef
No need for that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita c174173209 Don't choke on RMLVO layout string with holes
This old rules parser gives the same kccgst here, so in the interest of
staying compatible we shouldn't fix it there. Similarly we shouldn't
touch ParseIncludeMap, so this is the best place to handle this.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita bbaa11c6e3 Rename map.{c,h} to keymap.{c,h}
Seeing as we don't like "map" anymore.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita 7dca986e3f state, map: check XkbKey != NULL where missing
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita debd62b59b Move xkb_state functions from map.c to state.c
Seems more appropriate.
Only change is to turn some xkb_state_get_map functions to direct
state->keymap.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita d206ecd9e3 Rename private xkb_map_new to xkb_keymap_new
To be consistent with the API rename.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Ran Benita fcd202909b Don't use xkbcommon-compat names in internal code
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-24 09:08:53 +10:00
Daniel Stone bf19408078 Promote keymap enumeration API to public
Rename the functions to get keysyms by key/layout/level to fit with the
recent public API renames, and expose them.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-24 09:08:53 +10:00
Daniel Stone 33a66515d6 API change: Rename xkb_map_* and group -> layout
Move xkb_map_* functions to xkb_keymap_*, xkb_key_* functions under
either xkb_keymap or xkb_state, and rename groups to layout in all
user-visible API.

Backwards-compatible hooks are provided, such that old source will
build, but silently mangled to the new names, and old binaries will
also continue to work.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-20 23:30:23 +10:00
Daniel Stone 005dee2bb6 Add _xkbcommon_ prefix to parser and lexer symbols
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-20 23:30:17 +10:00
Daniel Stone 80e156814d Add xkbcommon-compat.h and compat.c
So we can start renaming stuff while retaining backwards source and
binary compatibility.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-20 23:29:45 +10:00
Ran Benita 2c96828f75 test: add print-compiled-keymap tool
This just prints the compiled keymap string for to the given command
line arguments. This often useful when developing.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-19 16:56:26 +03:00
Ran Benita 6b66afc4e7 state: handle ACTION_LOCK_NO_{UN,}LOCK for mods
xkblib spec says:
    XkbSA_LockNoLock    If set, and the action type is XkbSA_LockMods,
                        the server only unlocks the action modifiers.
    XkbSA_LockNoUnlock  If set, and the action is XkbSA_LockMods,
                        the server only locks the action modifiers.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-19 15:56:07 +03:00
Ran Benita 9c2a5c6c61 xkbcomp/keymap: correct ACTION_MODS_LOOKUP_MODS handling
The xkblib spec says:
    If XkbSA_UseModMapMods is not set in the flags field, the mask,
    real_mods, vmods1, and vmods2 fields are used to determine the
    action modifiers. Otherwise they are ignored and the modifiers
    bound to the key (client map->modmap[keycode]) are used instead.

So we should just assign the modmap without considering what's there.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-19 15:23:35 +03:00
Ran Benita 9aee332e9f Fix a couple of mistakes from previous commits
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-18 17:31:55 +03:00
Rob Bradford de4098a024 keysym-utf8: Optimise the keysym to utf8 lookup
This change adds range checks based on the lowest keysym and highest keysym in
the table. This allows a quick check to be applied to identify if the keysym
is inside the table.

To really give value to this optimisation the table is split to have a
separate table for the keypad keysyms.

The test suite passes with this change.

Signed-off-by: Rob Bradford <rob@linux.intel.com>
2012-09-18 09:03:40 +10:00
Ran Benita ac872bdfc2 symbols: fix buffer overflow with illegal explicit group
Trying ''./test/interactive -l us:5' causes us to crash.

The <layout>:<N> syntax says to put this layout at the N'th level.
However the code (inherited from xkbcomp) doesn't check that the group
is valid, and then happily indexes keyi->groups with it, which has a
static size of XKB_NUM_GROUPS (the SetExplicitGroup function assumes the
index is valid). So any value a user might put there > 4 makes nice
things happen.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-17 14:30:16 +03:00
Ran Benita dbd7a95359 keyseq: add test for repeat-shift-repeat-unshift-repeat
e.g. hhhhhHHHHHHHhhhhhh with shift down and up in the middle.
Unfortunately trying a quick test with test/interactive is not possible
because the evdev soft-repeat stops the repeat when another key is
pressed. So you need real soft-repeat for that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-16 15:59:31 +03:00
Ran Benita b21107056e Organize src/ and test/ headers
- Add context.h and move context-related functions from xkb-priv.h to
  it.
- Move xkb_context definition back to context.c.
- Add keysym.h and move keysym upper/lower/keypad from xkb-priv.h to it.
- Rename xkb-priv.h to map.h since it only contains keymap-related
  definitions and declarations now.
- Remove unnecessary includes and some and some other small cleanups.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-16 15:20:18 +03:00
Ran Benita e670d084a6 include: improve file-not-found error reporting
Only report it once, and not only for rules.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-16 15:20:18 +03:00
Ran Benita 09a4f2ca89 keycodes: add KeyNameInfo
Instead of keeping the two files and names arrays.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-15 13:45:55 +03:00
Ran Benita b979a5e95e keycodes: rename computedMin/Max to min/max_key_code
min/max_key_code is more descriptive and matches the names of these
field in xkb_keymap.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-15 02:25:47 +03:00
Ran Benita 4b69d6f71d keycodes: ignore explicit minimum/maximum statements
These statements are pretty pointless for us; we don't restrict keycodes
like X does, and if someone writes e.g. maximum = 255 but only has 100
keys, we currently happily alloc all those empty keys. xkbcomp already
handles the case when these statements aren't given, and uses a computed
min/max instead. We should just always use that.
(Of course since keycodes/evdev currently uses almost all of the
keycodes in the range it declares, including 255, this doesn't save any
memory for the common user right now).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-15 02:09:34 +03:00
Ran Benita c53122cb96 symbols: remove useless grow_alloc of keys array
This just does a big, mostly too big, allocation to save about a dozen
malloc calls. Remove it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:53:27 +03:00
Ran Benita 9a27ac7253 state: use filter->priv instead of modifying the action
in xkb_filter_group_set_new.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:49 +03:00
Ran Benita 8098daa08f state: move filter initialization to the dispatcher
This removes all of the boilerplate from the *_new functions, and leaves
them just as simple functions which perform the effect of the action on state.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:49 +03:00
Ran Benita 2c19c9388b state: call xkb_filter_new from the dispatcher
Pass the new filter as a parameter instead of getting a new one in each
action function, and introducing a failure condition there.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:49 +03:00
Ran Benita 04f1b3be07 state: dispatch actions from a table
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:49 +03:00
Ran Benita 18a0ead587 Rename ACTION_TYPE_LAST to _ACTION_TYPE_NUM_ENTRIES
It's not really "last" per-se, and we use this other format in some
other enums.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:49 +03:00
Ran Benita 16425ffad9 state: don't keep the xkb_state in the filters
Just pass it as a parameter: to make state.c a bit less stateful.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:49 +03:00
Ran Benita c2570d51d1 state, map: constify references to xkb_key
Makes it clear that we treat the keys as immutible values in these
files.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:49 +03:00
Ran Benita 841f32230a state, map: use keycodes only for the API functions
The policy is now consistent: every API functions which recieves a
keycode should resolve it to an xkb_key first thing, and all the
internal functions use that instead of the keycode.
To facilitate it a bit, we move the KeycodeInRange check to XkbKey
itself, which returns NULL if the keycode is illegal.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:49 +03:00
Ran Benita 4d3d2ef004 rules: fix mmap failure handling
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:49 +03:00
Ran Benita 96c21e1577 Clean up Init/Clear functions
- The Clear* functions should just free the memory associated with the
  object. If the object is used again, it is Init'd again.
- s/Free/Clear if the actual pointer is not free'd.
- Zeroise object in Init and only initialize non-zero fields.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 21:09:48 +03:00
Ran Benita 7b5a1dd556 symbols: refactor CoypSymbolsDef
To make it easier to follow.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 00:07:55 +03:00
Ran Benita 4c16b39f31 symbols: FindAutomaticType only needs the context
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 00:07:55 +03:00
Ran Benita 8862fd8082 keyseq: test that de(neo) is working properly
This layout stretches us pretty well, so it's good for testing nothing
breaks. There are a couple of things that need looking into, though
(particularly the level5 issue).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-14 00:07:55 +03:00
Ran Benita dd6124ca07 symbols: store actions from symbols in the right offset
This regression was introduced in 93ce9c7d4f. This meant that actions
specified inside key {} statments were always going to the first group.
But actions are almost never specified in xkb_symbols so this wasn't
noticed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 21:09:48 +03:00
Ran Benita 898d6fd416 symbols: remove CopyKeyInfo
The code is better without it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 21:09:48 +03:00
Ran Benita 3abfe83e11 symbols: fix real/alias key merge ordering bug
Background:

The CopySymbolsDef has a comment on a couple of lines which supposedly
fixed a bug:

    /*
     * kt_index[i] may have been set by a previous run (if we have two
     * layouts specified). Let's not overwrite it with the ONE_LEVEL
     * default group if we dont even have keys for this group anyway.
     *
     * FIXME: There should be a better fix for this.
     */
    if (!darray_empty(groupi->levels))
        key->kt_index[i] = types[i];

But neither the comment nor the fix make any sense, because the kt_index
is indexed per group, i.e. each group gets its own type.
The original xkbcomp commit which added this (36fecff58) points to this
bug: https://bugzilla.redhat.com/show_bug.cgi?id=436626
which complains about -layout "ru,us" -variant "phonetic," not working
properly. And indeed when we try:
    sudo ./test/interactive -l ru,us -v
the first group doesn't get any syms for the main keys.

The problem (Clearly the fix above is useless):

The ru(phonetic) map is specified using aliases, e.g. LatQ, LatW instead
of AD01, AD02, etc. When combined with another layout which uses the
real names (AD01, AD02), the symbols code should recognize they are the
same key and merge them into one KeyInfo. The current code does that,
but it doesn't catch the case where the alias was processes *before* the
real one; so we get two KeyInfo's and the later one wins. So e.g. the
ru(phonetic) symbols are ignored.

The fix:

Before adding a new KeyInfo to the keys array, always replace its name
by the real name, which avoids the entire issue. Luckily this is done
pretty late so most error messages should still show the alias name.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 21:09:46 +03:00
Ran Benita 1d6bffc904 symbols: add CopySymbolsToKeymap
Like in the other sections.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:10 +03:00
Ran Benita 376e45eb6d symbols: remove mention of keycodes in CopySymbolsDef
Since now we only use the keycode in this function for logging, it's
better not to mention the keycode at all because the XkbKeyGetKeycode
macro is implemented using a dirty hack 0_0
The key name is sufficient to determine uniquely where to look.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:10 +03:00
Ran Benita 77ab928e92 symbols: remove unneeded recursion form CopySymbolsDef
This function does some funky stuff, which, as far as I can tell, was
needed to support the functionality of giving different keycodes the
same name and thus make them duplicates (MERGE_ALT_FORM). This stuff was
removed as useless in 0765064b3, but this leftover wasn't noticed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:10 +03:00
Ran Benita ce5dbeff60 symbols: add LevelInfo
Add a LevelInfo to hold a single array of level specific info inside
a GroupInfo, instead of keeping the acts, symsMapIndex and
symsMapNumEntries arrays and the numLevels field separate and in sync.
This simplifies the code, and goes a long way toward making  the
key-merging code somewhat understandable. Also uses less memory.

Note that the syms array is still in GroupInfo for now, with the levels
holding offsets into it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:10 +03:00
Ran Benita ca87031861 symbols: make xkb_key::syms a plain array
It's never resized.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:10 +03:00
Ran Benita ee3ade3924 symbols: shorten symsMapNumEntries to uint from size_t
size_t is too wide for this in 64-bit machines.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:10 +03:00
Ran Benita 3cfcbbab38 symbols: consolidate group merging in MergeGroups
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:10 +03:00
Ran Benita db45d664d3 symbols: add GroupInfo
GroupInfo keeps all of the info for a specific group in one struct.
This is the old array-of-structures vs. structure-of-arrays, but in this
case readability wins. It would also help with lifting the
XkbNumKbdGroups limit, because we only have to worry about one array
(instead of 6).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:10 +03:00
Ran Benita a9fa37396f keymap-dump: don't write spaces between multiple-syms-per-level
This can get a bit unwieldy.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:10 +03:00
Ran Benita 2a5b0c9dc1 symbols: use darray for ModMapEntry instead of list
There's no need for a list here.
[This also happens to be the last place list.h is used.]

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:09 +03:00
Ran Benita 886b0ca502 state: remove unused next field from xkb_filter
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-13 15:57:09 +03:00
Daniel Stone 2de55601d8 Update COPYING
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-12 16:58:57 +01:00
Daniel Stone b4b40d73ad Copyright updates
With Dan Nicholson's permission (via email), update his copyright and
license statements to the standard X.Org boilerplate MIT license, as
both myself and Ran have been using.

Clean up my copyright declarations (in some cases to correct ownership),
and add copyright/license statements from myself and/or Ran where
appropriate.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-12 16:58:54 +01:00
Daniel Stone 14cd8c79cd utils: Replace DEC copyright with Ran's
This is not something I do often, but I have good reason here ...

utils.h has been totally rewritten since import, and now contains no
original DEC content.  Everything in here has been added by Ran, and I
do not believe that any lingering content from previous iterations is
substantial enough as to be copyrightable.

Replace DEC's copyright (and license with hostile advertising clause)
with Ran's boilerplate copyright and license statement.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 17:00:38 +01:00
David Herrmann 095a7f4cf0 xkbcommon-keysyms: Add header protection
As there is currently no stable release of xkbcommon, other projects might
want to include a copy of the keysyms so they can be used even though
libxkbcommon may not be available on the machine. However, if xkbcommon.h
is still included, conflicts will occur. Hence, to avoid nasty hacks,
simply include a header protection in xkbcommon upstream.

[daniels: Added protection to Makefile.am's update-keysyms, as well as
          XKB_KEY_NoSymbol, and a comment noting that it shouldn't be
          updated directly.]

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 16:49:04 +01:00
Helio Chissini de Castro e9405fa20d Android.mk: Remove unnecessary for loop
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 15:11:35 +01:00
Daniel Stone 82de180ede Remove unused ExprResolveKeyName
The only user was removed in 314965b1.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 15:09:37 +01:00
Daniel Stone 14741800a8 Constify keysym <-> Unicode lookup table
Before:
  text     data     bss     dec     hex filename
234422    11288    2304  248014   3c8ce obj-amd64/.libs/libxkbcommon.so.0.0.0

After:
  text     data     bss     dec     hex filename
240694     5016    2304  248014   3c8ce obj-amd64/.libs/libxkbcommon.so.0.0.0

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 14:52:27 +01:00
Pekka Paalanen 517c7ed75c xkbcommon.h build fix for missing stdarg.h
In file included from external/collabora/libxkbcommon/src/xkb-priv.h:87,
                 from external/collabora/libxkbcommon/src/xkbcomp/xkbcomp.h:30,
                 from external/collabora/libxkbcommon/src/xkbcomp/xkbcomp-priv.h:30,
                 from external/collabora/libxkbcommon/src/xkbcomp/action.h:30,
                 from external/collabora/libxkbcommon/src/xkbcomp/action.c:27:
external/collabora/libxkbcommon/xkbcommon/xkbcommon.h:279: error: expected declaration specifiers or '...' before 'va_list'

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-09-11 14:32:58 +01:00
Daniel Stone 9e6ff7bb2a Update Android.mk
Squashed from commits by Helio Chissini de Castro
<helio.chissini.de.castro@collabora.co.uk> and Pekka Paalanen
<ppaalanen@gmail.com>.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 14:27:54 +01:00
Daniel Stone 28bd10cee7 kbproto unentanglement: drop dependency
\o\ \o/ /o/

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 14:10:41 +01:00
Daniel Stone fa1ea9a5bf kbproto unentanglement: XkbGeomPtsPerMM
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 14:09:20 +01:00
Daniel Stone e60e9523c6 kbproto unentanglement: XkbExplicit*Mask
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 14:05:42 +01:00
Daniel Stone 2eab7efc13 kbproto unentanglement: XkbSI_AutoRepeat
That was the only interp flag, so just turn it into a straight boolean.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 12:32:18 +01:00
Daniel Stone a8d462e366 kbproto unentanglement: XkbSI match flags
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 12:28:29 +01:00
Daniel Stone ed9fd5beb0 kbproto unentanglement: control actions
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-11 12:20:21 +01:00
Daniel Stone 6573aca0b2 kbproto unentanglement: XkbMaxShiftLevel
... by removing its only use.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 21:05:17 +01:00
Daniel Stone 32bf405376 kbproto unentanglement: Xkb{Wrap,Clamp,Redirect}IntoRange
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 21:02:49 +01:00
Daniel Stone 461f8a7697 actions: Remove PointerDefault affect field
This was always set to affect the default button, so no need for it.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 20:40:32 +01:00
Daniel Stone 70c775f69d kbproto unentanglement: action flags
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 20:38:46 +01:00
Daniel Stone b6e0457195 kbproto unentanglement: XkbLC_*
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 20:16:05 +01:00
Daniel Stone 830fe67132 kbproto unentanglement: XkbIM_*
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 20:07:54 +01:00
Daniel Stone 0b2506db12 kbproto unentanglement: action types
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 19:23:36 +01:00
Daniel Stone 314965b1f0 Remove deprecated actions
We didn't do anything with ISO_Lock, ActionMessage, RedirectKey, and the
device-specifying variants of the pointer actions, so remove those.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 19:23:35 +01:00
Daniel Stone b04d896ab2 kbproto unentanglement: XkbNumVirtualMods
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 19:23:35 +01:00
Daniel Stone 74ec4c1c3f kbproto unentanglement: XkbNumIndicators
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 19:23:35 +01:00
Daniel Stone 4b8ceae91f kbproto untanglement: XkbKbdNumGroups
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 19:23:35 +01:00
Daniel Stone f5dffd2b6e kbproto untanglement: XkbKeyNameLength
Define it ourselves as XKB_KEY_NAME_LENGTH and use that, instead of the
one from XKB.h.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-09-10 18:26:20 +01:00
Ran Benita 3b6b214c78 rules: use goto instead of state variable
There's no noticeable speed difference, but I think it's nicer and more
explicit than the previous code. Some people just don't like goto,
though..

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-05 16:37:43 +03:00
Ran Benita 0071227e7f rules: rewrite
Rewrite the rules file parser for clarity, performance and memory usage
reduction. The previous implementation was quite hard to navigate and
did a lot of unnecessary work and copying.
This implementation keeps along just the state necessary, and doesn't
perform any copying of the file's content (although the entire file is
mmap'ed as before). Hopefully it's also easier to understand, has better
documentation, and better error checking and reporting. We try to
reproduce the previous behavior in every case.

Note: the diff is pretty confusing; it's likely better to look at the
file directly.

Benchmarks:
    On an old 32-bit Intel processor.
    gcc -O2 -pg
    ./test/rulescomp bench
    grof test/rulescomp

    Before:
        compiled 1000 keymaps in 14.863564304s
        %   cumulative   self              self     total
        time   seconds   seconds    calls  ms/call  ms/call  name
        49.33      4.43     4.43 30610000     0.00     0.00  yylex
        17.93      6.04     1.61    31000     0.05     0.22  yyparse
        6.57      6.63     0.59     1000     0.59     0.59  load_rules
        3.23      6.92     0.29  3637000     0.00     0.00  AppendStmt
        2.45      7.14     0.22   472000     0.00     0.00  AddKeySymbols
        2.12      7.33     0.19  3591000     0.00     0.00  atom_intern
        2.12      7.52     0.19   518000     0.00     0.00  FindNamedKey
        2.00      7.70     0.18   230000     0.00     0.00  FreeStmt
        1.78      7.86     0.16     1000     0.16     0.17  UpdateModifiersFromCompat
        1.34      7.98     0.12   732000     0.00     0.00  AddKeyName
        1.34      8.10     0.12                             __x86.get_pc_thunk.bx

    After:
        compiled 1000 keymaps in 13.874666269s
        %   cumulative   self              self     total
        time   seconds   seconds    calls  ms/call  ms/call  name
        49.82      4.26     4.26 30610000     0.00     0.00  yylex
        22.22      6.16     1.90    31000     0.06     0.22  yyparse
        2.92      6.41     0.25  3591000     0.00     0.00  atom_intern
        2.57      6.63     0.22     1000     0.22     0.25  xkb_components_from_rules
        2.11      6.81     0.18  3637000     0.00     0.00  AppendStmt
        2.11      6.99     0.18   230000     0.00     0.00  FreeStmt
        1.99      7.16     0.17   518000     0.00     0.00  FindNamedKey
        1.99      7.33     0.17     1000     0.17     0.17  UpdateModifiersFromCompat
        1.99      7.50     0.17                             __x86.get_pc_thunk.bx
        1.52      7.63     0.13   150000     0.00     0.00  AddInterp
        1.40      7.75     0.12   472000     0.00     0.00  AddKeySymbols

    On a newer 64-bit Intel processor.
    gcc -O2
    ./test/rules-file bench

    Before:
        processed 20000 times in 15.940546625s

    After:
        processed 20000 times in 5.295026345s

Allocations:
    gcc -O2
    valgrind test/rulescomp

    Before:
    total heap usage: 257,519 allocs, 257,519 frees, 14,766,529 bytes allocated

    After:
    total heap usage: 240,756 allocs, 240,756 frees, 14,007,886 bytes allocated

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-05 16:37:02 +03:00
Ran Benita 54d1d5ed5a compat: make LEDInfo a wrapper around xkb_indicator_map
instead of duplicating the fields. The same is done in SymInterpInfo
which wraps xkb_sym_interpret.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-05 13:47:46 +03:00
Ran Benita 5f613988c8 Fold keymap->indicator_names into keymap->indicators
This makes sense, since giving a name to an indicator 'activates' the
indicator_map in that index.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-04 17:20:46 +03:00
Ran Benita af2a8b3a37 Unify some string tables from xkbcomp, text and keymap-dump
We move the LookupEntry struct from expr.h to text.h, along with most of
the lookup tables. This makes them available everywhere.
Looking up a value in the LookupEntry format is slower than direct index
mapping, but it allows multiple names per value (with the canonical one
being first) and "all"- and "none"-type masks. These functions are not
used anywhere efficiency matters.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:13 +03:00
Ran Benita 7ae0c6bac4 Convert rest of names in xkb_keymap back to atoms
These were kept as atoms, but since the keymap was exposed in the API,
we converted them to strings; no the keymap is no longer exposed, so we
can go back to atoms. They make the keymap smaller (at least on 64-bit
machines) and the comparisons faster.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:13 +03:00
Ran Benita 1a9968839e expr: make ResolveString return an atom
Almost all callers do xkb_atom_intern on the currently returned string,
while ResolveString converts the atom to the string to begin with...
uselss double work.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:13 +03:00
Ran Benita 7aa31097bf atom: add xkb_atom_lookup
This will only lookup the string and return the atom if found; it will
not intern it if not. This is useful when e.g. getting a string from the
user (which may be arbitrary) and comparing against atoms.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:13 +03:00
Ran Benita 651e1dab04 atom: separate lookup logic from atom_intern
This would allow us to add a non-interning xkb_atom_lookup function.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:13 +03:00
Ran Benita f205d0f9b6 atom: make type and name of the 'a' field clearer
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:13 +03:00
Ran Benita 1aa6e2b1e2 test/rules-file: add benchmark
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:13 +03:00
Ran Benita 480f919d77 test: add rmlvo-to-kccgst tool
For a quick look at what components result from the rules.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:13 +03:00
Ran Benita 7f04ffc4d3 rules: fix check for appending '|' character when applying
There are two ways to separate multiple files in XKB include statements:
'+' will cause the later file to override the first in case of conflict,
while '|' will cause it augment it (this is done by xkbcomp). '!' is
unrelated here.
Since '|' is practically never used, this wasn't noticed.

In the modified test, the '|some_compat' previously was just ignored.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita 41472822b6 Use XKB_MOD_INVALID instead of XkbNoModifier
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita 300f3fb1e0 Don't printf NULL strings
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita bce90d5b2c xkbcomp: add debug messages of the RMLVO and KcCGST
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita 8e6fce9b22 include: document ParseIncludeMap better
The format of the include statment is not explained anywhere, the code
is confusing and the comments misleading. Try to explain it better.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita 2a026f6f72 test/data/symbols: keypad can only have one default section
Avoids a warning, from xkeyboard-config:

commit 6676053f2c93596c2aaa9905151a5c76355a1540
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Jun 29 09:53:45 2012 +1000

    symbols: keypad can only have one default section

    Warning:          Multiple default components in keypad
                      Using x11, ignoring pointerkeys

    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita 799cc064d3 include: properly use the default map if none is found
For some reason this piece of code wasn't copied from xkbcomp, which
causes all of the warnings like these:
Warning:       No map in include statement, but "pc" contains several; Using first defined map, "pc105"

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita f3c4032f35 Set log level for tests through env, not directly
This way the test logs have all the information, but we don't get eye
bleed every time we run them manually. One can always use
TESTS_ENVIRONMENT (we correctly use AM_TESTS_ENVIRONMENT now), or set
the envvars from the shell.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita 8d7d9792d1 log: replace "priority" by "level" everywhere
Now that we don't use syslog, "level" does sound more commonplace. We
should change it while there is still nobody using it.
Also leave some space between the integers of the xkb_log_level enum
values, if we ever need to shove more in between.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita 95d4fb9e4b action: fix LookupEntry for "lockdevbtn"
xkbcomp has that bug as well, guess no one uses it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:31:12 +03:00
Ran Benita 7e0c49e084 action: remove redundant check
The NoAction handler always errors out with the same message.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:25:20 +03:00
Ran Benita 87bfd97333 action: keep array of default actions, instead of list of changes
The implementation of changing the default properties of actions, e.g. a
statements such as (from test/data/compat/basic):
    setMods.clearLocks= True;
    latchMods.clearLocks= True;
    latchMods.latchToLock= True;
works by keeping a list of ActionInfo's, each containing the neccesary
info from each statement, and then when some action comes up (e.g. in an
interpret statment) it goes through the list, and applies the relevent
ActionInfo's to the newly-constructed xkb_action.

Instead of doing this, we add a struct ActionsInfo, which contains an
array of xkb_actions, one for each type. When a default changing
statement appears, we change the action in the array; when a new action
comes up, we just copy from the array. This is simpler to figure out,
and pretty straightforward.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:25:20 +03:00
Ran Benita 4ca85c7b3b action: disallow setting an action_field default for all types
Currently where it is possible to write:
    setMods.clearLocks = True;
It's also possible to write:
    action.clearLocks = True;
This will set the default value for the clearLocks action field for
*all* action types, as opposed to just setMods in this case. If
subsequently an action is used for which this field does not make sense,
it will error out.
This doesn't make any sense, because any given field is only possible by at
most 3 or 4 action types... which you might as well write explicitly and
avoid the side effect mentioned above.
Needless to say this is one of xkbcomp's "hidden features" and is not
used anywhere; remove it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:25:20 +03:00
Ran Benita ba9f66bda3 action: clean up formatting of extern functions
Make it a bit easier to understand what they do.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:25:20 +03:00
Ran Benita 1736e7daad types: don't strdup a default name
None of the other files does that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:25:20 +03:00
Ran Benita 149e1b2f0d types: use darray for KeyTypesInfo instead of list
Simpler, uses less memory and more efficient.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:25:19 +03:00
Ran Benita 8654d36e7a types: remove outdated comments
The code is pretty straightforward now...

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:25:19 +03:00
Ran Benita db639be6df keymap: optimize FindInterpsForKey a bit
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:25:19 +03:00
Ran Benita 872e15e52c keymap: refactor ApplyInterpsToKey
There's really not much to explain what the function used to do there...

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-03 10:13:42 +03:00
Ran Benita 8c1b1b0e9e Add xkbcomp/keymap.c and move some code there
Add CompileKeymap to do most of what compile_keymap_file does now, and
move UpdateKeymapFromModifiers along with it from (mostly unrelated)
compat.c.
Also rename UpdateKeymapFromModifiers to UpdateDerivedKeymapFields,
because it does more than update the modifiers.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 591df1156d Move enum xkb_file_type to xkbcomp/ast.h
This is a more suitable place for this enum, since it's internal to
xkbcomp.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita efc2d74141 xkbcomp: clean up compile_keymap function
We make the xkb_file_type enum sequential instead of masks, and then
we don't have to repeat the file types several times in the function.
Makes the code cleaner.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 82491d5fd1 map, state: check for KeycodeInRange only in API functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 06d7803a6d state: fix mod_names_are_active
This function was always returning -1.
Adding a test, we see that test/state.c treat the is_active functions as
returning booleans, which would treat -1 as success, so we test for > 0
instead (most users would probably get this wrong as well...).
Also update the documentation for the are_active functions, and add a
ATTR_NULL_SENTINEL for gcc __attribute__((sentinel)).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 9f0c016063 state: fix type confusion within xkb_state_update_mask
idx should be xkb_mod_index_t, while mod is the mask.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita ae576e85b7 state: remove unneeded optimization
The code that follows does exactly that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita a45b7d7559 state: light indicator when either condition is satisfied
For the indicator to be set, it is sufficient for at least one of the
group, modifier, or control state to match; this is in line with the
xkblib spec, section 8.2 and ComputeAutoState() in xserver/xkb/xkbLEDs.c
(though the xserver implementation differs from the spec on some
points...).

This also adds a tiny optimization to skip the entire check if the mask
is empty.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita d1b476a387 state: fix led_update_all group mask calculation
The one above uses which_mods, this one should use which_groups.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 9ba5ac0ec0 keycodes: remove outdated comments
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita bebad402e4 keycodes: use darray for aliases instead of list
Uses slightly more memory, but worth it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 518aff6d7b keycodes: use array for indicator names instead of list
Using a simple array here to mirror keymap->indicator_names makes much
more sense, and is simpler.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita be78b8264d keycodes: ignore "virtual" in indicators
The distinction between real/virtual indicators is useless for us, we
can just ignore it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 4c56d4d9c0 symbols: call deinit functions Clear instead of Free
Everywhere else Free is reserved for when the argument is free'd as
well.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 2eba51c0f6 symbols: remove comparison of unsigned >= 0
clang warning.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 3d305bd0cb vmod: remove outdated comments
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita b3aced7e22 vmod: ClearVModInfo doesn't need the keymap
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita ab1566cd6b vmod: remove useless keymap initialization
keymap->vmods is not touched until UpdateModifiersFromCompat,
where it initialized and used.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita f410622b4b vmod: remove support for resolving integer to virtual modifier
This is only relevant to the virtualModifier= statement in interpret
statements in xkb_compat. The current code allows to write e.g.
    virtualModifier = 4
to get the virtual modifier whose index happens to be 4 (possibly
declared in other files or sections, i.e. xkb_types). Doing this is
undeterministic, will break without notice, and not used anywhere.
Don't allow it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita d3ddcf70e8 expr: move op_type/value_type_to_string functions to ast
Generally the enum-to-string function should appear where the enum is
defined.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita b9c87eb710 vmod: remove support for direct vmod -> real mod mapping
The current code supports statements such as:
    virtual_modifiers NumLock = Mod2;
This would set the mapping from the NumLock vmod to the Mod2 real mod
directly, without going through the virtualModifier field in an
interpret statement (in xkb_compat) or vmods field in a key statement
(in xkb_symbols).

This is undocumented, unused and complicates things, so remove it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita eaa50c450b xkbcomp: seperate keymap-copying code from Compile functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:09 +03:00
Ran Benita 6738d30036 compat: only compute 'bool report' once
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 19:17:08 +03:00
Ran Benita e5fdbcbb99 compat: disallow changing global defaults from within an interpret
It's currently possible to write something like this:
    interpret Num_Lock+Any {
        virtualModifier = NumLock;
        action = LockMods(modifiers=NumLock);
        !indicator.allowExplicit;
    };
The final statement has the same effect as writing it in the global file
scope, which changes the default indicator (which all subsequent
indicators start off as). This very strange and also unused; if someone
does it he probably expects it to affect only the local scope, and he
might then get unexpected behavior. So don't allow it.

Also, HandleInterpVar is clearly a misnomer (as it can also change
indicator defaults) so rename it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 18:53:01 +03:00
Ran Benita c9466b32df compat: use darray instead of list for interps
No need for a list here.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 18:53:01 +03:00
Ran Benita 8c6694fd58 compat: remove "flags" field from xkb_indicator_map
We don't set this field any more.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-02 18:52:46 +03:00
Ran Benita 6e676cb7d8 compat: ignore "allowExplicit" in indicator statements
Using !allowExplicit sets the XkbIM_NoExplicit flag of the indicator,
which means that an XKB client cannot change the state of the indicator
using e.g. XkbSetNamedIndicator().
We do not support changing the state of an indicator; furthermore doing
it is probably only useful in conjunction with led-drives-keyboard
behavior, which we also do not support. This is because setting an
indicator without led-drives-keyboard would make the indicator and the
modifier/group it's bound to to get out of sync.

We can re-add this if we need this info.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:47 +03:00
Ran Benita d573600da0 compat: ignore "ledDrivesKbd" in indicator statements
We don't support it, as mentioned in the README, so we should stop
processing it and print a message about it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:47 +03:00
Ran Benita 9de067aad4 compat: ignore "group" (compatibility) statements
Group compatibility statements are like the following:
    group 3 = AltGr;
This currently results in:
    keymap->groups[2].mask = <real mod mapped from AltGr vmod>
And we don't do any thing with this value later. The reason it exists in
XKB is to support non-XKB clients (i.e. XKB support disabled entirely in
the server), which do not know the concept of "group", and use some
modifier to distinguish between the first and second keyboard layouts
(usually with the AltGr key). We don't care about all of that, so we can
forget about it.

One artifact of this removal is that xkb_map_num_groups no longer
works, because it counted through keymap->groups (this wasn't entirely
correct BTW). Instead we add a new num_groups member to the keymap,
which just hold the maximum among the xkb_key's num_groups. This also
means we don't have to compute anything just to get the number of
groups.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:47 +03:00
Ran Benita 7f75502f18 compat: get rid of BindIndicators
Now that 1fba6189e67 removed support for binding indicator maps by index
instead of name, we can remove some more magic which happens now: if an
indicator map specifies an indicator name which was not previously
declared in a 'indicator 5 = "Caps Lock"'-like statement in
xkb_keycodes, we can just look at the next free index and assign it.

This also allows us to use a darray for the LEDInfo's instead of a list.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:47 +03:00
Ran Benita 02de2a3e74 compat: ignore "index" field in indicator statements
The current code allows to set the "index" field in an indicator
statment's body. This would bind the indicator to the specified index,
instead of by name (which was declared previously in xkb_keycodes).
Doing this is a bad idea, for the same reasons as in 3cd9704, and is
also happily not used anywhere.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:46 +03:00
Ran Benita 65c4a71731 compat: remove dead NoAutomatic code
The xkblib spec, table 7.1 (indicators), says:
XkbIM_NoAutomatic: Xkb does not automatically change the value of the
                   indicator based upon a change in the keyboard state,
                   regardless of the values for the other fields of the
                   indicator map.

xkbcomp (the real one) never actually implemented a way for an indicator
statement to set this flag, so it's just dead unused code. We definitely
don't want to implement it ourselves, so remove any mention of it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:46 +03:00
Ran Benita 16f2de8bf0 compat: ignore "locking" field in sym interprets
This field is used in conjunction with key behaviors, which we don't
support since c1ea23da5. This is also unused in xkeyboard-config.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:46 +03:00
Ran Benita e9aa84f311 compat: small changes
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:46 +03:00
Ran Benita 4fec91cbbc compat: add general overview
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:46 +03:00
Ran Benita 79a2cc09cc action: convert action field type to enum
We can also hide the ActionInfo definition inside action.c.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:46 +03:00
Ran Benita 8f1ee62904 types: add "Effects on keymap" to overview
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:59:46 +03:00
Ran Benita 7ef359def1 rulescomp: remove bad failtests
Since we now handle empty model/layout, the last couple of tests should
not fail. The reason they do is bacause they try to use a non-existent
"base" rules file. When the file is brought in these tests do not fail.
Since we already test for non-existent rules file, we can remove them,
and refine the other tests a bit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:58:10 +03:00
Ran Benita cdc228eaf6 Organize xkbcomp/ header files
Various non-functional changes:
- Re-add keycodes.h and move some stuff there.
- Add parser-priv.h for internal bison/flex stuff.
- Don't include headers from other headers, such that file dependencies
  are immediate in each file.
- Rename xkbcomp.h -> ast.h, parseutils.{c,h} -> ast-build.{c,h}
- Rename path.{c,h} -> include.{c,h}
- Rename keytypes.c -> types.c
- Make the naming of XkbFile-related functions more consistent.
- Move xkb_map_{new,ref,unref} to map.c.
- Remove most extern keyword from function declarations, it's just
  noise (XKB_EXPORT is what's important here).
- Append XKBCOMP_ to include guards.
- Shuffle some code around to make all of this work.

Splitting this would be a headache..

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:58:10 +03:00
Ran Benita 3634b1565e Allocate xkb_component_names on stack
Instead of malloc'ing it as well. Also improve the error handling.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:58:10 +03:00
Ran Benita e535352828 Move ISEMPTY to utils.h
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-09-01 10:58:10 +03:00
Daniel Stone f491285a5f Move 'no symbols defined for ...' message to a warning
Shut up shut up shut up shut up shut up shut up.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-11 18:17:00 +02:00
Ran Benita ec2172f31b Combine a couple of macros
Easier to see what it does without the trivial macros.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 22:49:46 +03:00
Ran Benita 4c34bda15a action: get rid of xkb_any_action
And use union xkb_action instead. We add xkb_private_action, which is
the same as xkb_any_action, but only used where the intention is clear.
This should take care of whatever sizing changes the action struct might
have.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 22:42:17 +03:00
Ran Benita 600caac33a Remove XkbKeyTypeIndex and widen index type
We don't need the macro, and using char for the kt_index is imaginably
too small.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 22:06:12 +03:00
Ran Benita 87dff888ab Store actions inside struct xkb_key
Cuts out a lot of useless redirection and space.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 21:54:33 +03:00
Ran Benita 7bcc5fabbd keycodes: save context in Info, not keymap
We don't need the keymap in this case, just makes things more verbose.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 13:49:20 +03:00
Ran Benita 0cc5ae33b5 Remove xkbcomp/misc.c
The KeyName functions are more appropriate in keycodes.c.
The ProcessIncludeFile can go to path.c along with the other functions
dealing with includes.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 13:49:20 +03:00
Ran Benita f7c9d749d3 Remove left over keycodes.h
For some reason we still track this file in git even though we don't use
it any more.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 13:49:20 +03:00
Ran Benita 34e690ceeb Remove AutoKeyNames feature
If this keymap flag is set, whenever a key name appears in one of the
sections which does not exist (i.e. has not been declared in keycodes),
it finds the first unused keycode and attaches it that name.

This might have been useful when you could compile the symbols section
or geometry section without a keycodes section, but we don't support
this anymore. It's also pretty useless for any real work, because the
user has no way of knowing the keycode and so it will never be used.
Finally the only obscure way left to set this flag is by including a
keycodes file called "computed".

Just remove it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 13:49:20 +03:00
Ran Benita ef518a10af map: share some code
Make more extensive use of get_entry_for_key_state, and add
key_get_consumed to use in the other consume functions.

There's also a slight change in the consumed mods calculations, where
we use entry->mods.mask instead of type->mods.mask. The original was
copied from what libX11 does but what we do now is more logically
correct. The result is exactly the same though because:
type->mods.mask ⊇ entry->mods.mask ⊇ entry->preserve.mask

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 13:49:19 +03:00
Ran Benita 75853ed66b Use XKB_{GROUP,LEVEL}_INVALID instead of -1 for errors
The group/level types are unsigned, so it's odd to return -1 for them.
Instead use their invalid values (which happen to be == -1).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 13:45:58 +03:00
Ran Benita 6d61e39d20 state: use global static const for fake action
Requires constifying some arguments.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 13:45:58 +03:00
Ran Benita 07b18bde17 Modernize struct xkb_mods
Currently xkb_mods has the following members:
- uint8_t real_mods - 8 X11 core mods
- xkb_mod_mask_t vmods - 16 virtual mods, zero-based index
- xkb_mod_mask_t mask - the computed effective *real* modifier mask,
  basically a cache for the first two which is:
  real_mods | real mods computed from vmods

Our API acts on masks which combine the real_mods and vmods into a
single value, which is:
8 first bits real mods | 16 next bits virtual mods
(XkbNumModifiers = 8, XkbNumVirtualMods = 16). This is also the format
which ResolveVModMask uses (which is where all the modifier masks really
"come from", e.g. "Shift+Lock+Level5" -> xkb_mod_mask_t).

What the code does now after getting the mask from ResolveVModMask, is
to break it into real part and virtual part and store them seperately,
and then join them back together when the effective mask is calculated.

This is all pretty useless work. We change xkb_mods to the following:
- xkb_mod_mask_t mods - usually what ResolveVModMask returns
- xkb_mod_mask_t mask - the computed mask cache
And try to consistently use the word "mods" for the original,
non-effective mods and mask for the effective mods (which can only
contain real mods for now, because things break otherwise).

The separation is also made clearer. The effective masks are computed by
UpdateModifiersFromCompat after all the sections have been compiled;
before this the mask field is never touched; after this (i.e. map.c and
state.c) the original mods field is never touched. This single execption
to this rule is keymap-dump.c: it needs to print out only the original
modifiers, not computed ones. This is also the reason why we actually
keep two fields instead keeping one and modifying it in place.

The next logical step is probably to turn the real mods into vmods
themselves, and get rid of the distinction entirely (in a compatible
way).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-10 13:45:58 +03:00
Ran Benita 45cd92b4d3 Fix xkb_keymap::vmods type
It maps a vmod to a mask, of course.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-09 02:33:51 +03:00
Ran Benita 41478b4309 types: don't compute effective masks here as well
After compiling all of the sections, UpdateModifiersFromCompat does all
of the vmod -> real mods translations, including types/kt_entries.

keytypes.c also has code that does that, but it's unneeded:
- Later sections don't look at their effective masks, so doing it later
  is fine.
- When this code is executed, the vmods -> real mods mapping is empty
  (that is set up later), so VModsToReal has no effect here.
So we can just remove it.

However UpdateModifiersFromCompat didn't update the preserve mask, so do
that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-09 01:57:17 +03:00
Ran Benita fafc1132d2 types: get rid of PreserveInfo
We don't need the indirection. We store the preserve mask directly in
the entry, and create a new one if it doesn't exists (which is exactly
what the current code does in a roundabout way).

Incidentally this fixes a bug where the effective modifier mask of the
entries' preserve[] wasn't calculated, so the virtual modifiers had no
effect there.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-09 01:57:11 +03:00
Ran Benita 0f1ca360f1 keymap-dump: use VModMaskText
The difference between the two are irrelevant here.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-09 01:55:59 +03:00
Ran Benita 5a51ce8b36 Fix warning
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-09 01:55:30 +03:00
Daniel Stone 2f1f1bca5b Add xkb_map_mod_mask_remove_consumed
A fairly simple helper which, given an xkb_mod_mask_t, removes all
modifiers which are consumed during processing of a particular key.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:31 +02:00
Daniel Stone 5e276adb92 Add xkb_log_level enum rather than using syslog
Instead of relying on people including syslog.h, add our own
XKB_LOG_LEVEL_* defines.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:31 +02:00
Daniel Stone ba8458a9fd Increase log verbosity in tests
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:31 +02:00
Daniel Stone d5f725f69a Rules: mmap() rules file instead of using getc()
Good for a small performance win on my system.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:31 +02:00
Pekka Paalanen 3199ea7383 android: add build files
squashed: android: set xkb config path

Conflicts:
	Makefile.am
2012-08-08 16:23:31 +02:00
Daniel Stone 93f6517cd0 stringcomp: Make test more punishing
Recreate the old test/dump scenario, where we test the following map:
  - rules: evdev
  - model: pc104
  - layout #1: us
  - layout #2: ru
  - layout #3: ca(multix)
  - layout #4: de(neo)

This is ever so slightly altered from the xkbcomp output; running the
following:
setxkbmap -rules evdev -model pc105 -layout us,ru,ca,de -variant
,,multix,neo -print | xkbcomp -xkb - -

will give you a map with RCTL added to the modifier_map for both Control
and Mod3.  Running the output through xkbcomp -xkb - - again, will give
you RCTL only added to Mod3.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:31 +02:00
Daniel Stone e756e9b532 test/dump: Remove superfluous test
No longer necessary now we have stringcomp doing a full round-trip test
for us.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone fb4d3aefc3 test/stringcomp: Perform full round-trip test
We now pass! \o/

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 6701fb5fe5 stringcomp: Remove unnecessary Level1 mappings
As a map will implicitly go to level one unless explicitly mentioned
otherwise, remove all explicit =Level1 mappings, except for those with
preserve entries.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 5968c5e6a8 Always have at least one level in types
The ONE_LEVEL definition from xkeyboard-config doesn't specify any
actual levels, but there's an implicit (anything unmatched) -> Level1
rule.  Given this, each type actually has at least one level, whether or
not it specifies anything.

Fixes stringcomp.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 28733c54f9 IncludeStmt: Remove useless 'path' member
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 4bb8b6b1cf Remove unused vmodmask calculation
This was basically an open-coded VModsToReal, which we were using in the
line immediately below.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 6021a9762b test: Minimise includes
Mostly from functions which used to use file functions directly, but now
use test.h wrappers.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 39da9274a7 stringcomp: Update input file for output changes
Bring the input file into line with recent changes to the dump output,
so we're as close as we can get to a round trip.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone ce2e4899b5 test: Add extremely rudimentary include path test
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 8fe2a484c0 Rename xkey test to keysym
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 42b2c93433 Print failed include paths on failure to find rules
Thus giving a hint as to which directory we're trying to find.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 226cb22c80 Move xkb_context struct to xkb-priv.h
So we can print more intelligent debugging messages without needing
helper functions for the failed_includes array.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 3e8370b028 context: Maintain list of failed include paths
Keep around a list of paths we tried to add but couldn't.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 53e2db6ba9 More useful error message on failing RMLVO -> KcCGST
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 41d97df951 Move more of xkb_map_new_from_rmlvo into compilation
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 5cf4f51044 Staticise xkb_map_new_from_kccgst
We didn't expose this to the outside world, and its only trivial user
was xkb_map_new_from_rules.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 16:23:30 +02:00
Daniel Stone 1eda9e44b1 test: Use test_compile_*() in interactive
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 13:30:24 +02:00
Daniel Stone 04253fb2eb Add support for default rules/model/layout
Right now it just comes from build-time, but eventually this should be
sourced from configuration files at runtime too.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 13:30:24 +02:00
Daniel Stone 055b303493 tests: Fix uninitialised-use-of-'ret' warning
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 13:30:24 +02:00
Daniel Stone 3f0169424f test: Use test_get_context() in interactive
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 13:30:24 +02:00
Daniel Stone 26c01d3bb4 Warning fixes
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-08-08 13:30:24 +02:00
Ran Benita 1a930bf256 Add API to query whether a modifier is consumed
Currently the user has no way of knowing which of the active modifiers
have been used in the translation of a keycode to its keysyms. The use
case is described in the GTK docs: say there's a menu accelerator
activated by "<Alt>+". Some layouts have "+" shifted, and some have it
on the first level. So in keymaps where "+" is shifted, the Shift
modifier is consumed and must be ignored when the user is testing
for "<Alt>+". Otherwise, we may get "<Alt><Shift>+" and the accelerator
should not actually fire.

For this we also use the preserve[] information in the key types, which
can forces us to report modifiers as unconsumed even if they were used
in the translation. Until now we didn't do anything with this
information.

The API tries to match its surronding. It's not very efficient but this
can be fixed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-08 10:03:38 +03:00
Ran Benita 262bf97f9b types: remove default type
The default type is copied over for each new key type to build on.
Further, it can be modified from within the xkb_types section itself,
with statements such as "type.modifiers = Lock" which affect all
subsequent type definitions.

The default type is (well, by default) just the simplest one level type
possible, with name "default". When no types are defined at all, it is
copied over to the keymap as the single type.

xkeyboard-config never changes the default type. There is also no sane
use case for doing so; changing any thing there doesn't make sense. So
instead of doing all the hard work of maintaining and copying this type,
which is practically never used, just remove it and initialize new types
appropriately.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-08 10:03:37 +03:00
Ran Benita d327d3e27b types: store atoms instead of strings for level and type names
We don't use these strings much, so storing them in the manner they
were compiled saves some copying and space.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita b2fba7305c types: use regular array for map entries
This array is only initialized once.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita 8ccfee82ec types: use regular array for types
The current code doesn't resize it any more.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita a681c6240d types: remove DeleteLevel1MapEntries
If there is no map entry for some modifier combination, the default is
to use level 1. The removed code is an optimization to save some space
by removing these entries. But it doesn't actually save any space, and
did not in fact remove all level 1 entries (it walks the array while
modifying it so there's an off-by-one error).

We can instead keep them in the types but just not print them in
keymap-dump.c, to get about the same behavior.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita 233d85c427 types: move preserve directly into xkb_kt_map_entry
Currently each xkb_key_type has a preserve array, which is only allocated
if a preserve[] statement is specified in the type. In this case each map
entry has an element in the array.

The space savings are negligible; put this field where it logically
belongs.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita 6b75dd2dcb Fix virtual modifiers mask extraction
The calculations were performed incorrectly in several places,
specifically shifting by 16 instead of 8 (= XkbNumModifiers) and masking
with 0xff instead of 0xffff.

More stuff that probably never worked as intended. This also makes these
more grep-able when we remove the vmods/real_mods separation.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita 796dccabe8 types: small changes
Just make things easier to follow, no functional changes.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita 4c00278c82 Remove xproto build dependency
Very little left to do for this.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita b0b11c4e2e types: don't use canonical/required types
Xkb required every keymap to have at least the four following canonical
types: ONE_LEVEL, TWO_LEVEL, ALPHABETIC, KEYPAD. This is specified in
e.g. the kbproto spec and XkbKeyTypesForCoreSymbols(3) man page.

If these types are not specified in the keymap, the code specifically
checks for them and adds them to the 4 first places in the types array,
such that they exist in every keymap. These are also the types (along
with some non-required 4-level ones) that are automatically assigned to
keys which do not explicitly declare a type (see FindAutomaticType in
symbols.c, this commit doesn't touch these heuristics, whcih are also not
very nice but necessary).

The xkeyboard-config does not rely on the builtin xkbcomp definitions of
these types and does specify them explicitly, in types/basic and
types/numpad, which are virtually always included.

This commit removes the special behavior:
- The code is ugly and makes keytypes.c harder to read.
- The code practically never gets run - everyone who uses
  xkeyboard-config or a keymap based upon it (i.e. everyone) doesn't need
  it. So it doesn't get tested.
- It mixes policy with implementation for not very good reasons, it
  seems mostly for default compatibility with X11 core.
- And of course we don't need to remain compatible with Xkb ABI neither.

Instead, if we read a keymap with no types specified at all, we simply
assign all keys a default one-level type (like ONE_LEVEL), and issue
plenty of warnings to make it clear (with verbosity >= 3). Note that
this default can actually be changed from within the keymap, by writing
something like
    type.modifier = Shift
    type.whatever_field = value
in the top level of the xkb_types section. (This functionality is
completely unused as well today, BTW, but makes some sense).

This change means that if someone writes a keymap from scratch and
doesn't add say ALPHABETIC, then something like <AE11> = { [ q Q ]; }; will
ignore the second level. But as stated above this should never happen.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita be82f08221 types: add a general overview
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 13:20:37 +03:00
Ran Benita c1ea23da5c symbols: remove support for key behaviors
The possible key behaviors are:
KB_RadioGroup, KB_Overlay1, KB_Overlay2: already removed support for
these.
KB_Lock (with or without KB_Permanent): used to ignore key presses or
releases to simulate and deal with some legacy keyboard behaviors
(like keys that physically lock). Not used at all.

We already ignore them while processing key events in state.c, so make
it official.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 7c89f34e63 keycodes: small changes
to make it a bit nicer.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita b2c4331ac3 Handle key names consistently
We treat the key names as fixed length, non NUL terminated strings of
length XkbKeyNameLength, and use the appropriate *Text functions to
print them. We also use strncpy everywhere instead of memcpy to copy
the names, because it does some NUL padding and we might as well.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita c548c81529 keycodes: add a general overview
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 15541766b0 expr: make ResolveLevel return zero-based level
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 59d947c9c1 Add and use xkb_level_index_t
Several types are used over the code for shift levels; better to use
just one.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita b804aec292 action: drop global actionInitialized
The action.c needs to use two constant Expr values, constTrue and
constFalse. To do this is keeps to static globals Expr's of type boolean
and the values "true" and "false" which need to be interned (and thus
context specific). The interning means they can't be made static const,
so there's a global flag and initializer function.

Instead of using this unsafe global state, we can simply use an integer
boolean expression (1 and 0) instead of a string one ("true" and
"false") and make them const.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 6f08a2cfa0 expr: constify function arguments
We need this for later.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita f2ecd6650a log: allow to resore default log function
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 18048cb7bf darray: fix formatting
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 9617b092e2 filecomp: fix path and error message
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 1d570a6d46 interactive: add support to run from keymap file
This is useful for quickly testing a random keymap file. Use -k <PATH>.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita cfd978b89d keyseq: use our own keysyms
Instead of <X11/keysym.h>

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita cead852713 Replace more defines with enums
Mostly the ones used to track the fields of types/keys/leds which were
already defined.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 3bea189bd5 Make top level Handle*File functions nicer
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 82ee45b374 Use xkb_led_index_t throughout
And use XKB_LED_INVALID instead of _LED_Unbound, which served the same
purpose here.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 09dac54b97 vmod: remove unused fields
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 6eb5929d48 README: s/xkb_desc/xkb_keymap
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita 7c7e434151 Use only one set of core mod name-to-index functions
These were repeated 5 times.

Note that this changes the ABI slightly: XKB_MOD_NAME_CAPS is changed
from "Caps Lock" to "Lock", which is the ordinary legacy mod name for
it. Since its hidden behind a #define, it's best to stay compatible with
the old names (as I think was intended, given that "Mod1", etc. are the
same).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:42 +03:00
Ran Benita c6dee4640a map: fix incorrect return value
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 11:09:39 +03:00
Ran Benita ae968f855a map: fix virtual mod index calculation
The current code made us miss vmod index 0. Also look at the code in
vmod.c:LookupVModMask.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 10:50:15 +03:00
Ran Benita 80ab9f12b4 keymap-dump: use ActionTypeText
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 10:47:43 +03:00
Ran Benita d53fcf53f8 keymap-dump: use SITextMatch
text.c has the exact same function.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 10:47:43 +03:00
Ran Benita 20bef734d8 keymap-dump: clean up write_buf function
It would have been nice to use open_memstream here if it was portable
enough (maybe someday it will?).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-08-07 10:47:41 +03:00
Ran Benita 4c21275301 Add an interactive evdev test
The program reads key events from evdev input devices, puts them through
the library and prints some information about them. It's nice for
experimenting, quick testing and trying to break it with random stuff
(already found some!).

It is called "interactive" for lack of a better name. It's a bit
hackish, but can easily be extended, made more portable etc, in the
future.

Signed-off-by: Ran Benita <ran234@gmail.com>

Conflicts:
	Makefile.am
	test/.gitignore
2012-07-28 11:43:15 +02:00
Ran Benita 41d9afc556 Remove ExprResult
Convert the IdentLookup typedef away from ExprResult, which drags along
everything else. This should also make all of the conversions explicit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 15:31:03 +03:00
Ran Benita 6917901f81 expr: remove support for evaluating string as integer
As the comment nicely puts it, this is a bit weird. When you try to
evaluate an expression of type string into an integer, what it does is:
    "" -> 0
    "c" -> (ascii value, i.e. like a char literal)
    more than one char -> error
The first one is obviously not very useful; why not just write 0?
The second one might be useful (though I don't see where in a keymap
it would be), but I don't think anyone would consider trying "X" for
that anyway.

A look through xkeyboard-config shows "" only used once as a string, and
"X" also only used as strings (and mostly in geometry which we don't
evaluate anyway). And I seriously doubt it's used (purposely) anywhere
else. So remove it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 14:15:39 +03:00
Daniel Stone dd0f3c6dc2 Don't create contexts with no include paths
Clean up the return code handling from
xkb_context_add_include_paths_default, and thus fail context creation if
we can't add any of the default include paths, but were asked to.  If
this happens, dump the DFLT_XKB_CONFIG_ROOT out in the log message, so
at least we know what we aren't looking at.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-27 11:59:55 +02:00
Daniel Stone ca7927ae60 context test: Use test_get_context()
So we don't die if we haven't got a valid global include path.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-27 11:59:55 +02:00
Ran Benita bd927abf3d expr: drop ExprResult from ResolveEnum
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:14 +03:00
Ran Benita 38614c886c expr: drop ExprResult from ResolveMask
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:14 +03:00
Ran Benita 2e4933cda7 expr: drop ExprResult from ResolveInteger
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:13 +03:00
Ran Benita d568228988 expr: drop ExprResult from ResolveButton
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:13 +03:00
Ran Benita 6ec135700d expr: drop ExprResult from ResolveLevel
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:13 +03:00
Ran Benita 000528dd59 expr: drop ExprResult from ResolveKeyCode
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:13 +03:00
Ran Benita e258f9ee07 expr: drop ExprResult from ResolveGroup
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:13 +03:00
Ran Benita 7026229210 expr: drop ExprResult from ResolveKeysym
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:13 +03:00
Ran Benita 0d262fa105 expr: drop ExprResult from ResolveBoolean
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:13 +03:00
Ran Benita 27f9492969 expr: drop ExprResult from ResolveString
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:13 +03:00
Ran Benita 025ca57905 expr: drop ExprResult from ResolveLhs
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:57:13 +03:00
Ran Benita 761b675cc3 expr: drop ExprResult from ResolveKeyName
Explicit is better than implicit, and this union makes it hard to follow
what's what, particularly the confusion with ival/uval.
The other Resolve functions will follow.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:56:11 +03:00
Ran Benita 01c81fa61e parser: untabify
Run vim's :%retab and some resulting indention fixes.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:49:09 +03:00
Ran Benita 724f62c8e3 Convert defines to enums in xkbcomp.h
For statement / expression types.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:49:06 +03:00
Ran Benita 35fb8b94cb Fix incorrect comparison
ExprFieldRef goes into the ExprDef op field, not the type field.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 01:47:32 +03:00
Ran Benita 89723b7cb7 utils: add/replace string equality macros
It's more tidy and less error prone, since we use strcasecmp == 0 a lot.
We replace strcmp == 0 by streq, strcasecmp == 0 by istreq,
uStrCasePrefix by istreq_prefix and uDupString by strdup_safe.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 00:27:24 +03:00
Ran Benita 4f843c817b Drop Xkbc prefix of text functions
Not really needed and inconsistent.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 00:11:42 +03:00
Ran Benita 6cb9820000 Use xkb_mod_mask_t and xkb_mask_index_t throughout
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 00:04:45 +03:00
Ran Benita 74be17627e Remove alloc.{c,h}
These functions are more appropriate elsewhere now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 00:02:59 +03:00
Ran Benita 13eb9c357d scanner: don't strdup key names
The key name is always XkbKeyNameLength (= 4) bytes, so we can maintain
it directly in YYSTYPE union and copy when needed, instead of treating
it like a full blown string and then copy. This means the scanner
checks the length itself.

rulescomp under valgrind, before:
==1038==   total heap usage: 168,403 allocs, 168,403 frees, 9,732,648 bytes allocated
after:
==9377==   total heap usage: 155,643 allocs, 155,643 frees, 9,672,788 bytes allocated

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 00:01:57 +03:00
Ran Benita 112cccb18a Some atom related optimizations
We often get a strdup'd string, just to pass it over the atom_intern and
then immediately free it. But atom_intern then strdup's it again (if
it's not interned already); so instead we can have the interning "steal"
the memory instead of allocing a new one and freeing the old one. This
is done by a new xkb_atom_steal function.

It also turns out, that every time we strdup an atom, we don't actually
modify it afterwards. Since we are guaranteed that the atom table will
live as long as the context, we can just use xkb_atom_text instead. This
removes a some more dynamic allocations.

For this change we had to remove the ability to append two strings, e.g.
    "foo" + "bar" -> "foobar"
which is only possible with string literals. This is unused and quite
useless for our purposes.

xkb_atom_strdup is left unused, as it may still be useful.

Running rulescomp in valgrind, Before:
==7907== total heap usage: 173,698 allocs, 173,698 frees, 9,775,973 bytes allocated
After:
==6348== total heap usage: 168,403 allocs, 168,403 frees, 9,732,648 bytes allocated

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-27 00:01:41 +03:00
Ran Benita c6279b8bae expr: don't divide by zero
Calculator parser 101.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-26 23:15:54 +03:00
Ran Benita 7662397fd4 types: fix canonical types copying
Without the re-initialization, the copying fails. This wasn't noticed
because this code practically never gets executed with ordinary keymaps.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-26 22:55:41 +03:00
Ran Benita 3c58072172 keycodes: fix valgrind warnings
==7071== Conditional jump or move depends on uninitialised value(s)
==7071==    at 0x40B6CB: AddIndicatorName (keycodes.c:148)
==7071==    by 0x40C34F: MergeIncludedKeycodes (keycodes.c:420)
==7071==    by 0x40C613: HandleIncludeKeycodes (keycodes.c:480)
==7071==    by 0x40D022: HandleKeycodesFile (keycodes.c:733)
==7071==    by 0x40D79F: CompileKeycodes (keycodes.c:881)
==7071==    by 0x401E22: compile_keymap (xkbcomp.c:157)
==7071==    by 0x402091: xkb_map_new_from_kccgst (xkbcomp.c:229)
==7071==    by 0x40216A: xkb_map_new_from_names (xkbcomp.c:254)
==7071==    by 0x4046F5: test_compile_rules (common.c:164)
==7071==    by 0x4015C1: test_rmlvo (rulescomp.c:44)
==7071==    by 0x40180D: main (rulescomp.c:98)

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-26 22:55:34 +03:00
Ran Benita d4eee86160 parse: remove unused #define
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-26 22:55:28 +03:00
Ran Benita 2e245a9a41 expr: Remove ExprResolveFloat
Remnant from geometry.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-26 22:55:17 +03:00
Daniel Stone 9bd55b55f8 makekeys: Add top_srcdir to include path
Fixes distcheck with no /usr/include/xkbcommon.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-23 23:10:07 +01:00
Ran Benita 3dc1252d2d Add test for logging functionality
Just to make sure everything works properly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita 2c30fa7a60 Remove old logging leftovers
Everything has been converted.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita 70e3e7e5c3 xkbcomp: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita f48ee2d2af parse: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita 8e3958032c path: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita 885f6c8cb6 misc: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita 544a83e6d7 vmod: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita 3bb3e9c3a9 rules: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita d659f2b46b expr: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita e037f51862 action: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita 87444fb969 types: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:35 +03:00
Ran Benita 36df40c3cd types: add keymap to KeyTypesInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 8e62b368a7 compat: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 270ff8ad83 compat: add keymap to CompatInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 7dc51ea84a symbols: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 7ef648134d symbols: add keymap to SymbolsInfo
and use it. Also make sure info is the first argument to the functions
in this file.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 0ae1199a5a keycodes: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 37579ce9a5 keycodes: add keymap to KeyNamesInfo
and let the info always be the first argument to the various functions,
just for consistency (and it acting as the contex for this file).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 70f35cfbc0 Add logging API
Add new public API to provide the library users with some options to
control and customize the logging output from the library. It is based
upon the skeleton from the libabc demo libray:
https://git.kernel.org/?p=linux/kernel/git/kay/libabc.git
which is public domain and works pretty well.

This requires passing in the context object in every logging call, and
thus the conversion is done file by file. We also remove the global
warningLevel variable in favor of a verbosity level in the context,
which can be set by the user and is silent by default.

One issue is the ACTION calls, which, while nice, do not play very well
with line- and priority-based logging, and would require some
line continuation handling or keeping state or some other compromise. So
instead remove these and just inline them with their respective
warning/error. So instead of:
    ERROR("Memory allocation failed\n")
    ACTION("Removing all files on hardisk\n")
its something like that:
    log_err("Memory allocation failed; Removing all files on harddisk\n")

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 71c2f2e0e2 utils: replace FATAL by malloc_or_die
"Out of memory" is enough in this case. If we want to be OOM-safe this
makes it clear where to begin.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 58f8d2c151 utils: remove Xfuncproto.h and use our own macros
Add XKB_EXPORT to replace _X_EXPORT, and copy the definitions of
_X_ATTRIBUTE_FOO as ATTR_FOO.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 8b0e9f929c utils: remove uTypedAlloc/Calloc
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 5e164ff1f9 build: drop the include/ directory
The include/ dir is somewhat redundant and makes it just a bit harder to
handle the -I directives from out side of automake; without it the
default $(top_buildir) just works.
Here's also some further justifications I found:
http://smcv.pseudorandom.co.uk/2008/09/pc-uninstalled/

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-23 00:45:34 +03:00
Ran Benita 2fc0ad5001 Fix bison 2.6 and clang warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-20 12:48:13 +03:00
Ran Benita db98696d0b Remove CommonInfo
Not used by anything anymore.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 21:06:07 +03:00
Ran Benita 250c925ce4 types: use list instead of CommonInfo for KeyTypeInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 21:06:07 +03:00
Ran Benita 85826c3c13 Simplify HandleInclude functions
Instead of special casing the first include, process it inside the loop
as well. It works perfectly fine.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 21:06:07 +03:00
Ran Benita 861e6a1751 Remove haveSelf include feature
When including a file from another file, its possible to do something
like this:
    include "+some(other)+files"
with the "+" or "|" in the beginning. What will happen then is that
instead of processing the include files separately and then merging into
the existing info, we instead start with the existing info and merge
into it as we go, as if it was written explicitly before the first "+".

It's not particulary clear what this may be useful for. Since it's not
used by xkeyboard-config, not documented anywhere (and google doesn't
bring up anything), completely untested and kind of ugly, remove this
"feature". It most likely never been used.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 20:40:33 +03:00
Ran Benita 730c2bc34f types: use list instead of CommonInfo in PreserveInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 15:25:41 +03:00
Ran Benita 85abd36bf4 types: move global static tok_ atoms into KeyTypesInfo
The atoms are context-dependent.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 15:25:41 +03:00
Ran Benita 119c952b82 compat: use list instead of CommonInfo in LEDInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 15:25:41 +03:00
Ran Benita 50b25a1210 Use xkb_group_index_t for group variables throughout
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 15:25:37 +03:00
Ran Benita 8237e9c77a Remove _X_EXPORT from xkb_key_get_group/level
We should add them to xkbcommon.h if they need to.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 14:07:02 +03:00
Ran Benita e21fc886ca compat: use list instead of CommonInfo in SymInterpInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 14:07:02 +03:00
Ran Benita ba4320f7b3 Move indicators.c code into compat.c
It is only used there. Allows some refactoring.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 14:07:02 +03:00
Ran Benita dfa0929c6d Convert macros to inline functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 14:07:02 +03:00
Ran Benita 3fbf4ce315 keycodes: use list instead of CommonInfo in IndicatorNameInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 14:07:02 +03:00
Ran Benita 4bf987e5f7 keycodes: use list instead of CommonInfo in AliasInfo
Always pass around the KeyNamesInfo which contains the list head.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 14:07:02 +03:00
Ran Benita cc8b06826b Move alias.c functions into keycodes.c
They are only used in this file.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 14:07:02 +03:00
Ran Benita cf4f170bdd symbols: don't use CommonInfo in KeyInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 14:07:02 +03:00
Ran Benita ebb4d59c58 symbols: use list for ModMapEntry's
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 14:07:02 +03:00
Ran Benita b6e2a56dc0 Add common linked list implementation
Taken from xserver/include/list.h. The changes made are:
* Drop the xorg_ prefix and some typedef from the end.
* Rename _for_each_entry macros to just _foreach (like darray).
* Rename list_is_empty to list_empty (like darray).
* Add a list_replace function which we use later.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:56:13 +03:00
Ran Benita 0a6f9ccde2 symbols: remove alias info
It's never used - all of the aliases are added in the keycodes section.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:56:05 +03:00
Ran Benita d0097f4e60 Pass around xkb_key's instead of keycodes
This way we don't need to look up the key every time. We now only deal
with keycodes in the public API and in keycodes.c.

Also adds an xkb_foreach_key macro, which is used a lot.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:47:29 +03:00
Ran Benita 35a93b8e64 map: verifiy that the keycode is legal
In case someone passes in a bad keycode.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:46:29 +03:00
Ran Benita 091a0542ac Remove redundant keymap->keys resizes
The size (i.e. max_keycode) is determined in the keycodes section, which
gets compiled first.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:46:29 +03:00
Ran Benita ad8875c526 Remove GroupsWidth macro
Use key->width directly instead.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:46:29 +03:00
Ran Benita c705a82d60 Remove unused 'groupInfo' in KeyTypeInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:46:29 +03:00
Ran Benita 4ccb0ef5cc Get rid of group_info
This is 8 bits which hold how many groups the key has, what to do the
key group is out of bound and the group to redirect to if want to. This
may save a few bytes, but is really annoying. So instead, just lay out
the fields separately. We can optimize later in a sane way, with pahole,
bitfields, etc. if we want.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:46:29 +03:00
Ran Benita 4066fcc9b5 Get rid of struct xkb_sym_map
Past its usefulness; put the stuff directly in xkb_key.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:46:28 +03:00
Ran Benita 7d9f031341 Get rid of struct xkb_key_name
Just embed it directly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:45:28 +03:00
Ran Benita e8a6a5f09a Add common xkb_key struct
Instead of having a million arrays from the keycode to various
key-specific info in the keymap, add a single struct xkb_key to hold all
of the data for the key in one object. This way we can pass it around,
do some refactoring and make the code simpler. It's also nice to see
everything in one place.

The keys array is still indexed by keycode, which is suboptimal because
there may be a lot of holes (i.e. unused keycodes between min_key_code
and max_key_code). By the end of this series it would be abstracted
enough to replace it by a hash table or similar if there's ever a need.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:45:22 +03:00
Ran Benita e668d00956 Replace KeyInfo 'key' variable name by 'keyi'
We want to reserve the name 'key' for something else.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:39:37 +03:00
Ran Benita 81d029f563 Replace xkb_keycode_t 'key' variable name by 'kc'
We want to reserve the name 'key' for something else.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:35:48 +03:00
Ran Benita a52fb7e21c Convert indecipherable macros to inline functions
This was fun.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:25:29 +03:00
Ran Benita c064b95c7c symbols: split initialization code from CompileSymbols
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:25:29 +03:00
Ran Benita caca60f391 Move per_key_repeats and enabled_ctrls to keymap
All of the per-key data and global flags are now visible directly in the
keymap.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:25:29 +03:00
Ran Benita 1313af8fb5 Get rid of xkb_key_names
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:25:28 +03:00
Ran Benita 50fef8eb8a Get rid of xkb_indicator
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:22:20 +03:00
Ran Benita ed08261768 Get rid of xkb_compat_map
Same as xkb_{client,server}_map which were already removed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:22:20 +03:00
Ran Benita 3de9d87498 Get rid of xkb_server_map
Same as xkb_client_map which was removed before.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:22:19 +03:00
Ran Benita 219243fe1b Get rid of xkb_client_map
We don't make this distinction anymore, and the separate allocations
just make it harder to reason about. Since we require that all of
symbols, types, compat etc. be present, we should just put stuff
directly in the keymap struct.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-18 12:19:04 +03:00
Daniel Stone 9308a46039 Run source tree through uncrustify
.uncrustify.cfg committed for future reference also, but had to manually
fix up a few things: it really likes justifying struct initialisers.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-17 10:20:15 +01:00
Ran Benita c6c937abc2 Fix typo in out of range group calculation
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-15 17:35:35 +03:00
Ran Benita 7d400657f5 Remove unused control num_groups
We have xkb_map_num_groups for that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-14 19:54:07 +03:00
Ran Benita 6c3e0811d4 Convert missed enum merge_mode variables
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-14 15:20:14 +03:00
Ran Benita 43bf4136c9 Fix fileID mess
A few problems here:
* In e.g. keycodes.c the fileID field of the Info struct was never
  initialized to the id of the appropriate file, so it was always 0.
  There's some code which uses it, mostly for warnings.
* Some of the fileID fields were unsigned char, which overflows several
  times, seeing as the ID in some of our tests can get > 1000 (because
  we reuse the context).
* Some sign mismatches.
* fileID vs file_id.

Hopefully this fixes everything. I doubt this stuff had ever worked as
intended, in xkbcomp or otherwise.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-14 15:19:12 +03:00
Ran Benita 70683f7deb path: fix error message
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-14 13:04:59 +03:00
Ran Benita d705c5d97c Make compile_keymap a little nicer
Just using the fact that we must have all of the components, without
optional ones.
Also fixes a memleak on the way, by making the functions which allocate
the XkbFiles to free them, which is easier to get right.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-14 11:47:05 +03:00
Ran Benita fe4f990902 Move CompileKeymap into xkbcomp.c
It's nicer to see the code where its used. Removes keymap.c.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-14 00:29:31 +03:00
Ran Benita 57374c3237 Rename KSIsLower/Upper and move to keysym.c
Seems like a more natural place, and allows to remove the src/misc.c
file.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-13 19:11:15 +03:00
Ran Benita 0765064b35 Remove MERGE_ALT_FORM merge mode
The mode comes from the "alternate" keyword, which is unused in
xkeyboard-config and mostly undocumented. Its purpose is to allow to
assign the same key name to multiple key codes, which is not allowed
otherwise (and doesn't make much sense). The xkblib specification
implies that this was part of the overlay functionality, which we also
no longer support.

If we do encounter this keyword, we just treat it as MERGE_DEFAULT. The
keycodes.c code will detect a collision and will ignore all but the
first key code (and the error count is not incremented).

Some peripheral code is also removed as a result.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-13 19:07:03 +03:00
Ran Benita dd85790c73 Move InitCanonicalKeyTypes to keytypes.c
It's only got one call site and it's in keytypes.c, so move it there and
make it static.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-13 19:07:03 +03:00
Ran Benita 0aaa84d8f1 Remove xkb_kt_map_entry::active
Takes the advice of acdad6058d and removes
this field, since its not used anymore now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-13 19:07:03 +03:00
Ran Benita 3e65531f13 Move ComputeEffectiveMap code and avoid some duplication
The ComputeEffectiveMap function is only called from keytypes.c, with
the last argument NULL, so we can move it there and remove some code.
The function XkbcVirtualModsToRealMods, of which the above is the only
user, is already implemented more simply in compat.c, so make this one
non-static and use it. This leaves src/xkb.c empty, so remove it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-13 19:07:03 +03:00
Ran Benita a3378338bd remove unused function xkb_canonicalise_components
commit 46441b1184 removed this from the
public API, and we don't need it internally. So send it to the archives.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-13 19:07:03 +03:00
Ran Benita b7c0737a94 compat: fix XkbSI_AllOf matching condition
To quote the spec:

XkbSI_AllOf
    All of the bits that are on in mods must be set, but others may be
    set as well.

Here "mods" refers to interp->mods. This matches xserver/libX11.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-13 19:06:54 +03:00
Daniel Stone 6e7d1678ba FindAutomaticType: Add FIXME
It doesn't play well with multiple keysyms per level right now.  But
that's OK, because no-one really uses them.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-13 00:40:25 +01:00
Daniel Stone 3640e14d9e Add multiple-keysyms-per-level to test data
Make sure this keeps on working.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-13 00:39:34 +01:00
Daniel Stone a19abd2635 rulescomp: Fix benchmark runs
We'd accidentally inverted silent vs. non-silent compilation, which
would skew the benchmark pretty badly, but also forgot to change base to
evdev for the rules here.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-13 00:32:41 +01:00
Daniel Stone a77e9a92e9 tests: Update dump.data for recent fixes
Makes the test pass again.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-13 00:12:57 +01:00
Ran Benita f059967592 dump: add back kccgst names
Readd the component names to the keymap->names struct. This is used when
printing the component, e.g.

xkb_keymap {
	xkb_keycodes "evdev+aliases(qwerty)" {

instead of

xkb_keymap {
	xkb_keycodes {

This makes diffing against xkbcomp $DISPLAY a bit easier and is kind of
useful anyway.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-13 00:11:29 +01:00
Daniel Stone 2ec0a22d55 Add Cyrillic and Greek to case-checking
Evidently good to have on its own, but also fixes a regression from
xkbcomp where we'd identify implicitly-typed Cyrillic keys as TWO_LEVEL
rather than ALPHABETIC.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-13 00:10:23 +01:00
Ran Benita fe5bfdf9d8 dump: a few more tweaks to match xkbcomp output
Only uppercase / lowercase stuff.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-12 18:24:30 +01:00
Ran Benita 9e5052259a symbols: fix bug in modifier_map handling
The code used to match a keysym to a keycode (see added comment)
differed in behavior from xkbcomp, always taking the first key it found.
This caused some incorrect interpretation of the xkeyboard-config data,
for example the one corrected in dump.data (see the diff): since the
de-neo layout sets the both_capslock option, the Left Shift key (LFSH)
has the Caps_Lock keysym in group 4 level 2; now since
    keycode(Left Shift) = 50 < keycode(Caps Lock) = 64
the Left Shift one was picked, instead of the Caps Lock one which is
group 1 level 1. The correct behavior is to pick according to group,
level, keycode.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-12 18:08:00 +01:00
Ran Benita fedcf3705b dump: use KeyNameText instead of copying
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-12 18:07:56 +01:00
Daniel Stone 62deaeb570 Import dataset into test/data/
Use a self-contained dataset instead of relying on a globally-installed
set.  Data taken from xkeyboard-config 2.5.1.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-12 14:48:49 +01:00
Daniel Stone 3e86ebca06 Add a library of common test functions
Including creating a context (will come in useful soon), opening and
reading files, and compiling keymaps.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-12 14:48:22 +01:00
Daniel Stone 059c1842ef Move test data files to test/data/keymaps
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-12 14:14:50 +01:00
Daniel Stone b10f924b0c Make BindIndicators static
Since BindIndicators was only ever called immediately after
CopyIndicatorMapDefs, move it up in the file and turn it into a static
function, which avoids the need to ever pass the unbound LEDs around.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-12 09:42:27 +01:00
Daniel Stone d38d16e113 Change BindIndicators return to void
Since it could only ever return true, which avoids a totally unnecessary
cleanup path.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-12 09:42:27 +01:00
Daniel Stone 9116e02d6f Remove 'unboundRtrn' argument from BindIndicators
It was only ever passed as NULL from its single callsite, so just remove
it and be done with it.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-12 09:42:27 +01:00
Daniel Stone cfed7960ad Remove 'force' argument from BindIndicators
It was always true in the one callsite, so just remove the other
branches.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-07-12 09:42:27 +01:00
Ran Benita 1f49290131 Enlarge keysym name buffers and mention in comment
The longest keysym is 27 chars long.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-12 09:42:20 +01:00
Ran Benita 010242593e test/dump: output commentary to stderr
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-12 09:42:15 +01:00
Ran Benita e4d4de8c9e symbols: fix bug in symbol merging
When we merge two KeyInfo's (belonging to the same keycode), we may take
a shortcut from copying if we see that the merged keys will be exactly
like those in one of the two KeyInfo's. In the case where we take the
symbols from the KeyInfo we are *not* merging into, we need to copy
the three arrays:
    syms[group], symsMapNumEntries[group], symsMapIndex[group]
The code currently only copies the first one, so if there's a merge
conflict some levels may seem to disappear (i.e. have a NoSymbol
keysym).

This fixes the failing test added in c8d6bba.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-12 09:42:12 +01:00
Ran Benita 09d1445b4a keyseq: add a failing group-switching test
For some reason, with the grp:alt_shift_toggle option, the following
sequence switches a group:
< Left Shift down, Left Alt down >
While the reverse doesn't:
< Left Alt down, Left Shift down >
And it should.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-12 09:42:10 +01:00
Ran Benita 19f814f95e rules: fix parsing of multiple options
This was broken by commit 18d331b86b
(where only the first option out of a comma-separated string was
matched). Do it correctly this time and add a test.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-12 09:42:08 +01:00
Ran Benita 8ff984871b keymap: remove redundant check
This is handled above in the LEGAL_FILE_TYPES check.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 10:21:01 +03:00
Ran Benita e201c16536 state: fix base mod set/clear behavior
This commit fixes the incorrect current behavior, where at the end of the
following key sequence
Left Shift down, Right Shift down, Left Shift up
the Shift modifier is cleared.

Clearly the code is not as nice as before, but it seems like some count
of the depressed modifiers must be kept.

The code is lifted mostly as is from xkbActions.c. [ There they also
assign to setMods and clearMods each time and not OR it. I assume its
correct, although I wouldn't have guessed... ]

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 10:21:01 +03:00
Ran Benita 13f030baf2 Tiny reformatting
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 00:51:56 +03:00
Ran Benita 37f4384947 rules: remove support for keymap rule
This commit removes the ability to specify a keymap *in a rules file*,
e.g. in /usr/share/X11/xkb/rules/evdev or somesuch. This is unused in
xkeyboard-data, and the current code has never even supported it,
because xkb_map_new_from_kccgst (which is no longer exposed in the API)
checks to see that one of the usual components (e.g. symbols, types, ..)
has been filled, while the rules parser, on the other hand,  doesn't
allow to specify a keymap and other stuff at the same time.

( The idea was to remove xkb_map_new_from_kccgst entirely, but it's used
  by a test so it can stay. )

tl;dr: dead code. Of course passing a keymap file to
xkb_map_new_from_file still works.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 00:51:56 +03:00
Ran Benita 337c3007ac Remove _X_EXPORT from xkb_map_new_from_kccgst
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 00:51:56 +03:00
Ran Benita ddb0ff9d02 xkbcomp: remove useless function XkbChooseMap
compile_keymap can only be passes a single keymap file now, from all
code paths leading to it. So this function doesn't do anything.

The remaining check is performed inside CompileKeymap, so we can remove
it as well; compile_keymap doesn't do much now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 00:51:56 +03:00
Ran Benita 7111eb8e8a compat: move some unclear code where it belongs
It seems like at some point it was needed to break the abstraction and
perform this piece of code in the context above CompileCompatMap. The
extra argument and the typedef look strange now, and doesn't seem to be
needed any more, so move them back.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 00:51:56 +03:00
Ran Benita 213dcf686f Use enum for merge mode
The merge mode shows up in a lot of functions, so it's useful to give it
a distinct type.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 00:51:56 +03:00
Ran Benita 48b4d30aa3 Use enum for file types
enums are nice for some type safety and readability. This one also
removes the distinction between file type mask / file type index and
some naming consistency.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 00:51:56 +03:00
Ran Benita 8f257397af keymap: simplify legal/required logic a bit
Now that we've consolidated on the keymap file type, this code only
serves to confuse.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-07-01 00:51:03 +03:00
Ran Benita f637d35a86 Use void* instead of old style char* in CommonInfo functions
Removes some annoying casts.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-27 00:22:31 +03:00
Daniel Stone 2cb6c35b87 Don't set explicit repeat masks when derived
If we've only derived that a key should repeat, rather than had it
explicitly specified, don't set the explicit member.  Fixes the dump
test.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-22 16:08:05 +01:00
Daniel Stone acdad6058d Don't ignore inactive type entries
An entry for a type will only get marked as active if a virtual modifier
can be directly mapped to it, and not if an action indirectly leads to
it (e.g. LevelThree).  We don't really need this test since entries which
can never be triggered ... won't be triggered.

The entire map->active thing should probably just go away.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-22 16:05:45 +01:00
Daniel Stone 6d606d1068 state: Add more comprehensive repeating test
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-22 15:30:17 +01:00
Daniel Stone 8e2c66e9ea Add xkb_key_repeats
Does what it says on the box.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-22 15:27:05 +01:00
Daniel Stone fe89d03154 Work out a default repeat for all keys
Our early exit in ApplyInterpsToKey meant we weren't hitting the code
that's supposed to set a sensible default autorepeat value for most
keys.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-22 15:26:07 +01:00
Ran Benita 0015604ade Add a test for the results of key sequences
This test verifies the core purpose of this library, which is to
translate the user's keypresses into keysyms according to the keymap and
the XKB specification.

The tests emulate a series of key presses, and checks that the resulting
keysyms are what we expect.

Several of the tests currently fail, and plenty more should be added and
maybe split up.

It also currently uses an RMLVO keymap, which comes from the
xkeyboard-config data set, and whose behaviour may change in the future.
So it should probably be changed to use several files of our own, but
it's OK for now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-18 15:19:24 +01:00
Ran Benita cd5a827402 utils: remove unused recalloc and related macros
Their use is superseded by darray everywhere now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 13:21:21 +03:00
Ran Benita 955ed8c469 state: use darray for filters
For the darray we need to specify the explicit struct xkb_filter type
instead of void*, so we move the definition of struct xkb_state into
state.c thus making it opaque even from the rest of the files. It has
enough getters to get going and is otherwise good style.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 13:21:21 +03:00
Ran Benita a1f8440d70 symbols: use darray in struct xkb_sym_map
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 13:21:21 +03:00
Ran Benita 54bdfd05a4 symbols: use darray for KeyInfo acts
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 13:21:21 +03:00
Ran Benita ce9c18a76e symbols: use darray for KeyInfo symsMapNumEntries
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 13:21:21 +03:00
Ran Benita 920cc27041 symbols: use darray for KeyInfo symsMapIndex
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 13:21:21 +03:00
Ran Benita e82b9b143c symbols: remove sizeSyms array from KeyInfo
This information is kept inside the darray now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 13:21:21 +03:00
Ran Benita 4237a20447 symbols: use darray for KeyInfo syms array
The arrays found in KeyInfo are by far the most complicated, so this is
taken one member at a time so as not to break anything.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 13:21:21 +03:00
Ran Benita bc50cdd460 darray: some changes for convenience
- Make darray_free also initialize the array back to an empty state, and
  stop worrying about it everywhere.

- Add darray_mem, to access the underlying memory, which we do manually
  now using &darray_item(arr, 0). This makes a bit more clear when we
  actually mean to take the address of a specific item.

- Add darray_copy, to make a deep copy of a darray.

- Add darray_same, to test whether two darrays have the same underlying
  memory (e.g. if the struct itself was value copied). This should used
  where previously two arrays were compared for pointer equality.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 12:34:57 +03:00
Ran Benita 57f184e218 darray: tweak parameters a bit for better memory usage
Here are some quick numbers from valgrind, running rulescomp only with a
simple, common "us,de" rule set:

before darray: cb047bb
total heap usage: 44,924 allocs, 44,924 frees, 3,162,342 bytes allocated

after darray: c87468e
total heap usage: 52,670 allocs, 52,670 frees, 2,844,517 bytes allocated

tweaking specific inital allocation sizes:
total heap usage: 52,652 allocs, 52,652 frees, 2,841,814 bytes allocated

changing initial alloc = 2 globally
total heap usage: 47,802 allocs, 47,802 frees, 2,833,614 bytes allocated

changing initial alloc = 3 globally
total heap usage: 47,346 allocs, 47,346 frees, 3,307,110 bytes allocated

changing initial alloc = 4 globally
total heap usage: 44,643 allocs, 44,643 frees, 2,853,646 bytes allocated

[ Changing the geometric progression constant from 2 only made things
worse. I tried the golden ratio - not so golden :) ]

The last one is obviously the best, so it was chosen, with the specific
tweaks thrown in as well (these were there before but don't make much
difference). Overall it seems to do better than the previous manual
allocations which is a bit surprising.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 12:34:57 +03:00
Ran Benita 93ef256063 Comment out unused fields in xkb_controls
Until (if) we implement/use them the should take up any (mental) space.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 12:34:57 +03:00
Ran Benita cb631c2de0 Unconstify a few string struct fields
These were made const when the structs were exposed in the API. Now they
are private and we shouldn't mess around with the UNCONSTIFY business.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 12:34:57 +03:00
Ran Benita d0718e988c test/dump: allow to run manually
Without the srcdir envvar (and a couple trivial changes).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 12:34:57 +03:00
Ran Benita 9baf62f307 Remove configure check for X11 keysym files
Since every user building the library, even from git, doesn't need these
files anymore, there's no need to check for them (this goes for makekeys
as well).

The only remaining user is the update-keysyms target, but whoever will
run it again (if ever) will probably know what he's doing (at least
enough to run git diff before git commit). And the defaults should be
fine too.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 12:34:57 +03:00
Ran Benita 58b030bb90 Move XKB_KEY_NoSymbol to xkbcommon-keysyms.h
This avoids a couple of special cases in the code, and is more
consistent. Since anyone who includes xkbcommon.h also gets
xkbcommon-keysyms.h, and anyone who include xkbcommon-keysyms.h would
want NoSymbol anyway, there's no down side.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 12:34:57 +03:00
Ran Benita 1c27bb8e77 Update .gitignore
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-06-09 12:34:57 +03:00
Daniel Stone 6992de408a Add keypad sequences to UTF-8 keysym printing
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-08 14:59:07 +01:00
Rob Bradford e0524296d2 Add API for getting unicode representation of a keysym
This code uses a table and code derived from
http://www.cl.cam.ac.uk/~mgk25/ucs/keysym2ucs.c

The added API calls are:

xkb_keysym_to_utf32
xkb_keysym_to_utf8

[daniels: Changed API to be more in line with keysym_get_name, added
          test, changed formatting to 4-space.]
2012-06-08 14:04:49 +01:00
Daniel Stone 77c909dee2 Fix tiny memory leak in dump test
We forgot to free the path we'd allocated with asprintf.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-04 16:16:20 +01:00
Daniel Stone 2e009f69c7 Avoid duplicating keysyms for merge if possible
If we can merge cleanly (i.e. use the entirety of one entry rather than
having to go level by level), then just reuse the existing symbols array
and skip the entire merge process.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-04 16:15:10 +01:00
Daniel Stone d3dfd7deab Use $(top_builddir) rather than relative paths
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-04 16:14:42 +01:00
Daniel Stone 734be50050 Work around stupid automake dependency-tracking bug
bison/flex-generated objects, when being run in a VPATH build with
--disable-dependency-tracking (i.e. Gentoo), would fail to be created
because automake didn't bother creating the destination directories
before trying to create the objects.

Fix this by depending on the destination directory stamp, which
according to the automake mailing list, should hopefully remain fairly
stable.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-04 14:06:01 +01:00
Daniel Stone e6ca6fc57d Fix action= NoAction() printing
Print it explicitly, rather than type=0x00, with all the private data
too.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-04 14:04:04 +01:00
Daniel Stone 0f09c3073c Make xkb_map_get_as_string test more comprehensive
Add a test/dump.data file which contains the result we're expecting from
xkb_map_get_as_string run on a particularly complex set of keymaps, and
assert that the string representations are the same.  This means that
any updates to xkb_map_get_as_string will also need to update the test
data, but should also ensure that we don't have any more parser
regressions.

Compared with diff to the output of setxkbmap + xkbcomp for the same
keymap; seems completely solid.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-04 13:27:41 +01:00
Daniel Stone 64c277d9f2 Revert "dump"
(Ahem.)

This reverts commit f43f75fb83.
2012-06-04 13:08:01 +01:00
Ran Benita dd1ae1e42f Remove fake support for global group range settings
A symbols file may contain a global, non key specific setting for
the group out-of-range handling method (wrap, clamp, redirect). Only
that:

* Its parsed and kept in the SymbolsInfo, but is not otherwise used in
  any way (it's the same in the real xkbcomp).
* It's not used in any of xkeyboard-config files.
* It's not mentioned in the xkb specs (only the per-key ones).
* It doesn't make much sense anyway.

So remove the struct field, and emit an "unsupported, ignored" warning.
We don't increment the error count because of it, just continue (the
radio group warning just below is changed to do the same - there's no
reason to possibly abort the entire thing for it).

Signed-off-by: Ran Benita <ran234@gmail.com>

Conflicts:

	src/xkbcomp/symbols.c
2012-06-04 13:05:24 +01:00
Daniel Stone 98b155c80a Symbols: Don't include NoSymbols in the map
Instead of using NoSymbol in the map, we use num_syms == 0 to signify
the non-presence of a symbol.  So instead of adding NoSymbol mappings
to the list regardless, detect them and set num_syms == 0.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-04 13:01:33 +01:00
Daniel Stone 28e66a703a Fix multiple errors when merging symbol definitions
We were getting the size calculation wrong, as well as inconsistently
picking a merge strategy.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-04 12:54:54 +01:00
Daniel Stone f43f75fb83 dump 2012-06-02 15:29:21 +01:00
Daniel Stone f531d1e16d keymap-dump: Print NoAction actions too
The failure mode here is a little irritating:
    - server loads map with ISO_Lock action
    - server dumps keymap to string, including:
      interpret ISO_Lock+AnyOfOrAll(None) {
          action= NoAction();
      };
      as we don't (yet) print ISO_Lock actions
    - client parses keymap from string
    - client dumps keymap to string, including:
      interpret ISO_Lock+AnyOfOrAll(None) {
      };
    - this results in a syntax error

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-02 15:25:36 +01:00
Daniel Stone c87468e926 stringcomp: NULL-terminate string
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-29 16:19:24 +01:00
Daniel Stone a3ae0e84e4 Pass merge down through indicator creation
To avoid using potentially undefined memory.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-29 16:19:17 +01:00
Daniel Stone 243daf80d0 Add test for xkb_map_new_from_string
Using data from xkb_map_get_as_string.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-29 15:08:35 +01:00
Daniel Stone ebd397e184 Add xkb_map_get_as_string
Returns a newly-allocated string representing the specified keymap.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-29 15:07:18 +01:00
Daniel Stone 208d957806 Fix signed vs. unsigned confusion in actions
Some actions could also take relative rather than absolute parameters,
so they really needed to be signed instead of explicitly unsigned.
Oops.

Fixes, e.g., action= MovePtr(x=-1,y=+1), which was reported as
(x=+65535,y=+1).

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-25 18:02:19 +01:00
Ran Benita ccc047c4e0 compat: use darray for acts and key_acts in the server map
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 18:02:40 +03:00
Ran Benita 89c5e88603 keycodes: use darray in KeyNamesInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 15:45:42 +03:00
Ran Benita 07c88b551b symbols: use darray for xkb_sym_map
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 15:20:47 +03:00
Ran Benita 4daa34b5a3 keytypes: use darray for level names
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:24 +03:00
Ran Benita ee990d53a5 symbols: use darray for KeyInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:24 +03:00
Ran Benita dcdbd14925 parser: use darray for keysym list
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:24 +03:00
Ran Benita c65a3596ae keytypes: use darray for xkb_kt_map_entry's
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:24 +03:00
Ran Benita 374b0c9814 alloc: use darray in xkb_key_names
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:24 +03:00
Ran Benita c2ac3a2b20 keytypes: use darray for key types in the client map
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:23 +03:00
Ran Benita 561504162f compat: use darray for sym_interprets
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:23 +03:00
Ran Benita d0288bb288 context: use darray for include paths
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:23 +03:00
Ran Benita ef51b572aa atom: use darray for the node_table
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:23 +03:00
Ran Benita 0c271e093a rules: use darray for input line
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:23 +03:00
Ran Benita 28bbb7dc51 rules: use darray for rules and groups
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:23 +03:00
Ran Benita c815ff96d9 Import darray.h for common dynamic array code
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:23 +03:00
Ran Benita cb047bb0fc Constify a static variable
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 14:19:23 +03:00
Ran Benita 9e72a6a7af Fix incorrect indexing while freeing
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-22 08:50:25 +03:00
Ran Benita 869c687190 rules: add test
Add a non-extensive test to check that some basic things (e.g. rule
matching, var substitution, indexes and groups) work as expected.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:49 +03:00
Ran Benita 68edd5f0df rules: allow wildcard match against "" layout/varaint
Currently, if you pass in an rmlvo with an empty string for layout or
variant, it would not match layout and variant rules even with
wildcards. But if the rules file had set an appropriate default, and someone
passes in the empty string, than he should get the default.

NULL in this case signifies not wanting to match against the layout or
variant at all, and so the rule should still fail to match NULLs.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:49 +03:00
Ran Benita c900c41760 rules: remove struct var_defs
We can just use struct xkb_rule_names which we already receive as an
argument.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:49 +03:00
Ran Benita 3d28b6d116 rules: reformat components_from_rules
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:49 +03:00
Ran Benita 7895eeb8ce rules: reformat LoadRules and XkbRF_Free
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:49 +03:00
Ran Benita d18cf31595 rules: remove unused struct describe_vars
It's not actually used for anything.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:49 +03:00
Ran Benita 56b125fcc7 rules: reformat AddRule and AddGroup
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:49 +03:00
Ran Benita f790257fa7 rules: reformat GetComponents
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:49 +03:00
Ran Benita 52939d4bea rules: reformat SubstituteVars
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita a9477b5754 rules: reformat CheckApplyRules and ApplyPartialMatches
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita a47dd25219 rules: reformat CheckGroup and CheckApplyRule
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita 18d331b86b rules: rewrite MatchOneOf
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita c02c9ab2f2 rules: reformat ApplyRule
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita 06205717c3 rules: reformat MakeMultiDefs
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita f7de62861f rules: use asprintf instead of _Concat function
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita 5f54764d0d rules: reformat CheckLine and break into several functions
And remove struct file_spec which is really unneeded. Should be
slightly more clear now.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita 2df35895b5 rules: reformat SetUpRemap and struct remap_spec
Rename to more descriptive names and reformat.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita b8ae68c2a3 rules: rewrite get_index to use sscanf
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita ef76ba97b3 rules: don't typedef the structs and rename them
The long prefix is unnecessary now that they are all private.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita 478a6a31d5 rules: reformat input line handling
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita 72d1f2edef rules: don't use custom logging functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita b73bd67615 rules: only export a single function
Really all we need from this file is a way to get xkb_component_names
from an xkb_rule_names, which is now the only thing being exposed. This
should allow for some much needed refactoring of this code.

Since this is only used by xkbcomp.c and uses xkbcomp functions, also
move rules.{c,h} under the xkbcomp dir.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita 0c25ebf341 rules: remove unused struct fields and use size_t
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:48 +03:00
Ran Benita beccc37509 Don't run the benchmark by default
For people running 'make check' on every compilation, this can be
a nuisance.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-20 20:31:19 +03:00
Ran Benita db3e8f2c08 Create path.h for the path.c functions
No need to stash them in xkbcomp-priv.h; files which need the functions
should explicitly include them.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-19 02:21:26 +03:00
Ran Benita b89b8e7023 Change xkb_map_new_from_fd to use FILE*
i.e. xkb_map_new_from_file. The reason is that flex only works with
FILE's, so we must use fdopen on the file descriptor; but to avoid a
memory leak, we must also fclose() it, which, in turn, closes the file
descriptor itself.

Either way is not acceptable, so we can either:
* dup() the fd and use fdopen on that, or
* have the user call fdopen on his own, and accept a FILE* instead of an
  fd.

The second one seems better, and is standard C, so why not. We must add
stdio.h to xkbcommon.h though, which is regrettable, but not a big deal.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-18 20:54:33 +03:00
Ran Benita d15fa57a4b Remove FileHandler callback argument
It's unneeded; the same function is always passed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-18 20:54:33 +03:00
Ran Benita e82bb5c043 Remove unused allowNone from KeyInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-18 20:54:33 +03:00
Ran Benita 5200132f4d Revert "Fix KeyInfo's syms array size calculation"
This partly reverts commit 8feba630fa.

This seems to fix valgrind errors:
==9581== Invalid read of size 4
==9581==    at 0x4E50928: MergeKeyGroups (symbols.c:544)
==9581==    by 0x4E510F3: MergeKeys (symbols.c:644)
==9581==    by 0x4E514C6: AddKeySymbols (symbols.c:722)
==9581==    by 0x4E51A3F: MergeIncludedSymbols (symbols.c:854)
==9581==    by 0x4E51E97: HandleIncludeSymbols (symbols.c:952)
==9581==    by 0x4E53D75: HandleSymbolsFile (symbols.c:1619)
==9581==    by 0x4E55A0B: CompileSymbols (symbols.c:2187)
==9581==    by 0x4E4056C: CompileKeymap (keymap.c:160)
==9581==    by 0x4E56953: compile_keymap (xkbcomp.c:149)
==9581==    by 0x4E56AC5: xkb_map_new_from_kccgst (xkbcomp.c:195)
==9581==    by 0x4009D7: test_names (namescomp.c:56)
==9581==    by 0x400A55: main (namescomp.c:75)
==9581==  Address 0x5729b04 is 0 bytes after a block of size 4 alloc'd
==9581==    at 0x4C29024: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==9581==    by 0x4E5C37B: recalloc (utils.c:41)
==9581==    by 0x4E4FF50: ResizeKeyGroup (symbols.c:356)
==9581==    by 0x4E5229E: AddSymbolsToKey (symbols.c:1058)
==9581==    by 0x4E52ABB: SetSymbolsField (symbols.c:1214)
==9581==    by 0x4E536C7: HandleSymbolsBody (symbols.c:1481)
==9581==    by 0x4E53A63: HandleSymbolsDef (symbols.c:1543)
==9581==    by 0x4E53DAD: HandleSymbolsFile (symbols.c:1623)
==9581==    by 0x4E51CA4: HandleIncludeSymbols (symbols.c:909)
==9581==    by 0x4E53D75: HandleSymbolsFile (symbols.c:1619)
==9581==    by 0x4E51E74: HandleIncludeSymbols (symbols.c:951)
==9581==    by 0x4E53D75: HandleSymbolsFile (symbols.c:1619)

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-18 20:54:33 +03:00
Ran Benita 75ff2cefda Various static analyzer fixes
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-18 20:54:33 +03:00
Ran Benita b571b83459 Fix a memleak
Introduced in 38cb639082.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-18 20:54:33 +03:00
Ran Benita ab82e0ebc3 Fix configure check for xkbparse.c instead of parser.c
This obscure test is easy to miss.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-18 20:54:32 +03:00
Pekka Paalanen 8ca8f05aab Add xkbcommon-uninstalled.pc 2012-05-18 01:05:14 +01:00
Pekka Paalanen 8bdef139a6 Use eaccess() only if available
Fixes build on Android.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-05-18 01:05:14 +01:00
Pekka Paalanen cb804a9d4e Fix out-of-tree build for config.h
config.h appreas in the build dir, not src dir.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-05-18 01:05:14 +01:00
Daniel Stone 661cb84051 Add benchmarking test to rulescomp
Apparently it only takes us 8ms to build keymaps.  Nice!

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-18 01:04:35 +01:00
Kristian Høgsberg 3fbc277bb8 Use $(AM_V_GEN) to prettyfi makekeys step 2012-05-11 16:14:27 +01:00
Daniel Stone 7b00485a6b Rename 'ctx' back to 'context' in external API
Still keep things as 'ctx' internally so we don't have to worry about
typing it too often, but rename the user-visible API back as it was
kinda ugly.

This partially reverts e7bb1e5f.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-11 15:03:43 +01:00
Daniel Stone f95b41131d Add xkbcommon-keysyms.h to Makefile.am
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-11 14:28:54 +01:00
Daniel Stone 471e112208 Document that xkb_state_get_map doesn't take a ref
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 20:52:33 +01:00
Daniel Stone 7a1201bdf2 Change xkb_key_get_syms to just return a bare int
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 20:51:37 +01:00
Daniel Stone 46441b1184 Move KcCGST API to internal-only
And don't export it.  We don't need it for X11 support, let alone
anything else.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 20:49:04 +01:00
Daniel Stone 2761b1a332 Rename serialise to serialize
Yes, British English is correct, but unfortunately we've lost that
battle.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 20:49:01 +01:00
Daniel Stone 5a3771d149 Add common LED names to xkbcommon-names.h
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 20:18:30 +01:00
Daniel Stone 693d0578f2 Include xkbcommon-names.h from xkbcommon.h
So clients only have one file to include.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 20:17:13 +01:00
Daniel Stone 3e3ddd43e9 Remove keycode_range_is_legal
It was a pretty pointless check.  Also sanitise the _x11 variant to
actually do what it says on the box.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 20:16:51 +01:00
Daniel Stone 6433d72e7c Merge remote-tracking branch 'krh/keysyms'
Conflicts:
	src/keysym.c
	src/misc.c
	src/text.h
	src/xkbcomp/expr.c
	src/xkbcomp/parser.y
	src/xkbcomp/parseutils.c
	src/xkbcomp/symbols.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 20:15:46 +01:00
Kristian Høgsberg ace1e5df6d Use our own keysyms 2012-05-09 14:21:15 -04:00
Kristian Høgsberg c6897d2698 Add XKB version of X11 keysyms
With this we're now completely standalone.

add vendor keysyms
2012-05-09 14:21:15 -04:00
Ran Benita 5e59ef3f47 Remove support for xkb_layout and xkb_semantics file types
These are two aggregate file types which are not used anywhere. We
maintain useful-enough backward compatibility in the parser, by treating
them as xkb_keymap. The keymap type allows for all types of components,
so they will still compile fine if they ever come up.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-09 17:53:15 +01:00
Ran Benita e7bb1e5fd9 Shorten context to ctx
(This breaks the API.)

"context" is really annoying to type all the time (and we're going to
type it a lot more :). "ctx" is clear, concise and common in many other
libraries. Use it!

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Fix for xkb -> keymap change.]
2012-05-09 17:52:26 +01:00
Ran Benita 699a0b841c Contextualize the atom table
Each context gets its own table, i.e. interning a string in one context
does not affect any other context.

The existing xkb_atom_* functions are turned into wrappers around a new
standalone atom_table object.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated for xkb -> keymap.]
2012-05-09 15:56:25 +01:00
Ran Benita cdd2906de3 Make the context available for XkbcAtomText
And rename the function to xkb_atom_text.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated for xkb -> keymap.]
2012-05-09 15:55:40 +01:00
Ran Benita 8d680e808a Make the context available for XkbcAtomGetString
In preparation of contextualizing atom handling.
Since we touch every function call, we also rename the function to
xkb_atom_strdup to match xkb_atom_intern, and be more descriptive.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated for xkb -> keymap.]
2012-05-09 15:43:47 +01:00
Ran Benita c117318ff1 Make the context available to xkb_intern_atom
In preparation of contextualizing the atom table.
Since we touch every function call, also rename the function to
xkb_atom_intern, to match better with the rest (which will also be
renamed).

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Fixed for 'xkb' -> 'keymap'.]
2012-05-09 15:31:43 +01:00
Ran Benita 4aef083e46 Contextualize XkbFile IDs
Currently the IDs are assigned from a static variable inside
CreateXKBFile. This can lead to some unpleasantness with threads, so
maintain the counter in the context instead.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-09 15:30:49 +01:00
Ran Benita 64aa5c95ed Make the context available to the parser
We will need the context to remove some global state.
Also make the Parse* function just return bool while wer'e at it.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-09 15:30:48 +01:00
Pekka Paalanen bdbb3ac455 makekeys: fix cross-compilation
makekeys must be built with the build-native compiler, not with $(CC)
which is the cross-compiler. The only sane way to achieve this seems to
be to use a separate Makefile.am for it.

This patch fixes the problem apparently caused by:

commit b5efe41f19
Author: Ran Benita <ran234@gmail.com>
Date:   Sat Mar 24 04:48:31 2012 +0200

    Make build non-recursive

There is no such thing as makekeys_makekeys_CC in automake.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-05-09 15:24:50 +01:00
Daniel Stone f9fa740fd5 Make build directory includes more explicit
We depend on parser.h which is generated by flex during the build, so
use an explicit $(top_builddir) rather than a relative path.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 15:23:44 +01:00
Daniel Stone 38cb639082 Change all 'xkb' xkb_keymap names to 'keymap'
To make it a bit more clear what it actually is.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 15:17:25 +01:00
Daniel Stone e1af48bc04 Rename keysym <-> string API
Change them to refer to the string representation of the keysym's name
as a name rather than a string, since we want to add API to get the
Unicode printable representation as well.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 13:22:34 +01:00
Daniel Stone 124e62e48f Add multiple modifier state matching API
Two new calls allow users to test the exact modifier state, including
verifying that no other modifiers but the ones you wanted are down.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-09 01:06:10 +01:00
Daniel Stone 74a197d271 Add pre-defined names database
xkbcommon-names.h right now just contains a set of hardcoded modifier
strings that are most commonly used for the usual modifiers.  Provide
definitions of these so people don't have to worry about typoing a
string or mixing up Mod1 and Mod4.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08 17:59:35 +01:00
Daniel Stone 2a0f1780f9 Add context flag to inhibit default include paths
Which will make the context start with no include paths at all.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08 17:52:45 +01:00
Daniel Stone c358428009 Add flags to context creation
None defined as yet, but why not.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08 17:51:16 +01:00
Daniel Stone b537b5524a Add flags to keymap compilation entrypoints
No use as yet, but might as well ...

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08 17:48:29 +01:00
Daniel Stone 1928397a21 Reintroduce $(builddir)/src/xkbcomp include
This is required for parser.h, which is autogenerated and thus only in
the build directory.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08 17:47:54 +01:00
Ran Benita b610b2b953 Rename XKBcommonint.h to xkb-priv.h and use it
Make the files in the src/* directory use their own header or a
consilidated private header. This makes the file dependencies clearer.

Also drop the pointless "xkb" file name prefix, add split a few
declarations to their own files (atom.h and text.h).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-08 17:29:43 +01:00
Ran Benita 33273304f2 Rename xkbcomp/misc.h to xkbcomp-priv.h and use it
The include dependencies were quite convoluted, where you change the
order and get a ton of errors. Instead, change one file to act as the
internal interface for the xkbcomp files, and make every file use it.

Also drop the pointless "xkb" prefix to file names.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-08 17:29:41 +01:00
Ran Benita dccdf32cc4 Refactor Compile<component> functions
The error handling was not ideal, so unify it. Also makes the functions
a bit easier to read.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-08 17:29:10 +01:00
Ran Benita 5eb0a70e61 Don't use typeof
clang complains with the xorg-macros warning flags:
src/context.c:58:36: error: extension used [-Werror,-pedantic,-Wlanguage-extension-token]
                                   typeof(new_paths));

This was not entirely correct, too. So bring back the casts to the
results of the allocation macros; might as well make them a bit more
type safe.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-08 17:28:54 +01:00
Ran Benita fbfbf0aa4b Remove left over filecomp.sh file
Should have removed it in a previous commit.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-08 17:28:53 +01:00
Ran Benita 40b56b0fe3 Update .gitignore for automake 1.12
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-08 17:28:52 +01:00
Ran Benita a1e07fb6f6 Uncomment sections of test/rulescomp.c
Fixes an 'unused' warning. There seems to be nothing wrong with these
sections though, all the tests pass.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-08 17:28:50 +01:00
Ran Benita b41c77f8a8 Revert "Unconstify xkb_rules_names"
This reverts commit d007cd0a1f.

This is in fact more restrictive, because it breaks the (common) case
where the strings are const themselved, e.g. "evdev", "us", etc. As is
you must either duplicate the strings or suppress the warnings.

If the user needs to retain the non-const strings, he should instead
just keep them in some other struct and use xkb_rules_names just as
a temporary parameter for xkb_map_new_from_names. Mildly annoying but
acceptable.
2012-05-08 17:28:49 +01:00
Daniel Stone 9797c918ca Use AC_ARG_VAR for X11 header and XKB paths
And don't call pkg-config unless we need to.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-07 17:30:47 +01:00
Daniel Stone 70dfe166f8 Rename YYLTYPE to struct YYLTYPE
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-07 14:23:46 +01:00
Ran Benita 409ec8a12e Merge src/alloc.c and src/malloc.c
The two files do exactly the same sort of things, without any discernible
reason for splitting them.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated for xkb_desc -> xkb_keymap changes.]
2012-05-01 13:59:23 +01:00
Ran Benita aff531fb4d Remove unused stuff from xkbrules.h
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-01 13:58:09 +01:00
Ran Benita 62a75dc179 Remove unused stuff from XKBcommonint.h
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-05-01 13:57:55 +01:00
Ran Benita 12b3495ddf Remove unused 'which' and 'merge' arguments
Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated for xkb_desc -> xkb_keymap changes.]
2012-05-01 13:57:31 +01:00
Ran Benita 793908a046 Remove unused 'compiled' field in XkbFile
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-30 17:06:36 +01:00
Ran Benita 5fb494eca9 Remove unused debugging function
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-30 17:06:31 +01:00
Ran Benita afa34f3d2f Remove unused function XkbcNameMatchesPattern
Because the function is recursive, the compiler didn't say anything, eh.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-30 17:06:25 +01:00
Ran Benita 522be162b2 Use LT_INIT instead of deprecated AC_PROG_LIBTOOL
And add some warnings to the autoreconf step, for the developers to
see.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-30 17:06:15 +01:00
Ran Benita a641a1859b Use stdbool.h
'Cause defining your own True and False is so 1990's.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Fixed for xkb_desc -> xkb_keymap changes.]
2012-04-30 17:05:57 +01:00
Ran Benita a39ed85f56 Fix formatting in xkbcomp headers
Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Fixed for xkb_desc -> xkb_keymap change.]
2012-04-30 17:00:47 +01:00
Daniel Stone 1f81c0e163 Dump include paths when we can't find rules
Since the most common failure mode here is a failure to properly set the
XKB data path, dump the include path so people at least have a clue
where to look.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-04-26 16:02:49 +02:00
Alan Coopersmith a1c08536a5 Include strings.h in XKBcommonint.h for strcasecmp etc
POSIX specifies that these functions require <strings.h>, but we were
only including <string.h>.  It did work, but still.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2012-04-26 13:49:00 +02:00
Ran Benita 4b49e0a117 Overhaul test suite
Rewrite all of the current tests in the following ways:
- Instead of the current mix of C and shell, just use single-process
  pure C file per test. All of the .sh files are removed, but everything
  that was tested is ported.
- Instead of handling the test logs ourselves, use Automake's
  "parallel-test" mechanism. This will create a single log file for each
  test with it's stdout+stderr, and a top level "test-suite.log" file
  for all the failed tests.
- The "parallel-tests" directive also makes the test run in parallel,
  so "make check" runs faster.
- Also use the "color-tests" directive to have the "make check" output
  colorized. Who doesn't like to see PASS in green?
- All of the test data files are moved into the test/data subdirectory.
  That way we can just put the directory in EXTRA_DIST and forget about
  it.
- The test/Makefile.am file is consolidated into the main Makefile.am,
  for a completely non-recursive build.

Right now the tests are completely independent and just use simple
assert()'s. More sophistication can be added as needed.

It should also be noted that it's still possible to use shell, python,
etc. if a test wants more flexibility than C can provide, just do as
before.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated for xkb_keymap changes.]
2012-04-09 14:21:47 +01:00
Ran Benita b1e49ff980 Reformat actionHandler dispatch table
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 14:16:17 +01:00
Ran Benita 1b9635dfb5 Add xkb_state_get_map()
This is very useful because it avoids redundent pointers in structs
and/or parameter passing in the application.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 14:16:17 +01:00
Ran Benita 8fbd44fde6 Implicitly include config.h in all files
The definitions in config.h should be available in all files an
implementation detail; it can be included through the build system
instead of having each file pull it every time.

This is especially helpful with AC_USE_SYSTEM_EXTENSIONS, as _GNU_SOURCE
and friends can have an effect by merely being defined, which can lead
to some confusion if its effective for only half the files.

And we don't really support a build _without_ config.h; so, one less
thing to worry about.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 14:16:17 +01:00
Ran Benita 5df53e4944 Remove xproto and kbproto from pkg-config file
These are no longer needed for using the library, only building it. Most
users would still want xproto though, for the keysym definitions.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 14:04:25 +01:00
Ran Benita 18e6a6a43e Remove Xfuncproto.h and XKB.h from xkbcommon/xkbcommon.h
The kbproto header is already not needed here anymore.

Move the _X_EXPORT's to the corresponding function definitions, and use
straight extern "C" clauses instead of _XFUNCPROTOBEGIN/END.

It also makes more sense to have the EXPORT's in the source files, as it
provides some documentation to the reader, whereas in the header it's
obvious.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated for xkb_keymap changes.]
2012-04-09 14:04:11 +01:00
Ran Benita 073a21076c Constify the syms_out argument to xkb_key_get_syms()
The caller should not mess around with these as they come directly from
our internal structs.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 13:58:44 +01:00
Ran Benita 467d7bb64e Implement missing xkb_state_ref and add return value
xkb_state_ref was missing.

Also modify the _ref functions to return the object instead of being
void. This is a useful idiom:

    struct my_object my_object_new(struct xkb_state *state)
    {
        [...]
        my_object->state = xkb_state_ref(state);
        [...]
    }

Essentially "taking" a reference, such that you don't forget to
increment it and it's one line less (see example in our own code).

A case could also be made for _unref to return the object or NULL, but
this is quite uncommon.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated for xkb_keymap changes.]
2012-04-09 13:57:36 +01:00
Ran Benita b08629f92b Do not enable yacc trace facility unconditionally
Define DEBUG and set yydebug if you want that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 13:56:32 +01:00
Ran Benita 913e0740cb Constify a global table and function arguments
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 13:56:23 +01:00
Ran Benita d116aaef9f Remove unused struct definition
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 13:56:20 +01:00
Ran Benita 28011e71ad Replace remaining use of Atom instead of xkb_atom_t
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 13:55:59 +01:00
Ran Benita e9537d50d0 Fix possible overflow in scanner
Also reduce the size of scanBuf given that it's allocated on the stack,
and 1024 is enough.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 13:54:15 +01:00
Ran Benita 8feba630fa Fix KeyInfo's syms array size calculation
When merging group info from two KeyInfo's, the new size of the keysym
array was off. Fix it to match how it is used a few lines below.

There are also some peripheral fixes, and some comments (took me a
few minutes to get what's going on).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 13:53:26 +01:00
Ran Benita 518debb3bc Set xorg-macros CFLAGS correctly
A previous commit messed up all warning flags. Oops.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-09 13:52:38 +01:00
Ran Benita 2590b5a15d Fix compiler warnings
(They were not reported, see next commit).
The reset function declaration didn't match its name in the definition;
the _defaults variant matches better with the rest.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated to current master.]
2012-04-09 13:48:00 +01:00
Daniel Stone d007cd0a1f Unconstify xkb_rules_names
Since we never return an xkb_rules_names and it's all user-provided
strings, seems a bit harsh to have it const.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-04-09 13:47:23 +01:00
Daniel Stone ef88c7efab Rename xkb_desc to xkb_keymap
struct xkb_desc was just a hangover from the old XkbDescRec, which isn't
a very descriptive name.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-04-09 13:47:23 +01:00
Daniel Stone bc872252f3 Use xorg CFLAGS and fix AC_USE_SYSTEM_EXTENSIONS
autotools was warning that AC_USE_SYSTEM_EXTENSIONS was being called too
late, so move it earlier.  Also shove BASE_CFLAGS into CFLAGS so we get
all the added warning flags from xorg.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-04-09 13:47:23 +01:00
Daniel Stone 632d9f0336 Eliminate remaining gcc warnings
Various one-liners (mostly removing unused variables) to make the code
safe for the full set of warnings used by the xorg macros.

On Debian-based systems, flex generates incorrect code resulting in two
warnings about yy_getcolumn and yy_setcolumn having no previous
declaration despite being non-static.  Fedora carries a patch to fix
this, and a bug has been filed on Debian's flex to add the patch:
http://bugs.debian.org/667027

Aside from this, it's now safe for --enable-strict-compilation.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-04-09 13:47:23 +01:00
Daniel Stone 495d87b06d Don't parse nonsense Unicode/hex keycodes
If a keysym was specified as "U1039andsomeextrastuffontheend", return
NoSymbol rather than 0x10001039; similarly, return NoSymbol for
"0xdeadbeefhitherehowsyourdaybeen" rather than 0xdeadbeef.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-04-03 15:12:04 +01:00
Daniel Stone 151fb4fc6d Remove unused device_spec
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-04-03 15:12:03 +01:00
Daniel Stone f249919ec6 include resets group compatibility modifiers #43091
This change makes sure that include does not overwrite previous
compatibility modifier settings when the included files does not
explicitly specify them.

Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>

[Cross-picked from xkbcomp commit 14470719.]
2012-04-03 15:11:42 +01:00
Daniel Stone 0002b8524c Add cscope output to .gitignore
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-04-03 13:01:10 +01:00
Daniel Stone 69111405b0 Properly document xkb_key_get_syms
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-04-03 12:48:05 +01:00
Ran Benita aeaa623d27 Constify a global table
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-02 13:12:31 +01:00
Ran Benita c83043b3c1 Make temporary fix for stale xkb_atoms
When xkb_free_keymap is called the atoms are all free'd, but action.c
keeps a global copy of interned "true" and "false", which remains stale.

The correct fix is to remove the need for the ActionsInit function
entirely.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-02 13:12:27 +01:00
Ran Benita 3c9493795b Fix bugs to allow multiple keymaps in one process
These were several initializations that were forgotten in the previous
memory leak fixes.

Now several xkb_desc's can coexist (relatively) peacefully.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Only the atom.c is relevant with the new context API.]
2012-04-02 13:11:59 +01:00
Ran Benita ffb610c943 Remove useless check from xkb_intern_atom
The "makeit" variable is always true. Remove it and de-indent.
(Also change the type of the "len" variable to size_t to avoid some
useless casting).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-02 13:10:52 +01:00
Ran Benita 7a7ec9b14a Avoid leak in CompileKeymap error path
The NULL check is unneeded, and prevented the atoms from being free'd.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated for xkb_map_unref.]
2012-04-02 13:10:38 +01:00
Ran Benita 5c5f7fcb7c makekeys: use correct format strings
The new glibc (2.15) appear to cause trouble, particularly the sscanf
call, where makekeys will output empty hash tables. Using the appropriate
macros from inttypes.h makes it work again.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-02 13:09:44 +01:00
Ran Benita 84ec6b61a7 Add a NULL check before before strcmp'ing
The names array can have NULL entries for some virtual modifier indexes.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-02 13:09:40 +01:00
Ran Benita 9813778e73 makekeys: free strings before exiting
Just to make valgrind happy.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-02 13:09:36 +01:00
Ran Benita 8f2c9597ba Use straight strtok_r instead of wrapper
strtok_r is POSIX-2001 and should be fine.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-02 13:09:21 +01:00
Ran Benita fb606b06a9 Avoid use of partly initialized VModInfo in error path
Such as:

Compiling path: ./test/data/bad.xkb  mapName:
==1300== Conditional jump or move depends on uninitialised value(s)
==1300==    at 0x4E46166: HandleVModDef (vmod.c:90)
==1300==    by 0x4E3FEC9: HandleKeyTypesFile (keytypes.c:1035)
==1300==    by 0x4E3FBE1: HandleIncludeKeyTypes.constprop.11 (keytypes.c:387)
==1300==    by 0x4E401DD: HandleKeyTypesFile (keytypes.c:1022)
==1300==    by 0x4E3FBE1: HandleIncludeKeyTypes.constprop.11 (keytypes.c:387)
==1300==    by 0x4E401DD: HandleKeyTypesFile (keytypes.c:1022)
==1300==    by 0x4E4026F: CompileKeyTypes (keytypes.c:1150)
==1300==    by 0x4E3DF9B: CompileKeymap (keymap.c:169)
==1300==    by 0x4E465E9: compile_keymap (xkbcomp.c:205)
==1300==    by 0x4E46BE4: xkb_compile_keymap_from_file (xkbcomp.c:290)
==1300==    by 0x400B37: test_file (filecomp.c:47)
==1300==    by 0x4008E3: main (filecomp.c:90)
==1300==  Uninitialised value was created by a stack allocation
==1300==    at 0x4E3FB3F: HandleIncludeKeyTypes.constprop.11 (keytypes.c:366)

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-04-02 13:09:06 +01:00
Daniel Stone cc5588c65b Fail gracefully on failure to find component include
If we can't find the component of the include file we're looking for,
make sure we don't return success when we meant failure, segfault, or
spectacularly leak everything.

Tested with incorrect component includes for keycodes, compat, symbols,
and types.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: David Herrmann <dh.herrmann@googlemail.com>
2012-03-29 17:39:11 +01:00
Daniel Stone 9b14e0c311 Tests: Release context on failure to build keymap
No practical effect since they exit(1) regardless, but it keeps valgrind
happy.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-29 17:38:44 +01:00
Daniel Stone 93ce9c7d4f Full support for multiple keysyms per level
Which also involved moving the global symbol map to be per-key instead;
this should probably be split out into a separate commit.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-29 16:31:09 +01:00
Daniel Stone 9cdc1990fa Parsing support for multiple keysyms per entry
Instead of allowing only one keysym per level per group, do as the
external API indicates and allow multiples.  The existing syntax is:
    key <AD01> { [ q, Q ] };
where the new syntax is:
    key <AD01> { [ q, Q, { H, E, L, L, O },
                 { Y, E, S, space, T, H, I, S, space, I, S, space, D, O, G } };

to make the key in the extreme top left of the keyboard do pretty
surprising things in levels 3 and 4.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-29 01:57:06 +01:00
Daniel Stone 36b8771e1f Don't leak strings in merge declarations
Introduced by the reentrant scanner commit.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-29 01:49:55 +01:00
Daniel Stone aa9f2bf98d Don't leak include_paths in context
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-29 01:41:40 +01:00
Daniel Stone 6628cf0bed Remove unused rtrnValue declaration
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-28 19:50:45 +01:00
Ran Benita bb6ca7682c Make parser and scanner reentrant
All global state is removed from the parser and scanner.
This makes use of the standard facilities in Bison and Flex for
reentrant/pure scanner/lexer and location tracking.

Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: Updated to current sources.]
2012-03-27 22:41:22 +01:00
Daniel Stone 034ffce664 Use xkb_contexts in keymap compilation
Primarily for the include path, but also for the logging in future.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 17:22:35 +01:00
Daniel Stone 3e9dd7512c Add new context API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 16:59:01 +01:00
Daniel Stone f0cb4ee219 Update xkb_filter_group_lock_func for xkb_key_direction
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 16:15:06 +01:00
Daniel Stone 21f1bff4af Fix distcheck with non-recursive Makefiles
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 15:56:06 +01:00
Daniel Stone bc8bbf50dc Fix build for X11 modifier masks
Exposed by include path changes, oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 15:51:24 +01:00
Ran Benita 3fa7fdd089 Handle group lock actions
The spec is simple here, as this action has no effect on key releases.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:17:39 +01:00
Ran Benita b5efe41f19 Make build non-recursive
Unify all the different Makefile.am into a single short top level one
(the test/Makefile.am file is left intact though).

This makes the build system simpler to look and should encourage
unifying more currently-disparate code.

Some further motivation can be found in this page:
http://www.flameeyes.eu/autotools-mythbuster/automake/nonrecursive.html

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:17:34 +01:00
Ran Benita 602e87805b Define our own NoSymbol value and use it
Since we have our own xkb_keysym_t type, it makes sense to have our own
NoSymbol value instead of the one from X11/X.h.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:16:36 +01:00
Ran Benita d3908b631c Define our own None atom value
Since we define our own xkb_atom_t type, it makes sense not to use the
X11/X.h None value. This way we can also remove a lot of X11 includes.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:16:11 +01:00
Ran Benita 2165e16ed9 Fix all -Wsign-compare warnings
i.e comparison of signed and unsigned values. These are mostly
harmless but fixing them allows to compile cleanly with -Wextra.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:15:31 +01:00
Ran Benita 813ddf255d Silence -Wcast-qual warnings
There are some cases where we must free a string with a const qualifier.
Add a macro UNCONSTIFY to trick the compiler into silencing the warning
in the cases where we know what we're doing.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:15:11 +01:00
Ran Benita f08ce9b71b Use strcasecmp consistently instead of uStrCaseCmp
There's no use calling the same thing by a different name.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:13:24 +01:00
Ran Benita 3104a8ef18 Move utility macro from XKBcommonint.h to utils.h
And merge all the similar ones into the same name.
The u* prefix is chosen over the _Xkb prefix because it has more uses
throughout the codebase. But It should now be simple to choose a nice
prefix and stay consistent.

Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: fixed for the case where we have strcasecmp]
2012-03-27 14:12:34 +01:00
Ran Benita 2a5f641657 Remove some more useless stuff
Some unused defines and geometry-removal leftovers (specifically the
file geom.c and the struct for the keyboard coordinates).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:09:53 +01:00
Ran Benita 861b0c79c4 Rewrite recalloc to the correct type
The recalloc function should be expressed in terms of bytes to match its
name. However uTypedRecalloc retains its type so nothing is changed.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:09:50 +01:00
Ran Benita 0480f427ad Remove useless stuff from utils
Signed-off-by: Ran Benita <ran234@gmail.com>

[daniels: fixed conflicts from strcasecmp, added includes to make
          filecomp build again]
2012-03-27 14:09:27 +01:00
Daniel Stone 2ac8610fad Remove fallback strcasecmp/strncasecmp
Sorry if your libc doesn't have this, but it's not my problem.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Ran Benita <ran234@gmail.com>
2012-03-27 14:06:56 +01:00
Daniel Stone 55b76a6389 Add include/ to makekeys include path
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 14:05:14 +01:00
Ran Benita d22b8dbbd0 Move utils.{c,h} to be used by the entire project
This is a first step for making consistent use of utils.h also outside
of xkbcomp/ .

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 13:59:51 +01:00
Ran Benita 7cc17ec507 Fix a scanf type mismatch
"%o" takes an unsigned int.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 13:59:50 +01:00
Ran Benita f52671a4d1 Remove a few remaining uses of the KeySym type
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 13:59:22 +01:00
Ran Benita 8b3e2b9b00 Add xkb test file to EXTRA_DIST
To appease make distcheck.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 13:59:19 +01:00
Ran Benita 1b17708c88 Fix incorrect usage of && instead of &
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 13:59:17 +01:00
Ran Benita eeb0a21448 Update gitignore for 'state' test
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 13:59:15 +01:00
Ran Benita 6f7478d775 Fix latin8 upper/lower case check
GCC complained:
misc.c:235:13: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
misc.c:248:13: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]

Looking at keysymdef.h shows that the check is indeed wrong. This commit
updates the check to match the latin8 section of keysymdef exactly.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 13:59:14 +01:00
Ran Benita 3b22373f1f Properly free xkb_state's
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 13:59:08 +01:00
Ran Benita d9f934ca42 Mention xkb_state_new can return NULL
in the header comments.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-27 13:58:27 +01:00
Guillem Jover 087327d9c5 Move doxygen comment before enum item
Signed-off-by: Guillem Jover <guillem@hadrons.org>
2012-03-27 13:45:17 +01:00
Daniel Stone 389c2db1d7 Remove internal API from xkbcommon.h
And move it to XKBcomminint.h.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 13:44:48 +01:00
Daniel Stone 3dcd7ae02c Remove hardcoded legacy modifier masks
Use the xkb_state_mod_* and xkb_map_mod_* API instead.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 12:20:42 +01:00
Daniel Stone 729ac12f1c Remove unused changes structs
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 12:19:42 +01:00
Daniel Stone f89b0a80ba Remove unused members of xkb_state
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 12:18:50 +01:00
Daniel Stone ede8473490 Add enum xkb_key_direction instead of bool
Use XKB_KEY_UP instead of 0 and XKB_KEY_DOWN instead of 1.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Ran Benita <ran234@gmail.com>
2012-03-27 12:18:41 +01:00
Daniel Stone 7f471a702e Add state serialisation API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 12:11:27 +01:00
Daniel Stone 83b8b4b533 Cosmetic coding style fixups
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 12:07:40 +01:00
Daniel Stone d039622a65 Rename keymap allocation API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-22 17:39:12 +00:00
Daniel Stone 3d672fcfea Add LED state API
And also convert state.c to use the state API for mods and groups,
rather than testing the state members directly.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-22 14:32:53 +00:00
Daniel Stone b6c79ad0d8 LEDs: Fix string comparison bug
This resulted in duplicate sets of modifiers, since we were comparing
pointer equality of two strings, rather than string equality.  Oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-22 14:32:23 +00:00
Daniel Stone 504cc0b858 Check for invalid indices in mod/group state API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-22 14:31:33 +00:00
Daniel Stone cfb07724b7 Fix documentation bugs with mod/group state API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-22 14:30:58 +00:00
Daniel Stone aaffcef35d Add a proper README
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-21 16:57:05 +00:00
Daniel Stone edcaab6512 Round out new state API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-21 15:25:45 +00:00
Daniel Stone 9468d84ad1 Fix (correct, but harmless) const warning
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-21 14:44:16 +00:00
Daniel Stone ecea0d71b2 Add new state API
Add new API to deal with xkb_state objects, including
xkb_state_update_key, which runs the XKB action machinery internally to
calculate what exactly happens to the state when a given key is pressed
or released.

The canonical way to deal with keys is now:
    struct xkb_state *state = xkb_state_new(xkb);
    xkb_keysym_t *syms;
    int num_syms;

    xkb_state_update_key(state, key, is_down);
    num_syms = xkb_key_get_syms(state, key, &syms);

More state handling API, including a way to get at or ignore preserved
modifiers, is on its way.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-21 02:22:04 +00:00
Daniel Stone 272ccbf473 Remove some rogue fprintfs
Oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-21 02:19:44 +00:00
Daniel Stone 1afc6fca4d Don't clear real mods in action modmask
Previously, we would clear out the real modmask when updating the
modmask for action maps, if not using the key's modmask.  The correct
behaviour here is instead to use the key's modmask if using the modmap,
else use the real mods provided with the action originally.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-21 02:17:58 +00:00
Daniel Stone f44eed3e9a Remove unnecessary allocation in expr.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-21 00:33:29 +00:00
Daniel Stone bcd811ce2f Small constification
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-20 17:24:09 +00:00
Daniel Stone 3d31be5f87 Also print group name in keysym error
Unfortunately we can't get the actual file it was defined in this far
down, but at least give the human-readable name rather than just a group
index.

Also, groups are not zero-indexed, such that index 0 is group 1; fix
that too.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-16 14:29:40 +00:00
Daniel Stone 7dbd304021 More useful errors for invalid keysyms
Instead of generating a fairly droll internal error, generate a warning
also telling us exactly where the bad definition was.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-16 14:22:04 +00:00
Daniel Stone f40e0790f2 Fix non-useModMapMods action masks
By ensuring their mask is only the vmods, rather than also potentially
including the key's modmap.  Also remove the unnecessary vmodmask
indirection.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-16 13:59:24 +00:00
Daniel Stone 7e2dd12142 Add geometry test
Add the dump of my full current X11/XKB keymap as a test for filecomp,
being as it also includes geometry.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-15 09:44:55 +00:00
Daniel Stone 9452165837 Plug leaks in geometry parsing
When parsing a geometry file, don't leak the elements we've created.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-15 09:44:55 +00:00
Daniel Stone 937d40492c Remove more float support
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-15 09:33:56 +00:00
Daniel Stone 3560bf7bf4 Also update vmod -> indicator maps
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-15 08:36:09 +00:00
Daniel Stone 0e0b5b00af Update modifiers after building keymap
The server used to have to go and do this on our own, but we can do
better than that: after we've compiled the keymap, go through and bind
virtual modifiers to everything that needs it.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-14 18:24:37 +00:00
Daniel Stone 62444a117c Convert interp action from xkb_any_action to xkb_action
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-14 17:06:09 +00:00
Daniel Stone 4e704e7fae Add xkb_get_syms_by_level
Which allows you to pass in a group and a level rather than a
fully-formed state.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-14 17:05:09 +00:00
Daniel Stone 3d38da0c5b Fix leak in xkbcomp.c
Accidentally regressed this one briefly, oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-14 17:04:36 +00:00
Daniel Stone 54aa839c0e Remove component listing code
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-14 12:00:54 +00:00
Daniel Stone 3ee370e969 Remove unused control members
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-14 12:00:54 +00:00
Daniel Stone 5dd817339d Add a tiny bit of documentation to xkbcommon.h
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-14 11:56:59 +00:00
Daniel Stone bc07452542 Add xkb_key_get_syms API
(And a slight cosmetic header reformatting.)

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-13 19:06:05 +00:00
Daniel Stone 9dde0f3371 Revert "Use XKB_COMMON_* modifier defines in ExprResolveModMask"
Because indices and masks are not at all the same thing.

This reverts commit 645275406f.
2012-03-13 12:46:37 +00:00
Daniel Stone 645275406f Use XKB_COMMON_* modifier defines in ExprResolveModMask
Rather than the ones from XKB.h.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-10 14:42:30 +00:00
Daniel Stone f9b3a14e08 Remove overlay support as well
Right now we just silently ignore overlay controls, which is probably
bad, but it's not the easiest to fix.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-10 14:36:30 +00:00
Daniel Stone 24c61d0f78 Remove half-implemented radio groups
It looks like this could never have worked anyway, what with num_rg
always being 0 everywhere.  Remove it.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-10 14:27:06 +00:00
Daniel Stone e7c8bac79d Remove indirect XkbCM* and XkbSM* macros
The XkbKey* macros used to work through XkbCM* and XkbSM* variants, for
the xkb_map and xkb_server_map respectively; the latter versions weren't
used by anyone at all, so just bin them and make the macros work
directly.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-10 14:08:43 +00:00
Daniel Stone 671ab1bf8f Handle XkbFiles without a name
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-10 13:54:03 +00:00
Daniel Stone c8fd3ea4b6 Move allocation of xkb_desc into CompileKeymap
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-10 13:48:13 +00:00
Daniel Stone 971eb485c5 Clean up xkb_keysym_to_string message
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 20:01:33 +00:00
Daniel Stone 17bcc4c163 Remove geometry even harder
Not the most elegant fix, but will do for now.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:31 +00:00
Daniel Stone a0e756fd83 Introduce xkb_atom_t type
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:31 +00:00
Daniel Stone 0bb24c2d23 Introduce xkb_keysym_t type
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:31 +00:00
Daniel Stone d67a94d374 Remove atom functions from public API
They're no longer needed since we don't expose any atoms in the
published API anymore.  As a result, we don't need to support external
atom implementations either.  Result!

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:31 +00:00
Daniel Stone 731e5c40bc Stringify public name types
Ensure that all names under xkb_desc are strings, rather than atoms.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:31 +00:00
Daniel Stone 57b551a418 Ensure we always have a complete keymap
Refuse to compile without keycodes + compat + types + symbols.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:31 +00:00
Daniel Stone b8e950defd filecomp: Fix xkbcomp warning
Ironically, the test for named.xkb included a call that relied on the
default keymap, without the file naming an explicit default.  Go figure.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:31 +00:00
Daniel Stone 4bc451bf08 Convert CompileKeymap to early-return style
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:30 +00:00
Daniel Stone 59e03bf5f2 Use compile_keymap in xkb_compile_keymap_from_components
We already had this exact function sitting right next to us, so use it
rather than open-coding.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:30 +00:00
Daniel Stone 73919568b0 Add explicit braces
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:30 +00:00
Daniel Stone aa41ab2918 xkbcomp: Turn an array into an anonymous struct
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:30 +00:00
Daniel Stone ed5c6c1796 Remove geometry support, again
It still parses geometry, but happily throws it away.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:30 +00:00
Daniel Stone b28823cc59 Remove KcCGST names from the map
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 16:04:00 +00:00
Daniel Stone ed18e65eac Merge remote-tracking branch 'ran/fixes-cont'
Conflicts:
	src/xkbcomp/expr.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-05 15:07:28 +00:00
Daniel Stone 65e1ff2f0a Merge remote-tracking branch 'ran/fixes' 2012-03-05 15:00:39 +00:00
Ran Benita e4b4d6b051 Fix "Could not resolve keysym" errors
On many layouts, the following error appears:
Internal error:   Could not resolve keysym 10005b0
(Which is like the trademark of libxkbcommon now, and makes
unicode-heavy symbol files pretty useless).

This occurs when a keysym string (in this case, 10005b0) is passed to
xkb_string_to_keysym, but cannot be resolved.
This in turn happens because the parser passes on hexadecimal keysym
strings without the leading "0x", thus leaving the resolving function
without a way to disambiguate it as a number.

Therefore, make sure to pass on the "0x". The file symbols.c in xkbcomp
project does the same; it probably got lost in translation.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita 2473444f92 Refactor XkbFindFileInPath
Also fixes a bug, where the check (typeLen < 1) should have been
(pathLen < 1).

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita 19e99bb27a Free all atoms along with keymap
The code to do this is taken from xserver, dix/atom.c.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita d94d9b4522 Free IncludePath when no longer needed
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita 1e6f956e36 Free scanFile when no longer needed
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita e4447f8131 Fix other misc leaks
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita 30d88b93e7 Don't leak the scanner's buffer
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita c24d97e45e Don't leak DoodadInfo's from GeometryInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita c800c60ace Don't leak ActionInfo's
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita d67e73bdbd Don't leak KeyNamesInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita 5c40bee62a Don't leak the "minimum"/"maximum" string
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita c50c87bca2 Don't leak the various *Info's names when overriding them
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita 889a299e3b Free XkbFile's when no longer needed
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita c357a11aa6 Add function to free XkbFile's
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:04:04 +02:00
Ran Benita 3216ecc07f Don't cache loaded rules files
This needlessly occupies memory for the lifetime of the library, and
does not make a noticeable difference otherwise.

This rules file won't be loaded more than once in most cases anyway, so
just load it again when it happens.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-04 00:02:14 +02:00
Ran Benita ca9829ea66 Don't cache parsed files
This needlessly occupies memory for the lifetime of the library, and
does not make a noticeable difference otherwise.

Instead, just parse the same file again when it happens.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 23:59:43 +02:00
Ran Benita a64e970809 Remove unneeded freeing mechanisms
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
Ran Benita c7bf368780 Make the sections array local to the keymap compiling function
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
Ran Benita baf6a677dc Remove unused global type tokens
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
Ran Benita f549ce078f Use global tables for action string handling
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
Ran Benita d2c3dd0c21 Constify some more text functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
Ran Benita eb738b13ce Constify global tables
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
Ran Benita a0b442356c Use limits.h to find min/max short value
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
Ran Benita 266dfae589 Remove useless casts
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
Ran Benita 1616b8642c Use strchr instead of index
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
Ran Benita 4bc839ab89 Use memset instead of bzero
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-02 22:41:20 +02:00
Ran Benita a3e40917ee Remove return's at the end of void functions
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-02 22:41:20 +02:00
Ran Benita f278cea107 Remove all uses of the register keyword
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-02 22:41:20 +02:00
Ran Benita f424251244 Use strdup instead of strlen + malloc + strcpy
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-02 22:41:20 +02:00
Ran Benita 6a34e4e19a Don't check for NULL before free()
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-02 22:41:20 +02:00
Ran Benita c41061a005 Use yacc-generated header instead of tokens.h
The yacc implementation can generate all the necessary token
definitions itself; there is no need to maintain a hand written
file for that.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-26 21:45:29 +02:00
Ran Benita 0d8874d01c makekeys: update to match the rest of libX11 makekeys
This integrates two commits from libX11:

ebd6ef0a4db0ddef0ae17ad14571518ccdeea5ba
   XStringToKeysym: Special case for XF86 keysyms

    Some XFree86 keysyms were in XKeysymDB as XF86_foo, despite really being
    XF86foo.  So, if we get to the bottom of XStringToKeysym and haven't
    found our XF86_foo, try it again as XF86foo.

    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

00175397480b76d32bf82b0c7c94c91a2a95954e
    makekeys: Scan vendor keysyms as well as core

    Since we can't really live without vendor keysyms, scan them all in to
    generate ks_tables.h, rather than only doing the core ones, and leaving
    the vendor syms to be manually synchronised with XKeysymDB.

    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

Notice that the xkey.sh test is changed to match libX11 behavior, i.e.
XKeysymToString(0x1008FE20) -> "XF86Ungrab" as opposed to "XF86_Ungrab".

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-26 21:09:37 +02:00
Ran Benita ad4f195eb4 makekeys: Receive the keysym files as arguments
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-26 21:09:37 +02:00
Ran Benita 0e98541f37 When makekeys fails to find a good hash, print error instead of divide-by-zero
This matches commit 78a894231ae8ec4959007b6d9b8d2a15d6333a1e from
libX11:
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-26 21:09:37 +02:00
Ran Benita 04e687c9da makekeys: Fix build/target word size mismatch when cross-compiling
This matches commit 24283d40b1e4314c6647dda49d2a159833341a8b from
libX11:

    Since makekeys is built using build environment's compiler and
    runs natively, we have to make sure that the size of the
    Signature type is the same on both the native environment
    and the target, otherwise we get mismatches upon running X,
    and some LSB test failures (xts5).

    Use an unsigned 32-bit integer on all platforms.

    Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
    Reviewed-by: Daniel Stone <daniel@fooishbar.org>

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-26 21:08:55 +02:00
Ran Benita 744527e9a9 Fix remaining warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 12:00:10 +02:00
Ran Benita eff72fab5d Fix warnings in scanner and parser
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 12:00:10 +02:00
Ran Benita 1d969c5cf6 Fix an incorrect sizeof
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 12:00:10 +02:00
Ran Benita f3e4335fc6 Fix all constness warnings
These are all trivial/obvious fixes which clear a bunch of warnings.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 12:00:10 +02:00
Ran Benita cca1c05097 Fix possible null dereferences
Fix all reported null dereferences from clang-analyzer.
There seems to be one false negative (in file indicators.c), but it is
fixed anyway.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 12:00:10 +02:00
Ran Benita 9005624f94 Remove unneeded assignments and variables
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 11:59:56 +02:00
Ran Benita a48ddb5dd3 makekeys: clear const and shadow warnings
The name 'index' is used by the standard library, so use 'ndx' like some
other files.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 11:59:56 +02:00
Ran Benita fdf7e8f6db makekeys: make buf local to main()
All the functions already accept it as a parameter. This clears -Wshadow
warnings.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 11:59:56 +02:00
Ran Benita 6a3b38b171 Remove ancient compatibility check
Other headers include malloc just fine.

Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 11:59:56 +02:00
Ran Benita a0dd052644 Remove unused includes of "tokens.h"
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 11:59:56 +02:00
Ran Benita 9ad0be3358 Remove unused debug #defines
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 11:11:10 +02:00
Daniel Stone 90f04e042b Perform bounds checking in ExprResolveLevel
Both callers perform the same bounds check, so move it into
ExprResolveLevel itself.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 18:07:29 +00:00
Daniel Stone 1ab058bbb3 Fix typo in ExprResolveKeyCode
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:47:46 +00:00
Daniel Stone e209fe31df Perform bounds checking in ExprResolveGroup
Every caller did the exact same check on the group bounds after calling
ExprResolveGroup, so might as well do it inside.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:33:39 +00:00
Daniel Stone 43ed3ff070 Switch expression resolution priv from char to void
Avoids a lot of really lame casts.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:14:04 +00:00
Daniel Stone eb6d9a0528 Remove chaining support from LookupModMask
Turns out we never use it, so.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:09:06 +00:00
Daniel Stone 11ea079175 Invert LookupModMask/LookupVModMask order
We never want to solely lookup a virtual modifier without also looking
up core modifiers.  So, rather than chaining the vmod lookup inside the
core modifier lookup, invert the ordering.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:07:48 +00:00
Daniel Stone 1a2f2556dd Remove unused LookupPriv::priv
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:00:51 +00:00
Daniel Stone 55e058f856 Move some definitions from expr.h to expr.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 16:59:51 +00:00
Daniel Stone 90d86c360a Remove field reference lookup support
None of the lookup functions anyone ever used supported field
references, so don't pretend we do in the API.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 16:54:54 +00:00
Daniel Stone 590df28cc5 Move groupNames mask definition to its user
groupNames was declared in compat.c as a global to anything which
included compat.h (for which groupNames was its sole reason to exist),
but only ever used in indicators.c.

Which is kind of fortunate, given that e314931e removed identical
definitions of groupNames (as integers, not masks) from both action.c
and symbols.c.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 16:35:39 +00:00
Daniel Stone 91b8985297 Turn ExprResolveInteger into a simple wrapper
Move the bulk of ExprResolveInteger into an internal function called
ExprResolveIntegerLookup, and introduce ExprResolveInteger as a simple
wrapper which doesn't take priv/lookup arguments.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 16:24:02 +00:00
Daniel Stone d32822e60f Open-code a radio group SimpleLookup
Because, joke's on you, it wasn't actually looking up radio groups.
Just checking to see if it was a string that was "none", or an integer.

Lord give me strength.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 16:06:01 +00:00
Daniel Stone e314931e8f Add ExprResolveGroup helper
Just a dumb wrapper around ExprResolveInteger.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 15:49:38 +00:00
Daniel Stone 8b47dbbf61 Add ExprResolveButton helper
Just a dumb wrapper around ExprResolveInteger.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 15:47:38 +00:00
Daniel Stone 3431a089cf Introduce ExprResolveLevel helper
Which returns an integer representing the level number represented by
the given expression.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 15:37:53 +00:00
Daniel Stone 193e9b3913 Introduce ExprResolveRadioGroup helper
Just a tiny special-cased version of ExprResolveInteger.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 15:33:40 +00:00
Daniel Stone 26285a7bd9 Remove priv arguments from ExprResolveString
They've never been used.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 14:15:08 +00:00
Daniel Stone b7b49eb0f7 Remove priv arguments from ExprResolveKeySym
They've never been used by its one caller.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 14:10:41 +00:00
Daniel Stone 70033b132b Remove priv arguments from ExprResolveKeyName
They've never been used.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 14:08:55 +00:00
Daniel Stone 482d4faaa1 Remove priv arguments from ExprResolveBoolean
They've never been used.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 13:44:27 +00:00
Daniel Stone 9404157571 Remove priv arguments from ExprResolveFloat
They've never been used.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 13:40:34 +00:00
Daniel Stone 3151ce36fa Remove priv arguments from ExprResolveModMask
What with them now being unused and all.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 13:34:36 +00:00
Daniel Stone 67605d2c90 Introduce ExprResolveVModMask
Which is just a slightly more typesafe wrapper around the chained
ExprResolveModMask everyone was using earlier.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 13:32:09 +00:00
Daniel Stone fbb82199ee Respect explicit minimum/maximum keycodes
Make sure we carry over an explicit minimum/maximum keycode setting,
rather than just using the computed minimum/maximum; this got broken
while changing the keycode range to be unsigned.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-02-16 11:18:49 +00:00
Daniel Stone c45cdb0c67 Still more memory leak fixes
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-16 00:22:11 +00:00
Daniel Stone 83f18b1c3a Fix xkbparse.y compilation
Thanks to autotools happily building stale generated sources, I hadn't
actually ever built my xkbparse.y changes.  Fix that so it not only
compiles, but works.  This seems to parse long keycodes correctly,
although I very much would not recommend testing this by declaring
0x1fffffff as your highest keycode.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 19:39:33 +00:00
Daniel Stone eb8c96cbd9 Don't leak SymbolsInfo
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 16:42:45 +00:00
Daniel Stone 3077e97e7c tests: Free returned XKB map
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 16:38:17 +00:00
Daniel Stone 67c874d76d Enable stderr debugging by default
(If debugFlags is set to non-zero.)

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 16:24:51 +00:00
Daniel Stone f57dcfebf4 Raise keycode range to 32 bits
\o/

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 16:24:51 +00:00
Daniel Stone 1a6c3807d6 vmod: Pass xkb_desc explicitly to vmod functions
Some error paths don't set info->xkb correctly, so just do like most
utility functions and pass the xkb_desc explicitly.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 16:24:50 +00:00
Daniel Stone 4e22851141 Introduce xkb_keycode_t for keycodes
And use it consistently everywhere, including with a special long-safe
internal keycode type, to ease the transition to large keycodes.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 16:24:50 +00:00
Daniel Stone 8f01b14412 xkbscan: Copy, rather than assign, file name
For some reason, lex decided to reduce a strcpy into an assignment,
leading to entirely justified valgrind warnings about invalid reads,
when scanFile was set to a string which may have only ever lived on the
stack of a now-exited function.

Make it a strdup() instead.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 16:24:50 +00:00
Daniel Stone ead9d0cb62 Move include path from X11/extensions/ to xkbcommon/
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 16:24:50 +00:00
Rob Bradford 615291f1f4 xkbcomp: Silence warning of return of uninitialised value
Some routes through HandleGeometryVar do not set a return value. Set a default
value for the return variable to avoid returning an uninitialised value.
2012-01-05 14:24:11 +00:00
Pekka Paalanen c19661b965 Add xkbc_free_keymap helper
Which just calls XkbcFreeKeyboard with the only arguments you'd ever
pass it.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2011-12-16 12:52:00 +00:00
Rob Bradford 99e29de22d xkbcomp: Copy the string into the buffer rather than updating pointer
Avoids assigning the global pointer to a value that may only have a stack
lifetime:

Fixes valgrind warnings such as:

==24795== Invalid read of size 1
==24795==    at 0x4A06E9A: strcpy (mc_replace_strmem.c:311)
==24795==    by 0x4E54D68: ProcessIncludeFile (misc.c:73)
==24795==    by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829)
==24795==    by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673)
==24795==    by 0x4E5A068: CompileSymbols (symbols.c:2211)
==24795==    by 0x4E51A61: CompileKeymap (keymap.c:155)
==24795==    by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236)
==24795==    by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161)
==24795==    by 0x405ED2: display_create (window.c:2007)
==24795==    by 0x403732: main (desktop-shell.c:320)
==24795==  Address 0x7fefff0a0 is just below the stack ptr.  To suppress, use:
--workaround-gcc296-bugs=yes
==24795==
==24795== Source and destination overlap in strcpy(0x7fefff430, 0x7fefff430)
==24795==    at 0x4A06F3D: strcpy (mc_replace_strmem.c:311)
==24795==    by 0x4E54D68: ProcessIncludeFile (misc.c:73)
==24795==    by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829)
==24795==    by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673)
==24795==    by 0x4E5A068: CompileSymbols (symbols.c:2211)
==24795==    by 0x4E51A61: CompileKeymap (keymap.c:155)
==24795==    by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236)
==24795==    by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161)
==24795==    by 0x405ED2: display_create (window.c:2007)
==24795==    by 0x403732: main (desktop-shell.c:320)
2011-10-27 14:30:21 +01:00
Cyril Brulebois f91afe4f3e Add prototype for CheckDefaultMap().
Those warnings disappear accordingly:
|   CC     parseutils.lo
| parseutils.c:742: warning: no previous prototype for ‘CheckDefaultMap’
|   CC     xkbscan.lo
| xkbscan.l: In function ‘XKBParseString’:
| xkbscan.l:220: warning: implicit declaration of function ‘CheckDefaultMap’
| xkbscan.l:220: warning: nested extern declaration of ‘CheckDefaultMap’

Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-06-03 17:19:09 +02:00
Kristian Høgsberg 05f5be9f6d Also update required kbproto version in .pc.in file 2011-04-04 09:21:55 -04:00
Kristian Høgsberg 9dd7dc6d88 configure: Lower kbproto requirement to 1.0.4
There's nothing in 1.0.5 that we need.
2011-03-18 00:33:48 -04:00
Kristian Høgsberg dd0e8b70fb Revert "config: remove incorrectly implemented visibility compiler option"
This reverts commit bf9fdceef6.

We really only want to expose symbols that we explicitly mark as part of
the API.  This may not work with other platforms or compilers, but the
fact that private symbols are not available on Linux+GCC is enough of an
incentive to not use those.

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2011-01-29 14:11:36 -05:00
Cyril Brulebois 621c2a7a8c Get rid of unneeded <X11/Xlib.h> include.
There's no need for this xlib include:
|   YACC   xkbparse.c
|   CC     xkbparse.lo
| xkbparse.y:98:22: error: X11/Xlib.h: No such file or directory

Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2011-01-29 14:10:35 -05:00
Kristian Høgsberg a63e82be2a Rename XkbcInternAtom() to xkb_intern_atom() and export
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2011-01-29 14:10:22 -05:00
Gaetan Nadon b9b0011994 config: update COPYING for software licensing
The Copyright statements must appear in full.
When only the year was different, I added it in an existing
Copyright statement.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:57 -05:00
Gaetan Nadon 1b6e022c97 config: set the default xkb config root based on xkeyboard-config module
The default value ${dataroot}/X11/xkb only works if xkeyboard-config
has created the keymaps in that directory. Let's obtain the true final
value of where the keymaps are and use that as a default. In a production
environment this is the only value that can work.

This new default value also has the merit of making the 'check' target
to work in distcheck which does not have a copy of the xkeyboard-config
keymaps in its sandbox based on ${dataroot}/X11/xkb. The test data
cannot find the "include" keymaps it needs.
.../libxkbcommon-0.1.0/_inst/share/X11/xkb

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:57 -05:00
Gaetan Nadon 5e43e7b46c config: distribute the .sh test programs and test data
The test programs and the test data are required in the tarball
and needed for distcheck.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:57 -05:00
Gaetan Nadon f424bd8f5f config: make it easier to add TEST programs
LDADD is a Makefile wide variable.
Automake matches prog name with .c file by default

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:57 -05:00
Gaetan Nadon ff8e8f696a config: include: use nobase_include_HEADERS
Slightly simpler.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:56 -05:00
Gaetan Nadon 2422c41b8e config: add keysymdef and xf86keysym as dependencies of ks_tables.h
This would cover the scenario where these headers file are updated,
for example, a new version is installed. Running 'make' again
on libxkbcommon should rebuild ks_tables.h.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:56 -05:00
Gaetan Nadon 69e52ad901 config: makekeys prog should stand alone in the makekeys directory
This program is a utility to generated a header file.
The header file it generates should not be located in the
directory where this utility program is compiled.

Move the /makekeys dir as a sibling of /src.
This reduces the number of bi-directional relationships
between directories.

Make corresponding makefiles simplifications.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:56 -05:00
Gaetan Nadon 89377d5cd1 config: use existing variables KEYSYMDEF_H and XF86KEYSYM_H
These automake variables are not currently used.
The variable KS_HEADERS is not required anymore.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:56 -05:00
Gaetan Nadon bf9fdceef6 config: remove incorrectly implemented visibility compiler option
CFLAGS is a user variable which should never be set by the configuration.
It allows the user to alter the configuration compiler options.

The visibility is only set for GNU compiler, leaving libraries built
with other compilers with the wrong visibility.

All other xorg libraries set visibilty using _X_EXPORT or _X_HIDDEN.

For the time being, all the symbols will have the default visibility
which does not break anything.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:56 -05:00
Gaetan Nadon ec3fbfdf6d config: use xproto pkgconfig includex11dir variable
Rather than appending X11 to the include dir.
It should be safe to use as it has been added in 2005.

Use a local variable name matching the pkgconfig name.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:56 -05:00
Gaetan Nadon 3c570b7ce9 config: relocate library functions check and comment
No functional changes.
Follow Automake suggested order.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18 11:19:56 -05:00
Gaetan Nadon 41664ba237 config: remove PKG_PROG_PKG_CONFIG test
If pkg-config is missing, the configuration fails while initializing
XORG_* macros:

warning: PKG_PROG_PKG_CONFIG is m4_require'd but not m4_defun'd
line 11622: PKG_PROG_PKG_CONFIG: command not found

The output is sufficient to locate the problem.
It is not possible, or very difficult, to not have pkg-config
installed as the whole desktop and countless other software
depends on it.

Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08 15:24:21 -05:00
Gaetan Nadon f507660421 config: let Automake handle Lex and Yacc dist and cleaning
BUILT_SOURCES and MAINTAINERCLEAN are not needed for lex and yacc
Note that xkbscan was missing on those lines.

Automake generates all the rules to handle building, distribution
and cleaning.

Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08 15:24:21 -05:00
Gaetan Nadon e2f9f51667 config: allow to build tarball when yacc is missing
Autoconf does not handle this scenario as well as Automake does.
If xkbparse.c is already there, do not abort the configuration
if yacc is missing as it is not needed.

If both xkbparse.c and yacc are missing, abort configuration.
Yacc is a required tool to build the package.

Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08 15:24:21 -05:00
Gaetan Nadon 2c51e4b195 config: add the default README file.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08 15:24:21 -05:00
Gaetan Nadon 7ce1a6dca2 config: add the INSTALL target for installation instructions
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08 15:24:21 -05:00
Gaetan Nadon 63e2719a8f config: replace deprecated INCLUDES with AM_CPPFLAGS
Fixes automake warning.

Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08 15:24:21 -05:00
Gaetan Nadon ceba14dc3e config: update subdirs .gitignore
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07 10:23:18 -05:00
Gaetan Nadon f75ff7d921 config: remove m4/.gitignore now that toplevel one handles it all
The -Im4 in Makefile.am will have to wait until the day
there is an m4 macro checked-in git in the m4 directory.
This does not prevent libtool to install its macros in m4.

Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07 09:47:32 -05:00
Gaetan Nadon 0bfae4149c config: .gitignore: template with default values for components #24239
This toplevel .gitignore covers all possible generated files
from autotools, compiler, linker, etc...

It has been in use for over a year in all xorg modules and has
prevented a good number of patches.

For example, in this module, src/stamp-h1 was not ignored even
if the .gitignore had just been updated. Files with a .patch
extension were not ignored which sometimes cause a patch to be
checked-in git accidentally.

Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07 09:47:32 -05:00
Gaetan Nadon 83f64da993 config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.

Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07 09:47:32 -05:00
Gaetan Nadon a0512b28de config: initialize autoconf, automake and libtool
Add missing AM_MAINTAINER_MODE, matching --enable-maintainer-mode
option in autogen.sh.

Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07 09:47:31 -05:00
Gaetan Nadon 971d9a9955 config: use XORG_DEFAULT_OPTION from util-macros version 1.8
This will handle AM_SILENT_RULES such that it will not break
on earlier Autoconf versions.
It provides a host of other configuration items

Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07 09:47:31 -05:00
Gaetan Nadon 8562d97808 config: set Autoconf minimum version required to 2.60
This is the current minimum version required for all X.Org modules.
The module can be configured with any higher version.
Autoconf features from version > 2.60 cannot be used.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07 09:47:31 -05:00
Jan Engelhardt f0456a832f Update .gitignore
Limit exclusion of files to their respective directory
that they can appear in.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-11-11 23:28:29 +01:00
Jan Engelhardt f8301ebc56 xkbscan: resolve build warning/rpmlint error
xkbscan.l: In function 'setScanState':
xkbscan.l:201:1: warning: control reaches end of non-void function
I: Program returns random data in a function
E: libxkbcommon no-return-in-nonvoid-function xkbscan.l:201

Change return type of setScanState to void, since a return value is
never used by its callers.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-11-11 23:27:21 +01:00
Jan Engelhardt d84da95f69 build: run autoupdate
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-11-11 23:21:36 +01:00
Jan Engelhardt b86fc75272 build: use proper quoting in autogen.sh
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-11-11 23:21:36 +01:00
Jan Engelhardt 2b36543ab1 build: use AC_CONFIG_MACRO_DIR as per libtoolize warning
libtoolize: Consider adding "AC_CONFIG_MACRO_DIR([m4])" to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding "-I m4" to ACLOCAL_AMFLAGS in Makefile.am.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-11-11 23:21:34 +01:00
Jon TURNEY f94a64cc08 Link with -no-undefined
Use -no-undefined to assure libtool that the libxkbcommon library has
no unresolved symbols at link time, so that libtool will build a shared
library on platforms require that all symbols are resolved when the
library is linked.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-26 14:11:38 -04:00
Kristian Høgsberg 8d2c522f31 Don't check for xlib, we don't need it 2010-10-21 21:34:41 -04:00
Kristian Høgsberg c88439dbf0 Update xkb->ctrls->num_groups when copying the keysyms
This used to be set when we read an XKM file.
2010-10-20 22:27:07 -04:00
Kristian Høgsberg 125691573c Restore compatible action structs
This unbreaks the X server code to serialize an xkb_desc, but loses the
32 bit vmod fields.  Needs some work...
2010-10-20 15:57:45 -04:00
Kristian Høgsberg a84c08795e Use flex for generating the scanner, add support for parsing from strings
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2010-10-20 14:03:53 -04:00
Kristian Høgsberg a2f115581d Add struct xkb_state 2010-10-19 15:16:50 -04:00
Kristian Høgsberg e879828717 Don't return a static buffer in public API 2010-10-08 15:33:18 -04:00
Kristian Høgsberg d202bc4462 Pull in XKB_COMMON_* version of modifier masks
This way we can use libxkbcommon without having to include X.h.
2010-10-08 15:07:53 -04:00
Adam Jackson 73ca959d7b Dead code removal and static markup
Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-27 16:06:48 -04:00
Kristian Høgsberg fb05ee47bf Remove libxkbfile dependency for real this time 2010-09-03 20:35:28 -04:00
Kristian Høgsberg 20bfe1280d Use const char * in struct xkb_rule_names 2010-08-29 21:30:10 -04:00
Kristian Høgsberg be2bd66181 Pull in a few #defines from libxkbfile and lower kbproto requirement 2010-08-25 14:51:52 -04:00
Kristian Høgsberg 351f8c6587 Drop Bool type
It's a nightmare trying to avoid double definitions.
2010-07-02 15:05:21 -04:00
Kristian Høgsberg b3805a2360 Get rid of a few unused #defines in public header 2010-07-02 14:21:59 -04:00
Kristian Høgsberg 97fbc348b0 Rename XkbRMLVOSet to struct xkb_rule_names 2010-07-02 14:21:52 -04:00
Kristian Høgsberg 15f259993e Move private structs and defines to private headers 2010-07-02 12:20:59 -04:00
Kristian Høgsberg 3f0034a990 Rename public entry points to lowercase and underscore 2010-07-02 12:20:59 -04:00
Kristian Høgsberg 5669e1a82d Compile with -fvisibility=hidden when possible 2010-07-02 12:20:59 -04:00
Kristian Høgsberg 9f6026867a Pull in enough structs and defines from XKBstr.h to only need XKB.h
We want to move away from sharing implementation structs and let libX11
and libxkbcommon use each their own set of structs.
2010-07-02 12:20:54 -04:00
Kristian Høgsberg 9d55d5bbf6 Drop Xmd.h include now that we're using uint32_t 2010-06-30 17:32:54 -04:00
Kristian Høgsberg 8e653493d0 Fix warning from CARD32 -> uint32_t conversion 2010-06-30 17:31:34 -04:00
Kristian Høgsberg e10e16ad2f Constify XkbcAtomText()
Atoms aren't mutable and this lets us put tbGetBuffer() back in the box.
2010-06-30 17:30:42 -04:00
Kristian Høgsberg d95b289367 Make XkbcInitAtoms() call optional 2010-06-30 17:13:21 -04:00
Kristian Høgsberg 0ece2cdbaf Drop more malloc/free wrappers 2010-06-30 16:56:24 -04:00
Kristian Høgsberg a76df86572 Use the right action structs
We were casting the union members to the wrong action structs (from kbproto).
2010-06-30 16:33:25 -04:00
Kristian Høgsberg 1723ef1bc7 Copy over missing action structs from kbproto 2010-06-30 15:48:39 -04:00
Kristian Høgsberg 9258cc3dca Rename Xkbc*Action to struct xkb_*_action 2010-06-30 13:31:21 -04:00
Kristian Høgsberg 399d4bd678 Drop malloc wrappers 2010-06-28 06:58:01 -04:00
Kristian Høgsberg 47d3b3969b Drop CARD32 and Opaque types 2010-06-28 06:50:12 -04:00
Daniel Stone 2fb329c964 Copy and duplicate XkbModsRec and XkbKTMapEntryRec
Copy these types in so we can extend the vmod size.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-23 16:25:10 +01:00
Daniel Stone b74223eb50 fix mod size confusion
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-23 16:25:02 +01:00
Daniel Stone 8693c2652c Add really rudimentary rules caching support
Keep the parsed form of the last-used rules file around, and reuse that
if we get asked for the same ruleset.  If not, bin it and cache the
other one.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:57:16 +01:00
Daniel Stone 7257d4c89e Use CARD32 instead of Atom, move geom headers in
Use CARD32 instead of Atom/KeySym/et al to avoid type size confusion
between server and non-server code; relatedly, move the geometry headers
in from kbproto, so every non-simple type (i.e. structs containing
nothing more than basic types) is now copied into xkbcommon.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:57:16 +01:00
Daniel Stone b38525421f Interp: More lazy keysym resolution
Resolve the keysyms when we create an InterpDef, rather than directly
in the parser.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:57:16 +01:00
Daniel Stone 2c4a045aca Allow external atom databases
Allow people to plug in an external atom database (e.g. the X server's),
so we don't have to migrate our own atoms over later.  We are a bit
over-keen on atoms at the moment, so it does pollute the atom database a
bit though.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:57:16 +01:00
Daniel Stone 15b0db5492 Copy in XkbCompatMapRec and XkbSymInterpretRec
These contain actions, so transition them ahead to XkbcAction and move
them into XKBcommon.h.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:57:16 +01:00
Daniel Stone 60e7eeeba1 Use CARD32 instead of Atom, drag in XkbClientMapRec
On 64-bit architectures, XID varies in size between the server (always
32 bits), and non-server (always unsigned long) for some inexplicable
reason.  Use CARD32 instead to avoid this horrible trap.

This involves dragging in XkbClientMapRec so we don't get stuck in the
KeySym trap.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:57:12 +01:00
Daniel Stone d2d787df65 Regroup actions into current vs. deprecated, resize vmod
Use Xkbc* for all our actions that we intend to keep around, and Xkb*
for deprecated ones we can hopefully get rid of, at least internally.

While we're at it, make vmods be a uint32_t.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone e564235b43 xkbcomp: Don't malloc() and free() most scanned tokens
Use a constant buffer instead.  Sigh.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone f246db20f4 Fix compilation with DEBUG
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone acc467de9f xkbcomp: Use fread() instead of getc()
So, it turns out that if you're parsing a fairly large amount of data,
using getc() to get all the input rather than, say, read(), is some kind
of remarkably daft and unperformant idea.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone 240a0c3409 xkbcomp: Lazy keysym parsing (avoid XStringToKeysym)
Instead of calling XStringToKeysym on every keysym we parse, store it as
a string until we need to store it in an actual keymap.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone 48baabeb38 Atoms: Avoid allocations in XkbAtomText()
XkbAtomGetString() returns a freshly-allocated string, whereas
XkbAtomText() returns the same in a temporary buffer.  XkbAtomText used
to call XkbAtomGetString() and then free the result, which seems quite
spectacularly pointless when you think about it.  Shuffle the atom code
around so we don't have to allocate for XkbAtomText().

This changes semantics slightly wrt non-printable characters, but I
haven't been able to see any effect so far.  And it may well be ever so
slightly quicker.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone 080a083fd2 configure.ac: Enable automake silent rules by default
This allows us to spot warnings much more easily.  Also, drop the
now-deprecated AM_MAINTAINER_MODE.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone a0e180b083 Expose tbGetBuffer to the rest of libxkbcommon
This will let us implement XkbAtomGetString on top of XkbAtomText,
instead of having the latter get a duplicated string, dump it into a
temporary buffer, and subsequently free it (sigh).

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone 4346e0065b xkbcomp: keycodes: Silence gcc warnings
It was right to warn us: some of these were actually bogus.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone 5df3dff741 xkbcomp: geometry: Plug numerous atom text & expr leaks
This code is absolute misery.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone 18039a6c0b xkbcomp: Atom text and expr leak fixes part #973
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone a22386d402 xkbcomp: Don't leak atom text and string exprs, again
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:56 +01:00
Daniel Stone 8904c6eea7 xkbcomp: expr: Use XkbcAtomText instead of GetString
This returns us a temporary string, rather than leaking the atom.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone ad0a3d7c52 xkbcomp: Don't leak atom text and string exprs
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone d20bdd3b9a xkbcomp: vmod: Don't get and immediately intern atoms
XkbcInternAtom(XkbcAtomGetString(atom)) has to be the most spectacularly
broken antipattern I've yet seen.  Just compare the atoms directly.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone 50a037cacf xkbcomp: Replace open-coded strdup
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone 5140250273 Add testcase for XkbcCanonicaliseComponents
Should be reasonably thorough; the shell part is, however, quite
unpleasant.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone 85b7f47d8a Add XkbcCanonicaliseComponents
Canonicalises two sets of components (new and old), e.g.:
new: +bar
old: foo
result: foo+bar

This is required as part of the spec, so clients can reuse part of the
device's old keymap.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone 8ffa371395 XKBcommon.h: Make header self-contained
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone 8b5af79b7b Keysym: Add apallingly bad API documentation for keysym <-> string
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone 70b64213ca Make keysym <-> string conversion public API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone 62eb167d56 XKB: Text: Use keysym <-> string conversion from keysym.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone a8bb86a48a Test: Keysym: Add tests for new keysym <-> string conversions
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:55 +01:00
Daniel Stone cdc735c8ca Keysym: Fix conversion for Unicode and bare numbers
Ensure that Unicode string representations are accepted and turned into
numbers, as well as hexadecimal numbers in 0xabcd1234 form; unknown
keysyms are output as 0xabcd1234 in string form.

This also ensures that strings are never returned malloc()ed.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:56:50 +01:00
Daniel Stone 8e3239a78f KeySym: Actually handle NoSymbol
Add NoSymbol into the keysym table, so keysym <-> string conversion works for
that, too; also eliminate special-casing of VoidSymbol.

This will require special-casing in libX11 to preserve its API.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-04-25 14:56:57 +10:00
Daniel Stone a5ce9754dc test: Fix srcdir != objdir build and test failures
filecomp would fail because it couldn't find the input files, after
compilation failed due to missing includes.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-04-25 14:56:47 +10:00
Dan Nicholson 4e854a21aa listing: Drop unused deviceSpec argument
The server might care about this, but ListComponents is just reading xkb
files.
2009-04-21 23:22:25 -07:00
Dan Nicholson 481deea178 xkbcomp: Another fairly major rewrite of the listing mode
The listing code in xkbcomp had been setup to allocate a set of buffers
with file paths and then later parse through them to find which maps were
needed.

All the allocation (with the additional allocation for the components
list) was making it really slow, so this patch makes everything simpler
by just generating the components list as we walk the directory tree.
2009-04-21 06:16:15 -07:00
Dan Nicholson 18b43f8dfe Rewrite listing code to generate XkbComponentListPtr
In xkbcomp, the listing code printed out the xkb files to stdout and the
caller would parse the output. Here, we can just generate a
XkbComponentListPtr and pass it back.

This should be a series of smaller commits, but there was no clean way to
do it since it's basically a complete rewrite except for the core map
matching logic.

A lot of code used for special printing modes in xkbcomp has been
shedded. Callers can massage the output as they please.
2009-04-19 16:34:12 -07:00
Dan Nicholson 559305a5cb xkbcomp: Kill unused listing code and make functions static
Much of this was only called from xkbcomp and not used to generate
listings for the server.
2009-04-16 21:47:28 -07:00
Dan Nicholson 5983a4e69d Scale back global variables
Some of the global variables were either not used anymore or only used
in the listing code.
2009-04-16 20:01:13 -07:00
Dan Nicholson 9520ea0eb3 Add XkbNameMatchesPattern implementation from xkbfile
The xkbcomp listing code matches a glob type pattern against installed
xkb files. This adds a Xkbc implementation of the pattern matching code.
2009-04-13 06:24:36 -07:00
Dan Nicholson fa183ce354 xkbcomp: Fix use of removed macros 2009-04-13 06:24:36 -07:00
Dan Nicholson 3d4c4d06d5 Revert "xkbcomp: Remove listing sources"
This reverts commit c4c9e36fbf. It turns
out that the listing code is used to support the X_kbListComponents
request (via XkbListComponents).

This will have to be refactored into some reasonable interface instead
of the current usage where the server reads xkbcomp stdout. Gross.
2009-04-13 06:24:36 -07:00
Dan Nicholson 3dee8ac999 misc: Coding-style cleanup 2009-04-13 06:24:29 -07:00
Dan Nicholson 53ead9b575 Use xkbpath API for locating rules
Instead of hardcoding the XKB base directory when searching for rules in
the xkbcomp code, we can extend the xkbpath API to cover rules and reuse
it. That will make it more convenient if it's ever exposed so people can
set their XKB search paths in a reasonable way.
2009-04-11 10:39:55 -07:00
Dan Nicholson c728d91bde Program and files for testing CompileKeymapFromFile
A few simple test cases for verifying the operation of parsing a keymap
file and compiling a keyboard description from it.
2009-04-10 12:33:31 -07:00
Dan Nicholson abbd141935 Add interface to compile keyboard description from keymap files
We need to support generating a keyboard description from a keymap file
because there are just some cases where RMLVO or ktcsg is not enough.

The map choosing logic has been refactored into its own function and now
supports choosing a named or default keymap.
2009-04-10 12:25:51 -07:00
Dan Nicholson e98eb80509 test: Remove extraneous includes
These programs don't actually use the internal API.
2009-04-09 20:52:26 -07:00
Dan Nicholson 0280b10df9 Make XkbcInitAtoms externally accessible
Applications (like the server) need to initialize the atoms system
before using the rest of the library. Maybe it should just init itself
implicitly.
2009-04-09 14:29:32 -07:00
Dan Nicholson f5d37e279a Constify public API
There's no reason the arguments can't be const.
2009-04-08 17:59:15 -07:00
Dan Nicholson babae38935 Change CompileKeymapFromRules to take XkbRMLVOSet
Let's use a nice interface now that it's available from XKBrulescommon.h.
2009-04-08 17:54:55 -07:00
Dan Nicholson 6a84a34d86 Remove all non-public API from XKBcommon.h header
The noble intention was to expose all the new API and new generic types
in the split out kbproto headers through XKBcommon.h. It turns out that
would be a massive amount of work in the server. Someday, but first just
wedging in XkbCompileKeymap* would be good.

Most of the API is in new internal xkb*.h headers. In order to allow the
XKBcommon.h header to be used from the server, we can't pull in other
headers from kbproto since the server has its own copies. However, types
that are different (XkbDescRec, XkbAction) still have Xkbc equivalents
here, and I think they should be used in the server.
2009-04-08 07:46:25 -07:00
Dan Nicholson b4a3c39b7e Remove KS macros available in XKBfilecommon.h now
A couple of the XkbcKS* macros become redundant with XKBfilecommon.h
split out in kbproto.
2009-04-07 19:56:41 -07:00
Dan Nicholson 5889cef809 Require strdup and remove utils wrapper
This kills a couple warnings from using the uStringDup wrapper. If you
don't have strdup on your platform, you have bigger issues.
2009-04-05 20:27:35 -07:00
Dan Nicholson 8b100fc0a9 Add action datatypes as defined in the server
Some of the XkbAction types are defined differently in the server, so we
add those to XKBcommon.h and use them here like XkbcDescPtr. We'll have
to deal with the impedance mismatch on the client side later.
2009-04-05 15:15:20 -07:00
Dan Nicholson e0e77b71de Coding style cleanup on key allocation functions 2009-04-05 09:30:15 -07:00
Dan Nicholson 713c8f418f test: Exercise compiling from components
This could probably use a lot more real world test cases, but it does
the job for now.
2009-04-04 12:54:44 -07:00
Dan Nicholson a2e597675b xkbcomp: Don't say we're exiting when we're not 2009-04-04 12:50:27 -07:00
Dan Nicholson 85039a0d76 xkbcomp: Give keymap file empty name if none supplied
Ensure that the keymap file topName is not NULL since it gets blindly
dereferenced later.
2009-04-04 12:31:55 -07:00
Dan Nicholson 125ce76f5b xkbcomp: Ensure at least keycodes supplied in components
It seems that at least a non-empty keycodes component is required to
compile a XkbcDescPtr.
2009-04-04 12:21:05 -07:00
Dan Nicholson fdd8a9ec1b xkbcomp: Don't dereference NULL VarDefsPtr 2009-04-04 12:17:50 -07:00
Dan Nicholson 99d2f4a5eb xkbcomp: Refactor keymap file generator 2009-04-04 12:16:04 -07:00
Dan Nicholson 4f736db995 test: Minor refactor to allow $EXEEXT in program names 2009-04-04 11:04:35 -07:00
Dan Nicholson 8f9a612990 test: Add logging and some intentionally failing cases
We want to log the output of the tests rather than letting them go to
stderr. This allows tests we expect to fail to be run.
2009-04-04 11:01:58 -07:00
Dan Nicholson 8269cbce81 xkbcomp: Generating components requires rules _and_ layout
This came from trial and error, but it seems that you can generate a
valid keymap with only rules and layout.
2009-04-04 10:02:39 -07:00
Dan Nicholson fa96602d0f xkbcomp: Fail when converting rules to components returns an error
XkbcRF_GetComponents was returning an error but leaving the generated
components alone. This ensures that the broken XkbComponentNamesPtr is
freed and the error is passed up to the caller.
2009-04-04 09:51:33 -07:00
Dan Nicholson e72fc29f33 xkbcomp: Cleanup error messages 2009-04-04 09:48:59 -07:00
Dan Nicholson 83367a8d2d xkbcomp: Ensure user has supplied a rules name 2009-04-04 09:46:20 -07:00
Dan Nicholson 95dbbb8a7b rulescomp: Remove unneeded API 2009-04-04 09:37:53 -07:00
Dan Nicholson 5d95a43ad0 Refactor xkbpath so that it implicitly initializes
Instead of requiring the user to call XkbInitIncludePath() and
XkbAddDefaultDirectoriesToPath(), all the path entry points now implicitly
initialize the path. When initializing, the default directories are added
so it's useful.

This provides normal operation without exposing the xkbpath API. That
might happen later to allow apps to edit the XKB search path.
2009-04-04 09:29:43 -07:00
Dan Nicholson 5c91062334 Remove trailing spaces in source files 2009-04-04 09:19:51 -07:00
Dan Nicholson 5cc55d7cbb Test compiler to simulate xkbcomp usage
Added a test program, rulescomp, which takes a RMLVO set and generates a
XkbcDescPtr. This is essentially what the xserver will do, except that we
still need to access some xkbcomp internal API to make it work.
2009-04-04 09:14:20 -07:00
Dan Nicholson 51eff3d939 Fix cleanup error in names allocation
A conditional got reversed during the coding style cleanup.
2009-04-04 08:55:23 -07:00
Dan Nicholson c38cdc5ded xkbcomp: Ignore generated parser 2009-04-03 21:18:58 -07:00
Dan Nicholson 3a709e399e xkbcomp: Don't segfault if the debug files aren't set
Another interface that needs to be cleaned up.
2009-04-03 21:17:52 -07:00
Dan Nicholson ec86ce1f1a xkbcomp: Declare global debugging vars
These will need to be sanitized at some point, but for now let's just get
the code running.
2009-04-03 20:34:41 -07:00
Dan Nicholson c14c60bb37 xkbcomp: Back out strdup warning cleanup
There are some spots in the code that use strdup without checking the
argument, so we need this to not segfault. Cleanup later...
2009-04-03 20:34:19 -07:00
Dan Nicholson 71baa3d85a Fix install path for XKBcommon.h 2009-04-03 19:35:01 -07:00
Dan Nicholson 5216f0c92f Drop keysym.h pollution from XKBcommon.h
There's really no need to pull this into a public header.
2009-04-02 06:37:16 -07:00
Dan Nicholson a9822d8720 Add xkbcommon pkg-config file 2009-04-01 06:22:06 -07:00
Dan Nicholson db03c9b7e9 xkbcomp: Clean up utils prototypes
Includes using a macro for the gcc format attributes instead of repeated
ifdef's.
2009-03-31 19:32:49 -07:00
Dan Nicholson a27e56b6fb xkbcomp: Remove duplicated macros 2009-03-31 07:21:20 -07:00
Dan Nicholson 05daf09f18 xkbcomp: Kill warnings about address always evaluating as true 2009-03-31 07:09:47 -07:00
Dan Nicholson a151329266 Merge commit 'tilt/master' 2009-03-31 06:57:06 -07:00
Dan Nicholson a8d936bda5 Compile keyboard description from XKB rules, too
XkbcCompileKeymapFromRules can be used to generate a XkbDescPtr from XKB
rules instead of using components. The previous XkbcCompileKeymap has
been renamed to XkbcCompileKeymapFromComponents.
2009-03-31 05:43:08 -07:00
Dan Nicholson 94fd317463 Add rules file parsing from xkbfile
Copy over the Xkb_RF* rules parsing functions from xkbfile's maprules.c.
Eventually, this will be tied into xkbcomp's path searching utilities so
you don't need to supply a full path to the rules file. Also, it this
should eventually incorporate the server's RMLVOSet.
2009-03-30 06:31:26 -07:00
Dan Nicholson e1284944cf Add rules rules file parsing from xkbfile
Copy over the Xkb_RF* rules parsing functions from xkbfile's maprules.c.
Eventually, this will be tied into xkbcomp's path searching utilities so
you don't need to supply a full path to the rules file. Also, it this
should eventually incorporate the server's RMLVOSet.
2009-03-29 11:31:54 -07:00
Dan Nicholson 3fc0dcc816 Generate keyboard description from components
Finally, we can generate a XkbcDescPtr from a XkbComponentNamesPtr. This
involves turning the components into a parsed XKB file and then passing
it into the compiler. This first conversion needs more error handling.
2009-03-29 08:55:18 -07:00
Dan Nicholson 1115d55549 xkbcomp: Include Xdefs.h for Atom in tokens.h 2009-03-29 08:17:13 -07:00
Dan Nicholson 587a5d956f xkbcomp: Add missing includes for Bool in xkbpath 2009-03-29 08:15:27 -07:00
Dan Nicholson e86b31ce92 Add XKBlib resizing functions
These were originally in XKBMalloc.c.
2009-03-29 08:11:25 -07:00
Dan Nicholson d43a7bf02f Copy xkbfile IsUpper/IsLower macros
xkbcomp was using Xlib's XConvertCase to check upper/lowercase. That's a
lot of code, so hopefully the xkbfile macros using _XkbKSCheckCase are
good enough. This also required that <X11/keysym.h> is included to get
all the XK_* definitions.
2009-03-28 20:22:28 -07:00
Dan Nicholson eff1c53873 Copy XkbEnsureSafeMapName from xkbfile 2009-03-28 19:00:13 -07:00
Dan Nicholson c4c9e36fbf xkbcomp: Remove listing sources
The xkbcomp listing APIs were only needed for the "xkblist" mode, which
won't be supported here.
2009-03-28 18:50:29 -07:00
Dan Nicholson fe94593d02 malloc/misc/xkb: Coding style cleanup 2009-03-28 18:17:34 -07:00
Dan Nicholson 5315e5d14a Add XKBlib API to support keytypes
Added common variants of XkbComputeEffectiveMap, XkbInitCanonicalKeyTypes
and all their needed functions. A couple functions that were in alloc.c
moved to malloc.c to mirror the libX11 sources better.

Original code in

libX11/src/xkb/XKBMalloc.c
libX11/src/xkb/XKBMisc.c
libX11/src/xkb/XKB.c
2009-03-28 17:55:46 -07:00
Dan Nicholson baa9581d81 geom: Coding-style cleanup 2009-03-28 16:21:25 -07:00
Dan Nicholson 62482b9614 Add geometry Compute API from XKBlib
A small needed subset from libX11/src/xkb/XKBGeom.c.
2009-03-28 16:08:46 -07:00
Dan Nicholson 28de09e515 Add xkbcommon macro for XkbKSIsKeypad and XkbKSIsDeadKey(k)
IsKeypad is used in symbols, but we'll just grab them both. It might be
better to split parts of XKBfile.h out eventually.
2009-03-28 15:51:06 -07:00
Dan Nicholson a53b9b1ed3 Add XkbModIndexText replacement
Now, I think we should have all the *Text functions we need.
2009-03-28 15:32:51 -07:00
Dan Nicholson a59ce8f525 Drop another unneeded format argument
Almost cleared of XkbMessage...
2009-03-28 15:24:06 -07:00
Dan Nicholson 54aea7fe8b Add VMod Text functions from xkbfile 2009-03-28 15:12:30 -07:00
Dan Nicholson 46e5e164d6 Copy XkbAddGeom* functions from XKBlib
These are needed by the geometry compiler in xkbcomp.
2009-03-28 14:22:42 -07:00
Dan Nicholson b0acc97a93 xkbcomp: s/XStringToKeysym/XkbcStringToKeysym/ 2009-03-28 14:22:41 -07:00
Dan Nicholson 1f08ae1e56 Expose all the geometry allocation subroutines
We need a couple in xkbcomp, but they might also be needed externally,
too.
2009-03-28 14:22:41 -07:00
Dan Nicholson 39d7be43c8 xkbcomp: Use xkbcommon allocation functions
s/XkbAlloc/XkbcAlloc/ so we don't know XKBlib.
2009-03-28 14:22:41 -07:00
Dan Nicholson b9335d5810 Kill off usage of Display
The use of Display in xkbcomp always boiled down to passing it to
XkbInternAtom and XkbAtomGetString. This shouldn't be a problem here.
2009-03-28 14:22:41 -07:00
Dan Nicholson 2671b777cf Add more *Text functions from xkbfile
This should cover all the usage in xkbcomp. The format arguments were
dropped except for the special case of XkbModMaskText, which needs to
write in XkbCFile format in HandleVModDef. This was just changed to a
Bool to avoid the need for the macros in XKBfile.h.

The function prefixes have been renamed to be unique from xkbfile.
2009-03-28 14:22:41 -07:00
Dan Nicholson 8544cde52e xkbcomp: Drop unused Display argument in Atom functions
The xkbcommon Atom implementation doesn't take Display into account.
2009-03-28 14:22:35 -07:00
Dan Nicholson 72df9bb35f Move *Text APIs into libxkbcommon
These seem like they might be generally useful, and more will be needed
from xkbfile.
2009-03-28 12:01:36 -07:00
Dan Nicholson 18337008b5 libxkbcomp: Use the internal Atom implementation
s/XkbInternAtom/XkbcInternAtom/ and s/XkbAtomGetString/XkbcAtomGetString/
2009-03-28 12:01:36 -07:00
Dan Nicholson c277d3d438 libxkbcomp: s/Status/int/ since we don't have Xlib.h 2009-03-28 12:01:36 -07:00
Dan Nicholson d5a9be653b libxkbcomp: Drop unused format field for *Text functions 2009-03-28 12:01:36 -07:00
Dan Nicholson 6a578de9cb libxkbcomp: Add non-xkbfile XkbActionTypeText 2009-03-28 12:01:36 -07:00
Dan Nicholson 4fe322aa99 libxkbcomp: s/XPointer/char */
Replace XPointer with its definition since we don't have the privilege
of using Xlib.h. Why this is char * and not void *, I'll never know.
2009-03-28 12:01:36 -07:00
Dan Nicholson 37769b5a10 libxkbcomp: s/XkbDescPtr/XkbcDescPtr/
We need to use the keyboard description structure from XKBcommon.h since
it doesn't have the Display field.
2009-03-28 12:01:35 -07:00
Dan Nicholson dd25bbc9ac libxkbcomp: Eradicate XkbFileInfo usage
The only real usage was in the frontend to generate a .xkm file. The
rest of the code just operated on the attached XkbDescPtr. Note that
here we've replaced the usage of the defined field in CompileKeymap with
the equivalent field in a XkbcDescPtr.
2009-03-28 12:01:28 -07:00
Dan Nicholson f3677538f4 libxkbcomp: Include X.h and Xdefs.h for Atom and Bool 2009-03-27 19:30:11 -07:00
Dan Nicholson 30e0103216 libxkbcomp: Remove usage of client-side headers
This will surely break things. Let's see just what we need to replace.
2009-03-27 19:25:14 -07:00
Dan Nicholson a3809b1340 xkbcomp: Add non-xkbfile XkbConfigText 2009-03-27 18:55:13 -07:00
Dan Nicholson f2308e7e55 Ignore files for xkbcomp 2009-03-27 18:44:39 -07:00
Dan Nicholson 23caa60fa9 Ignore ks_tables.h in makekeys directory now 2009-03-27 18:43:12 -07:00
Dan Nicholson 0c1bbb05d9 Import xkbcomp sources for CompileKeymap
A copy of the xkbcomp sources (except the frontend) have been copied in
to provide a means to compile a XkbDescPtr. This definitely doesn't
build or do the right thing yet.
2009-03-27 06:55:32 -07:00
Dan Nicholson f4d8e2932c Move ks_tables.h build into makekeys subdirectory
This avoids the BUILT_SOURCES weirdness and forcing the build into the
makekeys subdirectory. Added a new make variable KS_HEADERS that lists
all the keysym headers we're going to parse.
2009-03-27 06:46:32 -07:00
Dan Nicholson 4859304f65 Use X extern "C" guards around function declarations for public header 2009-03-25 20:06:39 -07:00
Dan Nicholson 433a405c98 atom: Coding-style cleanup and refactor
Some coding style nits were cleaned up. Additionally, most of the
functions have been collapsed from the libxkbfile version where there's
distinction with the Xlib atom functions when Display was set. Finally,
the InitAtoms function tests whether the table has already been created
by testing the pointer rather than using a static int.
2009-03-25 20:06:39 -07:00
Dan Nicholson c88c0ba725 Borrow atom implementation from libxkbfile
We need an atom implementation not relying on XInternAtom and friends.
The original code is in

libxkbfile/src/xkbatom.c
2009-03-25 20:06:39 -07:00
Dan Nicholson 46faf56ded alloc/galloc: Coding style cleanup
Mostly tab-to-space conversion plus a few style nits. Dropped the
register keywords as I'm pretty sure modern compilers can be trusted to
do the right thing.
2009-03-25 20:06:33 -07:00
Dan Nicholson 1ff77ecd36 Rename headers to XKBcommon* and install in extensions directory
Following the kbproto convention, the headers will be named XKBcommon.h
and XKBcommonint.h. Furthermore, they'll be installed in X11/extensions
directory with the rest of the XKB headers.
2009-03-25 19:40:57 -07:00
Dan Nicholson 7417310403 Add XkbDescRec initializers and destructors
Copies the code to initialize and destroy an XkbDescRec from libX11. The
original code is in

libX11/src/xkb/XKBAlloc.c
libX11/src/xkb/XKBGAlloc.c
libX11/src/xkb/XKBMAlloc.c
2009-03-25 19:40:26 -07:00
Dan Nicholson 3a700f8123 Use common XKB headers and add common type XkbcDescRec
Switched to the common XKB headers which don't contain Xlib pollution.
A new common keyboard description type, XkbcDescRec, has been added.
This is the XkbDescRec definitions in xkbstr.h in the xserver since it
contains the defined field we'll need.
2009-03-19 17:16:13 -07:00
Dan Nicholson d4ddac2b8d Use XKB alloc macros internally
These are used throughout the XKB code, but are defined in XKBsrv.h,
which we'd like to avoid. Internal definitions for True/False have also
been added since they're in Xlib.h
2009-03-19 16:58:45 -07:00
Dan Nicholson 6aa78dedb2 Ignore generated ChangeLog 2009-03-19 16:25:34 -07:00
Dan Nicholson 036c23eaf2 Use generated config.h header 2009-03-19 16:25:34 -07:00
Dan Nicholson a45cdf4b0e makekeys: Fix warning about not returning from function
If we've gotten through the for loop in the alias functions, then we
don't have a match.
2009-03-19 16:25:34 -07:00
Dan Nicholson ffa0ccfad9 Use XORG_CWARNFLAGS for more warnings 2009-03-19 16:25:34 -07:00
Dan Nicholson d60166b507 makekeys: No need for strncat 2009-03-19 16:25:26 -07:00
Dan Nicholson ba0b312ac8 test: Add tests for XFree86 special keys
Since the XFree86 special keysyms contain an underscore after the XF86
prefix, check to make sure they're handled correctly.
2009-03-19 11:51:10 -07:00
Dan Nicholson 176b9cf524 test: Consistently use upper case hex 2009-03-19 11:51:10 -07:00
Dan Nicholson 49a06f926d test: Add convenience functions for xkey.sh 2009-03-19 11:51:10 -07:00
Dan Nicholson e8c7f68539 makekeys: Handle XFree86 special action keys
For some reason, there are a set of keys that have an underscore after
the XF86 prefix when Xlib gets them from XKeysymDB.
2009-03-19 11:51:10 -07:00
Dan Nicholson c005d63c58 makekeys: Always continue when no alias match found 2009-03-19 11:51:10 -07:00
Dan Nicholson 498935c1bc makekeys: Handle aliases in convenience functions
There's no need to pass the alias buffer down.
2009-03-19 11:51:09 -07:00
Dan Nicholson 6518e5482d makekeys: Prepend XF86 to XFree86 keysyms 2009-03-19 11:51:09 -07:00
Dan Nicholson 79ddd7e530 Refactor makekeys with some convenience functions
All the nested ifs in the parsing code were confusing me.
2009-03-19 11:51:09 -07:00
Dan Nicholson 49cda1187f Move makekeys to separate subdir
The build is a little cleaner when makekeys has its own Makefile.
2009-03-19 11:51:09 -07:00
Dan Nicholson b2737e9bfb Testing harness for keysym functions
A test program and script have been added for checking the XkbCommon
keysym functions. This has already highlighted an error in handling of
keysyms from XF86keysym.h.
2009-03-19 11:51:09 -07:00
Dan Nicholson 732bade234 Fix CC_FOR_BUILD detection 2009-03-19 11:51:09 -07:00
Dan Nicholson 56c3e7440e keysym: Coding style cleanup
Mostly tab-to-space conversion plus a few style nits. Dropped the
register keywords as I'm pretty sure modern compilers can be trusted to
do the right thing.
2009-03-19 11:51:09 -07:00
Dan Nicholson 83f198f1ae Initial implementation of keysym handlers
Add the xkbcommon implementations of XKeysymToString and XStringToKeysym.
These symbols have the namespace prefix of Xkbc and are declared in
X11/XkbCommon.h.

The implementation is taken directly from Xlib, but does not include the
XKeysymDB parsing and hashing yet (if it ever will). A couple type
conversions were needed to keep from using Xlib.h. See original files:

libX11/src/KeysymStr.c
libX11/src/StrKeysym.c
2009-03-19 11:51:09 -07:00
Dan Nicholson d0a4291e74 makekeys: Handle XF86XK_ keysyms in addition to XK_ keysyms 2009-03-19 11:51:09 -07:00
Dan Nicholson fa6a3d122d Generate keysym tables from X and XF86 keysym definitions
The keysym hash table ks_tables.h is generated by makekeys from
keysymdef.h and XF86keysym.h.
2009-03-19 11:51:09 -07:00
Dan Nicholson 7f64541c30 ks_tables: Remove table-specific #ifdefs and add header guard
Since we'll be including ks_tables.h in a single file, we don't need to
make parts conditional. A header guard has been added just to be safe.
2009-03-19 11:51:09 -07:00
Dan Nicholson ddc3178959 makekeys: Coding style cleanup
Mostly tab-to-space conversion, but a couple other nits, too.
2009-03-19 11:50:57 -07:00
Dan Nicholson 27fe8d1657 Add makekeys for creating keysym hash tables
The makekeys utility is used to generate the keysym hash tables during
the build. We try to detect a build machine native compiler so the
tables can be generated when cross compiling.
2009-03-19 10:54:31 -07:00
Dan Nicholson b58a95d037 Initial autotools commit 2009-03-19 10:47:15 -07:00

Diff Content Not Available