| Age | Commit message (Collapse) | Author |
|---|
|
With Xwayland 23.1 and above, the definitive way of checking for an
Xwayland server is to check for the "XWAYLAND" extension.
Keep the old XRandR method for compatibility with older versions of
Xwayland.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
It's Xwayland, not XWayland.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
Otherwise we cannot pipe setxkmap -print into anything
|
|
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.
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
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>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
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>
|
|
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>
|
|
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
If we go through the loop, next is overwritten on the very first line.
If we don't go through the loop, next is never referenced again.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=34151
Use rfName consistently, instead of sometimes reverting to svValue[RULES_NDX]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
|
|
Easy enough to accept the syntax documented in the man page, so accept
the -I flag with or without a space between -I and the directory argument.
https://bugs.freedesktop.org/show_bug.cgi?id=34117
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
|
|
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6971649
Signed-off-by: Stuart Kreitman <stuart.kreitman@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and all gcc 4.3 and sparse warnings.
|
|
X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=18759>
X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=18760>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
|
|
|
|
indent -cbi 0 -nprs -nut -npcs -i4 -bli 0 *.c *.h
|
|
|
|
|
|
Add a -device parameter, which allows setting the map on arbitary extended
devices.
|
|
Fix default path, bump default model from pc101 to pc105.
|
|
Initialise vd.variant and vd.variant to NULL when failing to get the active
RMLVO components from the server.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
