frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: Remove some fascinating paranoia from event emission 

XkbInterestPtrs are created by clients that already exist, meaning,
clients that have already had ProcVector installed as something other
than InitialProcVector.

Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-05-28 14:48:14 -04:00
parent ac3af4bd21
commit a5e7701058
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xkb/xkbEvents.c
View File

@ -237,7 +237,6 @@ XkbSendStateNotify(DeviceIntPtr kbd, xkbStateNotify * pSN)
while (interest) { while (interest) {
if ((!interest->client->clientGone) && if ((!interest->client->clientGone) &&
(interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) && (interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->stateNotifyMask & changed)) { (interest->stateNotifyMask & changed)) {
pSN->sequenceNumber = interest->client->sequence; pSN->sequenceNumber = interest->client->sequence;
@ -400,7 +399,6 @@ XkbSendControlsNotify(DeviceIntPtr kbd, xkbControlsNotify * pCN)
pCN->numGroups = xkbi->desc->ctrls->num_groups; pCN->numGroups = xkbi->desc->ctrls->num_groups;
while (interest) { while (interest) {
if ((!interest->client->clientGone) && if ((!interest->client->clientGone) &&
(interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) && (interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->ctrlsNotifyMask & changedControls)) { (interest->ctrlsNotifyMask & changedControls)) {
if (!initialized) { if (!initialized) {
@ -447,7 +445,6 @@ XkbSendIndicatorNotify(DeviceIntPtr kbd, int xkbType, xkbIndicatorNotify * pEv)
changed = pEv->changed; changed = pEv->changed;
while (interest) { while (interest) {
if ((!interest->client->clientGone) && if ((!interest->client->clientGone) &&
(interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) && (interest->client->xkbClientFlags & _XkbClientInitialized) &&
(((xkbType == XkbIndicatorStateNotify) && (((xkbType == XkbIndicatorStateNotify) &&
(interest->iStateNotifyMask & changed)) || (interest->iStateNotifyMask & changed)) ||
@ -528,7 +525,6 @@ XkbHandleBell(BOOL force,
initialized = 0; initialized = 0;
while (interest) { while (interest) {
if ((!interest->client->clientGone) && if ((!interest->client->clientGone) &&
(interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) && (interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->bellNotifyMask)) { (interest->bellNotifyMask)) {
if (!initialized) { if (!initialized) {
@ -581,7 +577,6 @@ XkbSendAccessXNotify(DeviceIntPtr kbd, xkbAccessXNotify * pEv)
db_delay = pEv->debounceDelay; db_delay = pEv->debounceDelay;
while (interest) { while (interest) {
if ((!interest->client->clientGone) && if ((!interest->client->clientGone) &&
(interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) && (interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->accessXNotifyMask & (1 << pEv->detail))) { (interest->accessXNotifyMask & (1 << pEv->detail))) {
if (!initialized) { if (!initialized) {
@ -627,7 +622,6 @@ XkbSendNamesNotify(DeviceIntPtr kbd, xkbNamesNotify * pEv)
changedVirtualMods = pEv->changedVirtualMods; changedVirtualMods = pEv->changedVirtualMods;
while (interest) { while (interest) {
if ((!interest->client->clientGone) && if ((!interest->client->clientGone) &&
(interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) && (interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->namesNotifyMask & pEv->changed)) { (interest->namesNotifyMask & pEv->changed)) {
if (!initialized) { if (!initialized) {
@ -671,7 +665,6 @@ XkbSendCompatMapNotify(DeviceIntPtr kbd, xkbCompatMapNotify * pEv)
initialized = 0; initialized = 0;
while (interest) { while (interest) {
if ((!interest->client->clientGone) && if ((!interest->client->clientGone) &&
(interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) && (interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->compatNotifyMask)) { (interest->compatNotifyMask)) {
if (!initialized) { if (!initialized) {
@ -722,7 +715,6 @@ XkbSendActionMessage(DeviceIntPtr kbd, xkbActionMessage * pEv)
pEv->group = xkbi->state.group; pEv->group = xkbi->state.group;
while (interest) { while (interest) {
if ((!interest->client->clientGone) && if ((!interest->client->clientGone) &&
(interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) && (interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->actionMessageMask)) { (interest->actionMessageMask)) {
if (!initialized) { if (!initialized) {
@ -766,7 +758,6 @@ XkbSendExtensionDeviceNotify(DeviceIntPtr dev,
state = pEv->ledState; state = pEv->ledState;
while (interest) { while (interest) {
if ((!interest->client->clientGone) && if ((!interest->client->clientGone) &&
(interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) && (interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->extDevNotifyMask & reason)) { (interest->extDevNotifyMask & reason)) {
if (!initialized) { if (!initialized) {