The path is set through configure.ac/Makefile.am and always defined anyway.
Let's not re-define it here with a different value than our default.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Andreas Wettstein authored Feb 15, 2014 and Alan Coopersmith committed Jun 08, 2019

Add missing support for "affect" flag to selectively affect locking or
unlocking for for modifier locking, control locking, and ISOLock.
Fix some incorrect masking and modifier handling for ISOLock.
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-By: Ran Benita <ran234@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

Miroslav Koškár authored Jan 18, 2019 and Alan Coopersmith committed Jun 08, 2019

F_Accel is valid MovePtr field yet following error is reported:

    > Error:            Field accel is not defined for an action of type MovePtr
    >                   Action definition ignored
Signed-off-by: Miroslav Koškár <mk@mkoskar.com>

v2: Add square brackets back.
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>

Fixes "pkg-config --exists xkbcomp" without installed pkg-config files
for x11, xkbfile, and xproto >= 7.0.17.

xkbcomp works fine without those pkg-config files.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913359

Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>

Adam Jackson authored Oct 17, 2018 and Adam Jackson committed Dec 11, 2018

We expect evdev to have keycodes above 255, there's no reason to warn
about this.
Signed-off-by: Adam Jackson <ajax@redhat.com>

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

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

Continuation from 7fdfabd7 "keycodes: Ignore high keycodes"

A keymap with a key > 255 will have a xkb_keycodes.maximum of that keycode.
Let's not throw a fatal error on that, just crop it back to the maximum of
255. This doesn't set the "high_keycode_warned" on purpose so we get this for
the first key that actually matters.

Reproducible with xkeyboard-config 2.24 which has a maximum of 374.

https://bugzilla.redhat.com/show_bug.cgi?id=1587998

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>

Signed-off-by: Adam Jackson <ajax@redhat.com>

bindir gets replaced with:
    bindir=${exec_prefix}/bin
but exec_prefix isn't set so we end up with an invalid bindir.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>

Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>

Signed-off-by: Daniel Stone <daniels@collabora.com>

Rather than throwing a fatal error when a keycode definition exceeds the
declared maximum (i.e. 255), just ignore the definition and continue.

This allows xkeyboard-config to start shipping datasets including high
keycodes, which will work in xkbcommon as it ignores explicit range
declarations.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Ran Benita <ran234@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reported-by: Christian Kellner <gicmo@gnome.org>

Mihail Konev authored Jan 26, 2017 and Peter Hutterer committed Jan 26, 2017

Signed-off-by: Mihail Konev <k.mvc@ya.ru>

Emil Velikov authored Mar 09, 2015 and Peter Hutterer committed Jan 26, 2017

Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Syncs the invocation of configure with the one from the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

Ran Benita authored Jan 06, 2016 and Peter Hutterer committed Jan 08, 2016

Rather than always taking the first one in the file. This is exactly the
intended use of the 'default' flag.

Note that pretty much the same code is duplicated in xkbcomp.c when
compiling a single file from the command line, but there it is
implemented correctly (look for XkbLC_Default).

https://bugs.freedesktop.org/show_bug.cgi?id=69950

Signed-off-by: Ran Benita <ran234@gmail.com>
Tested-by: Benno Schulenberg <bensberg@justemail.net>
Acked-by: Sergey Udaltsov <sergey.udaltsov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Benno Schulenberg authored Sep 11, 2014 and Peter Hutterer committed Nov 09, 2015

Specifying an explicit key type when overriding a key should adjust
the number of levels to that of the specified type. This gets rid of
the age-old warning of the right Alt key being ONE_LEVEL but having
two symbols assigned.

Fixes bug #57242 <http://bugs.freedesktop.org/show_bug.cgi?id=57242

>.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Reviewed-by: Ran Benita <ran234@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

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

Any use of the german keyboard layout or anything else using
level3(ralt_switch) produces the warning
    Type "ONE_LEVEL" has 1 levels, but <RALT> has 2 symbols
    Ignoring extra symbols
This warning is meaningless, the default definition for RALT comes from
pc(pc105) including altwin(meta_alt) which defines it as TWO_LEVEL
and { Alt_R, Meta_R }. Including level3(ralt_switch) correctly sets it as
ONE_LEVEL but now we get the warning. That makes users file bug reports and we
can't be having that, can we?

