Change a key symbol generationg file

Change-Id: I3e360b3233f60374e73e394b5621af18965e351b

Fix .spec to create build directory with the version (e.g) libxkbcommon-{version}

Change-Id: I1a03ab7d2d5f6294be6cc8b78bc8e3394e17c34e

Remove unnecessary options

Change-Id: I605e843c10f982d20c64d8d6a1049b2c86526143

Remove build-time profile dependencies

The usage of profile macro in the previous spec file
has no effect on the code or binary.

Remove the usage of profile macro from the spec file
to allow build optimization.

Change-Id: Ib75ce96679880c38af39117fb7d4d520d776f92f
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

Remove the exception for tizen common in .spec file

Change-Id: I70882938d33cd69bb6392d50b66918fbbb7660ac

Generate new keysyms although profile is common

Change-Id: I3311c7455a0bcb5ab0fc2c42a9276c34bf64a2da

Add a new API to set key repeat

Change-Id: If1644c4c6575b4eb7cadb8c1e11147651013d8ef

Apply directory macros and install license file to the proper directory

Change-Id: Icf6d15c1ad958177ee19e479e3368465261cee44

Change a buildrequires e-tizen-data to xkb-tizen-data for install a keylayout file

Change-Id: Iafe622fe6e4a92903968ed1dbe3c1493fdf0a936

Revert "Package version up"

This reverts commit fde4b3a46856a0bbdd581dffd0abe48cbdaefc25.

Change-Id: If8d2594eef776e0e9634377bdbe76cb7eeb90db8

Package version up

Change-Id: Ifcdd49774afaea23c0a8473ccfa597e280feacd2

Modify a dependancy for install a keymap file e-tizen-data to xkb-data

Change-Id: I8461b799bcc6a73afb1f91e3bd48340fa20060a6

Modify a keymap maker script for remove duplicataed defined symbols

Change-Id: I674217754f90bfbc548514f3a695dc3587861e56

Generate a tizen keymap header using a tizen key layout file - The tizen keylayout file is defined in specific profiles (except a common profile)

Change-Id: I96eef7cea11466129fd723a6ee6b35fb378c4dae

packaging: gbs: use upstream-git branch

Change-Id: I16ca48771ed638bb19707728edab44388e0a1d76
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

packaging: depend on the same release

Change-Id: Icbd6b049c83820cfb84c0da0df6ceb138a99afea
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

packaging: Bump to version 0.4.3

Use upstream git repo instead of pristin-tar.

Also clean spec file.

Change-Id: Idcbac423d2cd35cea1a4c697fa41889584cbfad0
Bug-Tizen: TC-1846
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

add --disable-x11

Change-Id: I6d12c715006d1bbd32f0985801b050281edf9aa3

remove .gbs.conf because we don't trace remote git any more

Change-Id: I443aa4dd2aad04653758618b338921f43275ab21

package version up

Change-Id: I47163cf02759977333bf7cd78788487c1fd6d444

Removed build dependency on kbproto.

Not use any thing from kbproto, so remove it.

Change-Id: I6059004d9ff9295b63a7f05568ccd1373288f2c1

Removed build dependency on xproto.

Not use any thing from xproto, so remove it.

Change-Id: I7656733575c6b78e0716485525637f41352e29e6
Signed-off-by: Alex Wu <zhiwen.wu@linux.intel.com>

add gbs.conf

Change-Id: Ic11c4792ccd2a9f5ceb7113c1b765a85205bad4a

resetting manifest requested domain to floor

Update to 0.3.0

add packaging

Bump version to 1.3.1

Signed-off-by: Ran Benita <ran@unusedvar.com>

x11: try to fix crash in xkb_x11_keymap_new_from_device error handling

In 1b3a1c277a033083fee669e92c8cad862716ebd1 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>

x11: stylistic fixes

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

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>

bench/compose: fix compose file path

Forgotten in e2465c2.

Signed-off-by: Ran Benita <ran@unusedvar.com>

ci: some tweaks

- Reduce permissions
- Update some stuff

Signed-off-by: Ran Benita <ran@unusedvar.com>

ci: also link to tarball in github release

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

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>

test/compose: add tests for xkb_compose_table_new_from_locale lookup

Signed-off-by: Ran Benita <ran@unusedvar.com>

test/compose: clean up after a setenv

Signed-off-by: Ran Benita <ran@unusedvar.com>

tests/data: add files needed to fully test compose

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

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>

scripts/update-keysyms: fix path to the include files after de1b6943d

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

tools: add compose tool for Compose debugging

Not very useful so not exposed in xkbcli.

Signed-off-by: Ran Benita <ran@unusedvar.com>

compose: add mapped locale to Compose-file-not-found error log

Signed-off-by: Ran Benita <ran@unusedvar.com>

Bump version to 1.3.0

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

bench: add atom benchmark

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

build: fix missing includes

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

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>

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.

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.

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>

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>

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.

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>

test: add extra info to the layout-tester --help output

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

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>

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>

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>

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>

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>

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>

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>

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>

Bump version to 1.2.1

Signed-off-by: Ran Benita <ran@unusedvar.com>

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 40c00b472144d1684d2fb97cafef39.

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>

Bump version to 1.2.0

Signed-off-by: Ran Benita <ran@unusedvar.com>

compose: fix max compose nodes check

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

keysym: avoid strtoul in xkb_keysym_from_name

Signed-off-by: Ran Benita <ran@unusedvar.com>

keysym: use a perfect hash function for case sensitive xkb_keysym_from_name

In 7d84809fdccbb5898d0838849ec7c321410182d5 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 7d84809fdccbb5898d08388:

      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>

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>

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>

compose: use anonymous union

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

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>

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>

utils: assert on streq for NULL pointers

We have streq_null for that purpose

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

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>

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>

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>

man: add missing pointer to xkbcli-compile-keymap(1)

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

keysym: inline find_sym function

It's easier when everything is in one place.

Signed-off-by: Ran Benita <ran@unusedvar.com>

keysym: use a more descriptive argument name

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

interactive-evdev: fix missing initialization

Accidentally got lost in 6b65be4.

Signed-off-by: Ran Benita <ran@unusedvar.com>

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>

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>

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>

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>

test: fix missing va_end in case of test failures

Found by coverity

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

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>

Inline x11_atom_interner_adopt_atoms() into callers

Signed-off-by: Uli Schlachter <psychon@znc.in>

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>

Also batch the XKB GetNames request

This gets rid of another round trip.

Signed-off-by: Uli Schlachter <psychon@znc.in>

Also batch the XKB-GetMapMap request

This gets rid of one more round trip.

Signed-off-by: Uli Schlachter <psychon@znc.in>

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>