GitLab

Julien Cristau authored Apr 25, 2022 and Alan Coopersmith committed Apr 25, 2022

Check for extension version and number of outputs:
XRRGetScreenResourcesCurrent was added in v1.3.  Also, there's no
guarantee it returns any outputs, and we don't want to die with a
BadRROutput error.

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

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

It is good practise to make functions static
to prevent export by accident
Signed-off-by: Walter Harms <wharms@bfs.de>

the status of exit() is actually status & 0377
change status value to return as intended
Signed-off-by: Walter Harms <wharms@bfs.de>

fix: warning: assignment discards ‘const’ qualifier from pointer target type
make warning go away with casting
Signed-off-by: Walter Harms <wharms@bfs.de>

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

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

Running setxkbmap isn't supported by Xwayland, so let's warn the user that
this won't work.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>

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

Now a non-existent file prints:
    Couldn't find configuration file "not-there"
and a file that fails to parse prints:
    Couldn't parse configuration file "not-right"

Fixes: #3, https://bugs.freedesktop.org/show_bug.cgi?id=101845

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

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

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

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>

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

See http://people.gnome.org/~walters/docs/build-api.txt

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

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

Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

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

And seizing the opportunity to tweak some of the wording.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

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

Also unwrap a help-text line, as it looks neater and stays within
80 characters, and alphabetize the -help option in the man page.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

[squashed in: include "config.h" directive]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Stéphane Aulery authored Jul 02, 2013 and Peter Hutterer committed Jul 02, 2013

This is in addition to the correction [1] for bug #524510 reported by Debian [2].

[1] http://cgit.freedesktop.org/xorg/app/setxkbmap/commit/?id=2011f509c56b73cc62105c689d702f279f522017

[2] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524510

Signed-off-by: Stéphane Aulery <lkppo@free.fr>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Alan Coopersmith authored Feb 10, 2013 and Peter Hutterer committed Feb 12, 2013

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Alan Coopersmith authored Feb 10, 2013 and Peter Hutterer committed Feb 12, 2013

Gets rid of a number of clang warnings:
setxkbmap.c:689:28: warning: implicit conversion loses integer precision:
    'unsigned long' to 'int' [-Wshorten-64-to-32]
        len = strlen(orig) + 1;
            ~ ~~~~~~~~~~~~~^~~
setxkbmap.c:701:39: warning: implicit conversion changes signedness:
    'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion]
        orig = (char *) realloc(orig, len);
                        ~~~~~~~       ^~~
setxkbmap.c:707:32: warning: implicit conversion changes signedness:
    'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion]
        orig = (char *) calloc(len, 1);
                        ~~~~~~ ^~~
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Alan Coopersmith authored Feb 10, 2013 and Peter Hutterer committed Feb 12, 2013

Clears gcc warning:
setxkbmap.c: In function `tryLoadRules':
setxkbmap.c:811: warning: declaration of 'rules' shadows a global declaration
setxkbmap.c:132: warning: shadowed declaration is here

No longer marked static, since the function is called exactly once, so
storing the value across calls seems pointless.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

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

Mehdi Dogguy authored Feb 03, 2012 and Alan Coopersmith committed Mar 05, 2012

xkeyboard-config lists known keyboard models, layouts, variants,
etc... which are needed to be able to correctly use setxkbmap.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

Fixes many, but not all, of the warnings raised by this option
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

Van de Bugger authored Feb 25, 2011 and Peter Hutterer committed Feb 28, 2011

1.  `args' renamed to `options'. (xkbcomp and gcc name these entities
    `options').
2.  `Where legal args are:' replaced with `Options:'. (Short and
    correct. As I remember, GNU does not recommend to use word
    `legal' unless it related to law and lawyers).
3.  Option descriptions shifted right by 2 space. (Like gcc.)
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Van de Bugger authored Feb 28, 2011 and Peter Hutterer committed Feb 28, 2011

If setxkbmap fails to load rules file, it is not possible to find
out where setxkbmap looks for it. Increasing verbosity level does
not help:

    $ ./setxkbmap -v 10
    Setting verbose level to 10
    locale is C
    Couldn't find rules file (evdev)

The problem fixed by adding two messages: before loading file and
after successful loading. Messages are displayed if verbosity level
is 8 or higher:

    $ ./setxkbmap -v 10
    Setting verbose level to 10
    locale is C
    Trying to load rules file ./rules/evdev...
    Trying to load rules file /usr/local/share/X11/xkb/rules/evdev...
    Couldn't find rules file (evdev)
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Van de Bugger authored Feb 26, 2011 and Peter Hutterer committed Feb 28, 2011

Macro `OOM' ("Out of memory") introduced for checking and reporting
memory allocation errors. The same macro is used in all the cases.

One check was missed in original source; fixed.

Changes after patch review:

    1. `OOM' macro uses `do ... while (0)'.
    2. `exit(-1)', not `abort()'.
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Alexandr Shadchin authored Feb 25, 2011 and Peter Hutterer committed Feb 25, 2011

Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Van de Bugger authored Feb 18, 2011 and Peter Hutterer committed Feb 23, 2011

Few tabs replaced with spaces; pointers are written as
"list_t *list" (no space between asterisk and variable name).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Lev Nezhdanov authored Feb 18, 2011 and Peter Hutterer committed Feb 23, 2011

Signed-off-by: Van de Bugger <van.de.bugger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Same applies to variant.

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

>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>

Van de Bugger authored Feb 16, 2011 and Peter Hutterer committed Feb 17, 2011

1. Entire help message is printed at once (not line-by-line).
2. Brackets around argumnets of -I option removed, since argument is mandatory.
3. Added a space after comma in.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Van de Bugger authored Feb 15, 2011 and Peter Hutterer committed Feb 16, 2011

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

Van de Bugger authored Feb 14, 2011 and Peter Hutterer committed Feb 15, 2011

From 49380ed12a0c451207cf5a12ca2c1e0c9c16c9e6 Mon Sep 17 00:00:00 2001
From: Van de Bugger <van.de.bugger@gmail.com>
Date: Mon, 14 Feb 2011 01:45:23 +0300
Subject: [PATCH setxkbmap] Data refactored: list_t introduced to keep list and its sizes together.

In older code there were 3 separate global variables: szOptions, numOptions,
and options. All 3 variables are related: options is a list (array) of items,
szOptions is the allocated size and numOptions is the number of used elements.
3 more variables (szInclPath, numInclPath, inclPath) represent another list.

list_t structure combines related info (pointer to array, allocated size, and
number of used elements) together.

Few functions changed to accept list_t argument instead of separated list and sizes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Van de Bugger authored Feb 14, 2011 and Peter Hutterer committed Feb 15, 2011

Bunch of XXX_NDX defines, and 3 arrays: `svName', `svSrc' and `svValue' are
merged into one structure. Interace of 2 functions `trySetString' and
`setOptString' changed: instead of receiving `which' argument of `int' type
(an index to those arrays) the functions now receive `setting' argument, which
hold everything about the setting: `name', `src', and `value', so the functions
do not use global variables any more.
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>