summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)AuthorFilesLines
2024-02-20unifdef __sgiAlan Coopersmith1-3/+0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-02-11unifdef __UNIXOS2__Alan Coopersmith2-10/+0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-08-29Xutil.h: use Bool for XEmptyRegion(), XEqualRegion()Christopher Chavez1-2/+2
2023-01-14Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11GaryOderNichts1-1/+8
2022-11-19Fix 797755 Allow X*IfEvent() to reenter libX11Matthieu Herrb1-1/+1
- the activation logic is reversed - there is also _XInternalLockDisplay() that needs protection - I've found cases (in fvwm2) where the callback calls XCheckIfEvent() recursively. So the flag needs to be a counter. Reviewed-by: Adam Jackson <ajax@redhat.com>
2022-11-11Add XFreeThreads function.Oliver1-0/+4
2022-11-02Allow X*IfEvent() to reenter libX11Adam Jackson1-0/+1
The documentation for this family of functions very clearly says not to call into xlib in your predicate function, but historically single threaded apps could get away with it just fine, and now that we've forced thread-safety on the world such apps will now deadlock instead. That's not an acceptable regression even if the app is technically broken. This has been reported with XFCE and FVWM, and Motif's cut-and-paste code has the same bug by inspection, so this does need to be addressed. This change nerfs LockDisplay/UnlockDisplay while inside the critical bit of an IfEvent function. This is still safe in the sense that the display remains locked and no other thread should be able to change it from under us, but the loop that scans the event queue might not be robust against it being modified as a side effect of protocol emitted by the predicate callback. But that's not new, non-XInitThreads'd xlib would have the same caveat. Closes: xorg/lib/libx11#157
2022-09-11reduce compiler warnings with casts (no object change)Thomas E. Dickey1-5/+5
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
2022-09-09reduce compiler warnings for macros BufAlloc, Data and Data32 using castsThomas E. Dickey1-6/+6
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
2022-04-23XkbOpenDisplay: Add _Xconst qualifier to display name argumentAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-04-23XKBgeom.h: Add _Xconst qualifier to char * arguments in functionsAlan Coopersmith1-8/+8
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-04-23XKBgeom.h: Remove XKB_IN_SERVER sectionAlan Coopersmith1-44/+0
The Xserver made its own copy of this file in 2008, and the API's are no longer the same between the server and client forks. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-02-14Xlib.h: fix spelling in commentChristopher Chavez1-1/+1
Signed-off-by: Christopher Chavez <chrischavez@gmx.us>
2022-02-13Xlib.h: spelling fix in commentChristopher Chavez1-1/+1
2021-09-05libX11: do not crash in GetResReq() macroIgor V. Kovalenko1-1/+1
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>
2021-05-03Xlib.h: spelling fix in commentChristopher Chavez1-1/+1
2020-11-15Avoid recursing through _XError due to sequence adjustmentKeith Packard1-2/+1
This patch is based on research done by Dmitry Osipenko to uncover the cause of a large class of Xlib lockups. _XError must unlock and re-lock the display around the call to the user error handler function. When re-locking the display, two functions are called to ensure that the display is ready to generate a request: _XIDHandler(dpy); _XSeqSyncFunction(dpy); The first ensures that there is at least one XID available to use (possibly calling _xcb_generate_id to do so). The second makes sure a reply is received at least every 65535 requests to keep sequence numbers in sync (possibly generating a GetInputFocus request and synchronously awaiting the reply). If the second of these does generate a GetInputFocus request and wait for the reply, then a pending error will cause recursion into _XError, which deadlocks the display. One seemingly easy fix is to have _XError avoid those calls by invoking InternalLockDisplay instead of LockDisplay. That function does everything that LockDisplay does *except* call those final two functions which may end up receiving an error. However, that doesn't protect the system from applications which call some legal Xlib function from within their error handler. Any Xlib function which cannot generate protocol or wait for events is valid, including many which invoke LockDisplay. What we need to do is make LockDisplay skip these two function calls precisely when it is called from within the _XError context for the same display. This patch accomplishes this by creating a list of threads in the display which are in _XError, and then having LockDisplay check the current thread against those list elements. Inspired-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Dmitry Osipenko <digetx@gmail.com> Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
2020-10-15Add XSetIOErrorExitHandler() functionCarlos Garnacho2-1/+18
This function complements XSetIOErrorHandler(), allowing to override the default behavior that trusts on I/O errors never coming back (i.e. exit()ing the process). This is meant as a mechanism for Wayland compositors (that are too a X11 client + compositing manager) to unfasten seatbelts and jump through the car window. It might get lucky and land on a stack of pillows. In consequence, some functions labeled as _X_NORETURN can as a matter of fact return. So those hints were removed. Signed-off-by: Carlos Garnacho <carlosg@gnome.org> Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
2020-08-28Raise minimum required xproto version to 7.0.25 (released 2013-11-23)Alan Coopersmith1-11/+2
Allows us to depend on _X_COLD directly instead of having to check for it. (Since we also use _X_UNUSED, 7.0.22 or later was implicitly required already but not checked for.) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2020-08-28Avoid the use of "register" keyword in public headers.Maya Rashish2-15/+15
This causes issues when compiling code for C++17.
2020-08-15Avoid the use of "register" keyword in XkbTranslateKeySym.Maya Rashish1-1/+1
This causes issues when compiling code for C++17. While here, make function prototype match the header with regards to removal of another register keyword.
2020-07-22Fix spelling/wording issuesAlan Coopersmith1-2/+2
Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2020-04-21reduce gcc-normal warnings using casts (no object change)Thomas E. Dickey1-1/+1
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
2020-04-21reduce gcc-normal warnings using casts (no object change)Thomas E. Dickey1-6/+6
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
2019-10-09Fix lockup in _XReply() caused by recursive synchronizationDmitry Osipenko1-0/+3
This patch is based on a suggestion made by Uli Schlachter in a comment to the bug report https://gitlab.freedesktop.org/xorg/lib/libx11/issues/93. Explanation of the bug (given by Uli Schlachter as well): An error was received and handled. Since there was an error callback set, Xlib unlocks the display, runs the error callback, and then locks the display again. This goes through _XLockDisplay and then calls _XSeqSyncFunction. On this "lock the thing"-path, Xlib notices that sequence numbers are close to wrap-around and tries to send a GetInputFocus request. However, the earlier calls already registered themselves as "we are handling replies/errors, do not interfere!" and so the code here waits for "that other thread" to be done before it continues. Only that there is no other thread, but it is this thread itself and thus a deadlock follows. The bug is relatively easy to reproduce on any desktop environment by using actively a touchscreen input that supports multitouch, i.e. practically all mobile devices are affected. Fixes: https://gitlab.freedesktop.org/xorg/lib/libx11/issues/93 Suggested-by: Uli Schlachter <psychon@znc.in> Tested-by: Dmitry Osipenko <digetx@gmail.com> Reported-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
2019-09-24xkb: Provide <X11/extensions/XKBgeom.h> ourselvesAdam Jackson2-0/+667
This header refers to libX11 types, it doesn't belong in xorgproto and has been moved to legacy in 2019.2. Supply it ourselves.
2016-02-03Xlib.h: Fix macros imitating C functions.Dominik Muth1-17/+17
The basic rule "put parantheses around macro parameters" should be observed where possible. Otherwise code like ConnectionNumber(foo = bar); fails to compile. (It obviously passes if ConnectionNumber is a C function.) There are several other macros amended for the same reason. This bug appeared while building http://ioccc.org/1993/cmills.c, so historically it was not present. Signed-off-by: Dominik Muth <muth@nxdomain.no-ip.biz> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-12-03Remove unused definition of XCONN_CHECK_FREQAlan Coopersmith1-8/+0
The only use of XCONN_CHECK_FREQ was removed in commit 15e5eaf62897b3179 when we dropped the old Xlib connection handling in favor of xcb's. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
2015-09-21fix for Xlib 32-bit request number issuesChristian Linhart1-0/+118
Make use of the new 64-bit sequence number API in XCB 1.11.1 to avoid the 32-bit sequence number wrap in libX11. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71338 Signed-off-by: Christian Linhart <chris@demorecorder.com> Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-12-02unifdef -UISCAlan Coopersmith1-17/+0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-11-22Drop X_LOCALE fallback for OS'es without setlocale()Alan Coopersmith1-22/+0
C89 or bust! This was documented as being needed for "only Lynx, Linux-libc5, OS/2" and has never been enabled in modular builds, since none of those platforms have had anyone step up to add support since the X11R7 conversion to autotools. Mostly performed with unifdef -UX_LOCALE, followed by removal of files left without any purpose, and manual cleanup of remaining references. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-08-20Avoid memory leak/corruption if realloc fails in Xregion.h:MEMCHECK macroAlan Coopersmith1-3/+4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-24Require ANSI C89 pre-processor, drop pre-C89 token pasting supportAlan Coopersmith1-28/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-05-09Give GNU & Solaris Studio compilers hints about XEatData branchesAlan Coopersmith1-2/+14
Try to offset the cost of all the recent checks we've added by giving the compiler a hint that the branches that involve us eating data are less likely to be used than the ones that process it. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-05-09Add _XEatDataWords to discard a given number of 32-bit words of reply dataAlan Coopersmith1-0/+4
Matches the units of the length field in X protocol replies, and provides a single implementation of overflow checking to avoid having to replicate those checks in every caller. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
2013-03-08MakeBigReq: don't move the last word, already handled by Data32Karl Tomlinson1-2/+17
MakeBigReq inserts a length field after the first 4 bytes of the request (after req->length), pushing everything else back by 4 bytes. The current memmove moves everything but the first 4 bytes back. If a request aligns to the end of the buffer pointer when MakeBigReq is invoked for that request, this runs over the buffer. Instead, we need to memmove minus the first 4 bytes (which aren't moved), minus the last 4 bytes (so we still align to the previous tail). The 4 bytes that fell out are already handled with Data32, which will handle the buffermax correctly. The case where req->length = 1 was already not functional. Reported by Abhishek Arya <inferno@chromium.org>. https://bugzilla.mozilla.org/show_bug.cgi?id=803762 Reviewed-by: Jeff Muizelaar <jmuizelaar@mozilla.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Notes: CVE-2013-7439
2013-03-03unifdef CRAY & _CRAYAlan Coopersmith2-11/+0
(mostly performed with unifdef, followed by some manual cleanup of the remaining code) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-03-03unifdef WORD64Alan Coopersmith1-36/+1
WORD64 seems to have only been defined in <X11/Xmd.h> when building for CRAY, to handle int being a 64-bit value (ILP64, not LP64) and having 64-bit alignment requirements. It hadn't been fully supported even before autotooling, as can be seen by removed code such as: #ifdef WORD64 _XkbWriteCopyData32 Not Implemented Yet for sizeof(int)==8 #endif (mostly performed with unifdef, followed by some manual cleanup of the remaining code) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-03-03unifdef MUSTCOPYAlan Coopersmith1-9/+0
MUSTCOPY seems to have only been defined in <X11/Xmd.h> when building for CRAY, to handle missing some sizes of integer type. (mostly performed with unifdef, followed by some manual cleanup of spacing/indenting in the remaining code) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-02-16Preserve constness in casting arguments through the Data*() routinesAlan Coopersmith1-6/+6
Casts were annoying gcc by dropping constness when changing types, when routines simply either copy data into the request buffer or send it directly to the X server, and never modify the input. Fixes gcc warnings including: ChProp.c: In function 'XChangeProperty': ChProp.c:65:6: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] ChProp.c:65:6: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] ChProp.c:74:6: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] ChProp.c:74:6: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] ChProp.c:83:6: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] SetHints.c: In function 'XSetStandardProperties': SetHints.c:262:20: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] SetPntMap.c: In function 'XSetPointerMapping': SetPntMap.c:46:5: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] SetPntMap.c:46:5: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] StBytes.c: In function 'XStoreBuffer': StBytes.c:97:33: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] StName.c: In function 'XStoreName': StName.c:40:27: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] StName.c: In function 'XSetIconName': StName.c:51:27: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-02-16Fix comment typo & confusing indentation levels in Data() macro definitionAlan Coopersmith1-2/+2
The final } matches the one on the #define line, not one that doesn't appear after the else statement it was lined up with Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-09Tell clang not to report -Wpadded warnings on public headers we can't fixAlan Coopersmith4-0/+48
Better to silence the compiler warning than break ABI. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-11-08Use GetReqSized for GetReq and GetReqExtraPeter Hutterer1-4/+4
GetEmptyReq and GetResReq cannot do this due to the final typecast - typically requests that need either of those do not have their own typedef in the protocol headers. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-11-08include: Add GetReqSized() for request buffers of specific sizePeter Hutterer1-0/+12
Some XI2 requests change in size over different versions and libXi would need to hack around GetReq and GetReqExtra. Add a new GetReqSized so the library can explicitly specify the size of the request in 4-byte units. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-11-08Switch GetEmptyReq and GetResReq to call _XGetRequestPeter Hutterer1-34/+6
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-11-08Add _XGetRequest as substitute for GetReq/GetReqExtraPeter Hutterer1-33/+16
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-10-11libX11: Fixing modifier key range in Xutil.h (Bug #21910)Bodo Graumann1-1/+1
IsModifierKey, defined in include/X11/Xutil.h, is a macro determining, which keys are regarded as modifiers. The constants ISO_Level5_Shift, ISO_Level5_Latch and ISO_Level5_Lock where excluded previously, leaving some Neo2 modifiers functionless in combination with compose. This patch adjusts the range to include the correct, full range of modifier constants. Neo2 Bug 277 <http://wiki.neo-layout.org/ticket/277> X.Org Bug 21910 <http://bugs.freedesktop.org/show_bug.cgi?id=21910> Signed-off-by: Bodo Graumann <mail@bodograumann.de> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-10-10Mark XKeycodeToKeysym as _X_DEPRECATEDJeremy Huddleston1-0/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-17Fix man page and comment references to use XFreeModifiermap (lowercase map)Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-05-08Silence clang static analysis warnings for SetReqLenJeremy Huddleston1-0/+5
This provides a simplified version of the SetReqLen macro when using clang for static analysis. Prior to this change, we would see many Idempotent operation warnings inside this macro due to the common case of calling with arg2 and arg3 being the same variable. This has no effect on code produced during compilation, but it silences a number of false positives in static analysis. XIPassiveGrab.c:170:5: warning: Assigned value is always the same as the existing value SetReqLen(req, num_modifiers, num_modifiers); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from XIPassiveGrab.c:26: .../include/X11/Xlibint.h:580:8: note: instantiated from: n = badlen; \ ^ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 23:36:42 +0000