-
a8216e86
by Matthieu Herrb
at 2021-05-22T17:36:37+02:00
include <limits.h> always, not if HAVE_CONFIG_H is set.
via Matthew Green from the NetBSD project
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
-
ab2f5953
by Matthieu Herrb
at 2021-05-30T16:33:48+02:00
Check for NULL strings before getting their lengths
Problem reported by Karsten Trulsen
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
-
51b73ac0
by Tobias Stoeckmann
at 2021-05-31T18:39:15+02:00
Protect against overly long strings
Checking against upper limit of USHRT_MAX must happen before truncating
size_t to int. On 64 bit systems with strings larger than 2 GB this
could otherwise lead to negative ints or ints smaller than USHRT_MAX.
In XParseColor this could lead to out of boundary access with strings
starting with a # (color sequence). A modulo 12 operation is performed
to validate the string length, but with an overflown length, the for
loop would eventually read behind terminating '\0' character.
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
-
f906fe8e
by Alan Coopersmith
at 2021-06-05T09:36:54-07:00
libX11 1.7.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
401f58f8
by Lev Korol
at 2021-06-12T23:11:36+00:00
nls: Add en_IL locale
Signed-off-by: Lev Korol <epicatsupercell@gmail.com>
-
1c845834
by Alex Richardson
at 2021-06-15T08:47:31+01:00
Fix cross-compilation from macOS
We can't use `LC_CTYPE=C sed` there since /usr/bin/sed is not compatible
with the expressions in nls/ (`sed: RE error: illegal byte sequence`).
To fix this use $(SED) instead which autotools will set to a GNU
version of sed (usually /usr/local/bin/gsed) on macOS.
Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
-
d01d2337
by Alex Richardson
at 2021-06-16T13:38:01+01:00
Avoid undefined behaviour after realloc()
Adding the offset between the realloc result and the old allocation to
update pointers into the new allocation is undefined behaviour: the
old pointers are no longer valid after realloc() according to the C
standard. While this works on almost all architectures and compilers,
it causes problems on architectures that track pointer bounds (e.g.
CHERI or Arm's Morello): the value_list pointers will still have the
bounds of the previous allocation and therefore any dereference will
result in a run-time trap.
I found this due to a crash (dereferencing an invalid capability) while
trying to run `xev` over SSH on a CHERI-RISC-V system. With these two
realloc changes, and https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/41
I am able to succesfully run `xev` compiled for CHERI-RISC-V.
Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
-
e92efc63
by Peter Hutterer
at 2021-07-27T11:46:19+10:00
makekeys: handle the new _EVDEVK xorgproto symbols
These keys are all defined through a macro in the form:
#define XF86XK_BrightnessAuto _EVDEVK(0x0F4)
The _EVDEVK macro is simply an offset of 0x10081000.
Let's parse these lines correctly so those keysyms end up in our
hashtables.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
2356e59f
by Igor V. Kovalenko
at 2021-09-05T13:57:26+03:00
libX11: do not crash in GetResReq() macro
When _XGetRequest() detects that requested length exceeds remaining display
output buffer capacity it would return NULL. GetResReq() macro obtains "req"
pointer from a call to _XGetRequest() and then proceeds to assign request id
through "req" pointer which leads to NULL pointer dereference in this case.
Fix this by checking if "req" is valid before assigning request id.
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-
150154c9
by Hodong
at 2021-11-14T06:36:42+00:00
Fix a typo
-
58d7b540
by Peter Hutterer
at 2021-12-01T14:31:37+10:00
gitlab CI: update to use the ci-fairy image
Let's use the pre-prepared image instead of building our own.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
83822530
by Matthieu Herrb
at 2021-12-03T02:56:43+00:00
Avoid NULL pointer deref. Fixes issue #47.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
-
93a050c3
by Tatu Frisk
at 2021-12-03T15:08:40+00:00
Fix hanging issue in _XReply
Assume event queue is empty if another thread is blocking waiting for event.
If one thread was blocking waiting for an event and another thread sent a
reply to the X server, both threads got blocked until an event was
received.
Signed-off-by: Tatu Frisk <tatu.frisk@ge.com>
Signed-off-by: Jose Alarcon <jose.alarcon@ge.com>
-
3ad36c5d
by Alan Coopersmith
at 2021-12-03T17:08:51+00:00
Build xz tarballs instead of bzip2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
934417b1
by Liang Chang
at 2021-12-03T17:46:31+00:00
Make Xutf8DrawString works correctly with ISO10646 fonts.
Signed-off-by: Liang Chang <l-chang@users.sourceforge.net>
-
e30771b4
by Alan Coopersmith
at 2021-12-06T17:04:14-08:00
libX11 1.7.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
c1710589
by Alan Coopersmith
at 2021-12-07T08:29:43-08:00
specs/XIM: Fix "encording" typos
Fixes: #145
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
4c96f356
by Alan Coopersmith
at 2021-12-09T19:51:52-08:00
libX11 1.7.3.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
b7d724df
by Hodong
at 2022-01-07T10:41:15+00:00
specs/XIM: fix a missing "EXT" in the documentation
There was an "EXT" in the original text, but it seems to be missing.
See: https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/4e66da0783b2e5e3b288aaecd3c89396ed425c20/specs/XIM/xim.ms#L693
Signed-off-by: Hodong Kim <hodong@nimfsoft.com>
-
033f37d5
by Antti Savolainen
at 2022-01-12T16:10:21+00:00
nls: add two compose sequences for an upwards arrow using dead_circumflex
Signed-off-by: Antti Savolainen <antti.savo@gmail.com>
-
f15d2a01
by Benno Schulenberg
at 2022-01-12T22:54:12+00:00
lcUTF8: remove two unneeded ifs and two elses that are never reached
When there is a break at the end of the while loop, it means that the
loop will finish the first time that _XlcGetCharSetWithSide() returns
a non-NULL result, which means that the first '(last_charset == NULL)'
will always be true and the else part is redundant.
Fixes issue #46.
Reported-by: Bhavi Dhingra
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
b9e0346a
by Benno Schulenberg
at 2022-01-14T16:58:19+01:00
XKBMAlloc: use the correct first-key variable when extending a key range
When extending the range of changed virtual-modifier keys, one should
pass the two variables relevant to that range.
These two mistakes were found by grepping for 'modmap_key' and then
looking for asymmetries between the handling of the plain modmap thing
and the virtual modmap thing. Inspired by issue #76.
(I suspect these mistakes were at the base of some intractable bugs
reported against xkeyboard-config where virtual modifiers refused
to work and had to be worked around by making other changes too.)
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
da330a16
by Benno Schulenberg
at 2022-01-14T17:19:37+00:00
docs: unwrap some mistakenly wrapped lines, and correct a comment
The wrapped lines messed up the table. Also, add some blank lines
to make the table more readable.
Elsewhere, add spaces around an operator (for consistency),
and correct a copy-paste error.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
1adb531c
by Benno Schulenberg
at 2022-01-14T17:19:37+00:00
docs: unwrap the comments of structure elements in the man pages
It doesn't matter that these lines get wider than 80 columns, as it's
easy enough to make the pager scroll a bit to the right, or to have a
terminal that is a 100 or more columns wide. It looks better to not
hard-wrap these comments.
Also, fix the layout of two table elements.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
86e9749e
by ArenaL5
at 2022-01-16T19:06:10+01:00
nls: add a compose sequence for the middle dot (·) using dead_circumflex
This makes the middle dot compose sequences consistent with others that
begin with <dead_circumflex> and <Multi_key> <asciicircum>, e.g.
superscripted 3 (³)
Signed-off-by: ArenaL5 <arenal5@protonmail.com>
-
4268472b
by Benno Schulenberg
at 2022-01-17T17:15:50+01:00
nls: remove redundant compose sequences with the deprecated 'underbar'
The key symbol 'underbar' is equivalent to 'underscore' -- the mirror
compose sequences with the latter symbol continue to exist.
Also, no keyboard layout in the past fifteen years has contained the
symbol 'underbar' on any key -- except a Telugu layout since a few
years, but that will be corrected soon.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
df4dcdf9
by Benno Schulenberg
at 2022-01-17T17:31:08+01:00
nls: remove redundant compose sequences with deprecated Hebrew symbols
The compose sequences with the valid Hebrew key symbols are right there.
Also, no keyboard layout in the past seventeen years has contained these
deprecated symbols on any key.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
d60ede78
by ArenaL5
at 2022-01-17T19:35:23+01:00
nls: add a compose sequence for the copyleft symbol
Probably not used anywhere yet, let alone seriously, as stated in
https://en.wikipedia.org/wiki/Copyleft#Symbol
Signed-off-by: ArenaL5 <arenal5@protonmail.com>
-
6cc31eaf
by Benno Schulenberg
at 2022-01-19T16:05:37+01:00
nls: group some compose sequences better, and add some comments
Also, align a few trailing comments more consistently, and change
some comments so they will be excluded from the installed file --
there is no need for those comments there.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
21f82fb9
by Benno Schulenberg
at 2022-01-19T16:05:41+01:00
nls: delete some ineffective compose sequences (that were commented out)
They have never worked; there is no point in keeping them in the file.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
b76e661c
by Benno Schulenberg
at 2022-01-19T16:05:41+01:00
nls: move the block of Jamo to its logical place (ascending Unicodes)
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
84efc0aa
by Benno Schulenberg
at 2022-01-19T16:30:05+01:00
nls: remove the compose sequences with the deviant KP_Space symbol
Using this KP_Space symbol as a stand-in for the symbol 2 doesn't make
sense. It looks like a mistake, or as if someone had a broken keyboard
and used KP_Space as a substitute for 2.
Also, no keyboard layout in the last fifteen years has contained the
KP_Space symbol, so I don't see how anyone could type it.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
46a066f2
by Benno Schulenberg
at 2022-01-22T18:07:22+01:00
nls: fix a typo (be_BG => bg_BG) and drop an obsolete comment
The typo was only partially fixed in commit 22a5255b80 sixteen years ago,
and the internet shows that there was at least one user frustrated that
bg_BG.utf8 didn't work but bg_BG.UTF-8 did.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
32dd7c03
by Benno Schulenberg
at 2022-01-22T18:07:30+01:00
nls: put some entries in their alphabetical order, and adjust alignment
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
d241d8af
by Benno Schulenberg
at 2022-01-23T16:56:45+01:00
nls: remove some obsolete Norwegian and Yugoslavian locale names
They have not existed in glibc for more than fifteen years.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
6786744f
by Benno Schulenberg
at 2022-01-23T17:13:02+01:00
nls: add the es_CU locale name, for Cuba
It was added to glibc ten years ago.
This fixes issue #57.
Reported-by: Dominique Michel
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
fbbc3cf8
by Benno Schulenberg
at 2022-01-26T17:12:26+01:00
XKBCvt: remove an if that never gets triggered
The 'if' at the beginning of _XkbHandleSpecialSym() allows only symbols
from the numeric keypad and some control symbols to pass -- XK_hyphen
is not among them, so the check for XK_hyphen in the later 'if' will
always be false.
(The corresponding conversion in _XTranslateKeySym() in KeyBind.c was
removed in March 1994.)
(Also, several keyboard layouts nowadays contain the 'hyphen' symbol,
allowing the user to enter soft hyphens into a document. So we really
don't want to remap this symbol.)
Fixes issue #48.
Reported-by: Bhavi Dhingra
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
402b843f
by Benno Schulenberg
at 2022-01-26T17:21:31+01:00
remove a commented-out code fragment, and remove a stray blank line
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
317c7abb
by Benno Schulenberg
at 2022-01-27T14:04:11+01:00
KeyBind: update the Greek case-conversion tables to Unicode Data 14.0
A few symbols, like Heta and Sampi and dotted lunate Sigma, have been
assigned code points since Unicode Data 4.0, and need their entries.
This fixes issue #132.
Reported-by: Ray Vine
Original-patch-by: Ray Vine
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
93f15f5f
by Benno Schulenberg
at 2022-01-27T14:38:33+01:00
KeyBind: slightly speed up some case conversions by adding missing returns
This avoids pointlessly tumbling through several more ifs when the
conversion has aleady been done.
Also remove two redundant conditions (as lower codes have already
been handled) and fold two other conditions together.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
93446455
by Benno Schulenberg
at 2022-01-27T15:02:09+01:00
KeyBind: reshuffle two ifs into the general order of ascending codes
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
fc79e39c
by Benno Schulenberg
at 2022-02-02T14:11:53+01:00
docs: add missing word, wrap line, fix typo, and trim an excess space
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
0dad289e
by Benno Schulenberg
at 2022-02-02T14:12:06+01:00
nls: among the compose sequences, replace all runs of spaces with tabs
It was done with this script:
cat nls/en_US.UTF-8/Compose.pre |
sed 's!\(^<.\{6,13\}>\)\s*:!\1\t\t\t\t:!' |
sed 's!\(^<.\{14,21\}>\)\s*:!\1\t\t\t:!' |
sed 's!\(^<.\{22,29\}>\)\s*:!\1\t\t:!' |
sed 's!\(^<.\{30,37\}>\)\s*:!\1\t:!' |
sed 's!\(: ".*"\)\s*!\1\t!' |
sed 's!\(\s*# \)! # !' > trimmed &&
mv trimmed nls/en_US.UTF-8/Compose.pre
This saves 37 kilobytes of whitespace.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
9ef2551f
by Benno Schulenberg
at 2022-02-03T16:19:39+01:00
nls: do some manual adjustment of whitespace in the compose sequences
This achieves a more consistent vertical alignment (per group) of the
target character and the trailing comments.
(Most blocks were aligned in some fashion, except the "Greek Extended"
block, which has lines of greatly varying lengths.)
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
9304e645
by Denis Drakhnia
at 2022-02-04T16:24:02+00:00
nls: Add ru_UA.utf8 locale alias.
Signed-off-by: Denis Drakhnia <numas13@gmail.com>
-
47910556
by Christopher Chavez
at 2022-02-13T05:26:14+00:00
Xlib.h: spelling fix in comment
-
b83938f7
by Christopher Chavez
at 2022-02-14T00:23:09-06:00
Xlib.h: fix spelling in comment
Signed-off-by: Christopher Chavez <chrischavez@gmx.us>
-
623b77d4
by Benno Schulenberg
at 2022-02-14T11:47:46+01:00
imDefLkup: verify that a pointer isn't NULL before using it
It is possible for _XimICOfXICID() to return NULL, so it is necessary
to check this isn't actually the case before dereferencing the pointer.
All other callers of _XimICOfXICID() do this check too.
(The check itself is ugly, but it follows the style of the code in the
rest of the module.)
Fixes issue #45.
Reported-by: Bhavi Dhingra
Original-patch-by: Bhavi Dhingra
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
336e8f72
by Benno Schulenberg
at 2022-02-20T15:20:52+01:00
nls: add compose sequences for leftward, upward and downward double arrow
These sequences follow the logic of: the arrow shaft (=) first, the
arrow head (< or > or ^ or v) second. This is so because the sequence
<= is already taken for ≤, and there is no obvious ASCII character for
a double vertical line, so we have to make do with a horizontal one.
Since commit 6101b967b6 from eight years ago, there is a compose sequence
for the rightward double arrow, but not for the other three directions.
This fixes issue #138.
Requested-by: Mélanie Chauvel
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
582dc6f8
by Alan Coopersmith
at 2022-02-20T11:52:22-08:00
gitlab CI: enable Static Application Security Testing (SAST)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
c0191f02
by Benno Schulenberg
at 2022-02-24T18:24:12+00:00
nls: use shape-based compose sequences for hammer-and-sickle instead
Using a misspelled abbreviation (CCCP) of an obsolete country's name
to compose a fairly general communist symbol does not seem right.
https://en.wikipedia.org/wiki/Hammer_and_sickle
Many compose sequences instead combine characters that together look
similar to the target character. Do the same here: question mark (?)
plus backslash (\) look a bit like ☭ .
In the bargain, this fixes issue #63.
Reported-by: Marc Mezzarobba
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
24df23df
by Benno Schulenberg
at 2022-02-24T18:24:12+00:00
nls: group the compose sequences for tilde, degree, and cedilla together
Also, correct the comment for the double quote character ("), and move
the soft hyphen and the interrobangs to a special punctuation group.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
eb588524
by iyzana
at 2022-02-25T10:45:07+00:00
nls: add locale alias from eo.UTF-8 to eo_XX.UTF-8
There is no matching locale in the locale.dir and compose.dir files for
the locale eo.UTF-8. Setting it as the locale resulted in compose files
not being loaded.
Signed-off-by: iyzana <iyzana@protonmail.com>
-
cfddb799
by Benno Schulenberg
at 2022-02-25T12:52:45+01:00
nls: remove the mistaken eo_EO names -- EO is not a valid country code
(Debian has had several of these lines commented out for years.)
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
ba0d3b43
by Benno Schulenberg
at 2022-02-25T12:53:10+01:00
nls: map eo.UTF-8 directly to en_US.UTF-8 instead of using a relay alias
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
4f9eb327
by Benno Schulenberg
at 2022-02-25T17:53:23+00:00
nls: remove obsolete locale aliases with uppercase in the language code
(These aliases may have been useful on some systems twenty years ago,
but nowadays all should have settled on lowercase language code plus
uppercase country code.)
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
91806329
by Benno Schulenberg
at 2022-03-03T12:06:35+01:00
nls: add a compose sequence for the peace symbol
As the thing in the circle looks a bit like an upside-down Y,
use <O> <Y> as the sequence, similar to <O> <A> for anarchism.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-
257927c5
by Giovanni Mascellani
at 2022-03-23T16:22:25+00:00
xcb_io: Allow jumps backwards when widening the request number.
Request numbers are not always seen in the numeric order by widen(),
for example due to Mesa directly calling _XError(). When this happens,
widen() adds 2^32 to the reported widened number, triggering failed
assertions and bad behavior.
With this commit, wrapping of the lower dword is detected in a more
robust way, by requiring that a skip of at least 2^31 is seen.
This fixes issue #152.
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
-
da97120f
by Adam Jackson
at 2022-03-23T13:31:05-04:00
xcb: Clarify the XInitThreads error message
XInitThreads has been called if _Xglobal_lock != NULL, we may as well
check that before printing a misleading error message.
Signed-off-by: Adam Jackson <ajax@redhat.com>
-
8a368d80
by Hodong
at 2022-03-24T16:50:11+00:00
Fix two memory leaks in _XFreeX11XCBStructure()
Even when XCloseDisplay() was called, some memory was leaked.
XCloseDisplay() calls _XFreeDisplayStructure(), which calls
_XFreeX11XCBStructure().
However, _XFreeX11XCBStructure() did not destroy the condition variables,
resulting in the leaking of some 40 bytes.
Signed-off-by: Hodong <hodong@yozmos.com>
-
80b30d12
by Matt Turner
at 2022-03-30T13:54:13-07:00
libX11 1.7.4
Signed-off-by: Matt Turner <mattst88@gmail.com>
-
247d4856
by Timo Aaltonen
at 2022-03-31T14:55:51+03:00
Merge branch 'upstream-unstable' into debian-unstable
-
f723a613
by Timo Aaltonen
at 2022-03-31T14:56:17+03:00
version bump
-
87cfca8e
by Timo Aaltonen
at 2022-03-31T22:06:16+03:00
0001-makekeys..patch: Deleted, upstream.
-
144faf34
by Timo Aaltonen
at 2022-03-31T22:16:27+03:00
patches: Refreshed.
-
2ba2c54e
by Timo Aaltonen
at 2022-03-31T22:18:12+03:00
Update signing-key.asc.
-
c9342c6f
by Timo Aaltonen
at 2022-03-31T22:22:20+03:00
release to sid