mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-04 22:36:10 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: Xext/xace.c Xext/xace.h
This commit is contained in:
commit
1603130236
35 changed files with 673 additions and 635 deletions
|
|
@ -207,11 +207,13 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator,
|
|||
*
|
||||
* Should be used in DIX as:
|
||||
* xEvent *events = xcalloc(sizeof(xEvent), GetMaximumEventsNum());
|
||||
*
|
||||
* This MUST be absolutely constant, from init until exit.
|
||||
*/
|
||||
_X_EXPORT int
|
||||
GetMaximumEventsNum(void) {
|
||||
/* Two base events -- core and device, plus valuator events. Multiply
|
||||
* by two if we're doing key repeats. */
|
||||
* by two if we're doing non-XKB key repeats. */
|
||||
int ret = 2 + MAX_VALUATOR_EVENTS;
|
||||
|
||||
#ifdef XKB
|
||||
|
|
|
|||
Loading…
Reference in a new issue