Up the warning level for this case to one past the default. The warning is
only useful when you're testing a new keyboard layout or trying to fix an
actual bug with missing symbols. And then you can run xkbcomp with -w10.
No need to spam the log on every server startup.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Matthew Green authored Jul 28, 2015 and Peter Hutterer committed Jul 29, 2015

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

w32api/rpcnndr.h (included by windows.h) uses TypeString as the name of a structure member.

xkbcomp.h defines it as a macro for a constant.

Define WIN32_LEAN_AND_MEAN to avoid this clash.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: David Macek <david.macek.0@gmail.com>

I can not find any point in our git history at which alloca() or the
Xalloca.h macros ALLOCATE_LOCAL() & DEALLOCATE_LOCAL() were actually
used in this source file.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

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

Vincent Lefevre authored Oct 27, 2014 and Peter Hutterer committed Oct 30, 2014

This patch improves -w option parsing even further, for cases like
"xkbcomp -w6 4.xkb out.xkb" (which were not handled by the fix of
the warning level is still optional (set to 0 if not present), and
errors like "xkbcomp -wfoo in out" are detected and reported.

https://bugs.freedesktop.org/show_bug.cgi?id=66344

Signed-off-by: Vincent Lefevre <vincent@vinc17.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Flagged by cppcheck 1.64:
Checking app/xkbcomp/listing.c: WIN32...
[app/xkbcomp/listing.c:335]: (error) Uninitialized variable: nMatch
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>

Flagged by cppcheck 1.64:
[app/xkbcomp/geometry.c:2426] -> [app/xkbcomp/geometry.c:2427]:
 (performance) Variable 'outline' is reassigned a value before
               the old one has been used.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>

Flagged by cppcheck 1.64:
[app/xkbcomp/keycodes.c:264] -> [app/xkbcomp/keycodes.c:262]:
 (warning) Possible null pointer dereference: new - otherwise it
           is redundant to check it against null.
[app/xkbcomp/keytypes.c:600] -> [app/xkbcomp/keytypes.c:597]:
 (warning) Possible null pointer dereference: old - otherwise it
           is redundant to check it against null.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>

There is no need to ensure the pointers passed to free are not NULL,
especially right after passing them to strncpy without checking for
NULL.

Flagged by cppcheck 1.64:
[app/xkbcomp/parseutils.c:557] -> [app/xkbcomp/parseutils.c:559]:
 (warning) Possible null pointer dereference: over - otherwise it
           is redundant to check it against null.
[app/xkbcomp/parseutils.c:558] -> [app/xkbcomp/parseutils.c:561]:
 (warning) Possible null pointer dereference: under - otherwise it
           is redundant to check it against null.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>

Most were fixed length or length checked anyway, this just saves time
doublechecking that.   (A few could be replaced by asprintf, but we
don't have a copy guaranteed to be reachable from this program yet.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>

info->groupCompat[i] is bzero'd on init, define is 0. Don't warn when that
is the case, otherwise any "group 2 = ..." statement will cause an error.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Benno Schulenberg authored Aug 28, 2013 and Peter Hutterer committed Aug 29, 2013

A more minimalistic and formally correct solution.
This amends and extends the previous fix for bug #66345,
fixing not just yyGetKeyName() but also yyGetString().
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

Fixes a typo from cdcd5520

 (should be sizeof - 1, not sizeof -i).
Code flows that i is at most sizeof(scanBuf) - 1, so last is not needed.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

if the flag is "-w", then argv[i][1] is 'w' and unlikely to be a digit.
Access [2] instead, which is either \0 or an actual digit.

X.Org Bug 66344 <http://bugs.freedesktop.org/show_bug.cgi?id=66344

>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Dew <marcoz@osource.org>

If a key name exceeds 4 characters, the content of scanBuf is not
null-terminated, giving error messages like

syntax error: line 7 of test.xkb
last scanned symbol is: FOOBARm
Errors encountered in test.xkb; not compiled.

(last character of the preceding 'maximum' statement in this case)

X.Org Bug 66345 <http://bugs.freedesktop.org/show_bug.cgi?id=66345

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

Laura authored Mar 15, 2013 and Alan Coopersmith committed Jul 13, 2013

This fixes an issue with _exit not declared when building xkbcomp
version 1.2.4 natively on Windows using MinGW32 (version 4.7.2)
from www.mingw.org.

https://bugs.freedesktop.org/show_bug.cgi?id=62365

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>