Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
This commit is contained in:
commit
5d99e05f05
|
@ -178,7 +178,7 @@ ProcXSelectExtensionEvent(register ClientPtr client)
|
||||||
return Success;
|
return Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HandleDevicePresenceMask(client, pWin, (XEventClass *) & stuff[i],
|
if (HandleDevicePresenceMask(client, pWin, (XEventClass *) & stuff[1],
|
||||||
&stuff->count) != Success) {
|
&stuff->count) != Success) {
|
||||||
SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0,
|
SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0,
|
||||||
BadAlloc);
|
BadAlloc);
|
||||||
|
|
|
@ -135,6 +135,7 @@ of the copyright holder.
|
||||||
#include <X11/extensions/XKBproto.h>
|
#include <X11/extensions/XKBproto.h>
|
||||||
#include <X11/extensions/XKBsrv.h>
|
#include <X11/extensions/XKBsrv.h>
|
||||||
extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
|
extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
|
||||||
|
extern Bool XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XCSECURITY
|
#ifdef XCSECURITY
|
||||||
|
|
|
@ -242,7 +242,7 @@ XkbMapChangesPtr mc;
|
||||||
xkb->min_key_code= first;
|
xkb->min_key_code= first;
|
||||||
/* 1/12/95 (ef) -- XXX! should zero out the new maps */
|
/* 1/12/95 (ef) -- XXX! should zero out the new maps */
|
||||||
changes->map.changed|= XkbKeycodesMask;
|
changes->map.changed|= XkbKeycodesMask;
|
||||||
generate a NewKeyboard notify here?
|
/* generate a NewKeyboard notify here? */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user