summaryrefslogtreecommitdiff
path: root/xkb
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2014-05-28 14:48:14 -0400
committerAdam Jackson <ajax@redhat.com>2014-07-29 09:53:45 -0400
commita5e7701058c676231d2bc3f9a0c7c0fa9da7ad45 (patch)
tree5291223a0c03f14a438868928281cc49567c7f5e /xkb
parentac3af4bd21394291ef6dd9cfcdd8ce6fceefec40 (diff)
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>
Diffstat (limited to 'xkb')
-rw-r--r--xkb/xkbEvents.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 210d8ebe4..cc9a535d7 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -237,7 +237,6 @@ XkbSendStateNotify(DeviceIntPtr kbd, xkbStateNotify * pSN)
while (interest) {
if ((!interest->client->clientGone) &&
- (interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->stateNotifyMask & changed)) {
pSN->sequenceNumber = interest->client->sequence;
@@ -400,7 +399,6 @@ XkbSendControlsNotify(DeviceIntPtr kbd, xkbControlsNotify * pCN)
pCN->numGroups = xkbi->desc->ctrls->num_groups;
while (interest) {
if ((!interest->client->clientGone) &&
- (interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->ctrlsNotifyMask & changedControls)) {
if (!initialized) {
@@ -447,7 +445,6 @@ XkbSendIndicatorNotify(DeviceIntPtr kbd, int xkbType, xkbIndicatorNotify * pEv)
changed = pEv->changed;
while (interest) {
if ((!interest->client->clientGone) &&
- (interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) &&
(((xkbType == XkbIndicatorStateNotify) &&
(interest->iStateNotifyMask & changed)) ||
@@ -528,7 +525,6 @@ XkbHandleBell(BOOL force,
initialized = 0;
while (interest) {
if ((!interest->client->clientGone) &&
- (interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->bellNotifyMask)) {
if (!initialized) {
@@ -581,7 +577,6 @@ XkbSendAccessXNotify(DeviceIntPtr kbd, xkbAccessXNotify * pEv)
db_delay = pEv->debounceDelay;
while (interest) {
if ((!interest->client->clientGone) &&
- (interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->accessXNotifyMask & (1 << pEv->detail))) {
if (!initialized) {
@@ -627,7 +622,6 @@ XkbSendNamesNotify(DeviceIntPtr kbd, xkbNamesNotify * pEv)
changedVirtualMods = pEv->changedVirtualMods;
while (interest) {
if ((!interest->client->clientGone) &&
- (interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->namesNotifyMask & pEv->changed)) {
if (!initialized) {
@@ -671,7 +665,6 @@ XkbSendCompatMapNotify(DeviceIntPtr kbd, xkbCompatMapNotify * pEv)
initialized = 0;
while (interest) {
if ((!interest->client->clientGone) &&
- (interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->compatNotifyMask)) {
if (!initialized) {
@@ -722,7 +715,6 @@ XkbSendActionMessage(DeviceIntPtr kbd, xkbActionMessage * pEv)
pEv->group = xkbi->state.group;
while (interest) {
if ((!interest->client->clientGone) &&
- (interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->actionMessageMask)) {
if (!initialized) {
@@ -766,7 +758,6 @@ XkbSendExtensionDeviceNotify(DeviceIntPtr dev,
state = pEv->ledState;
while (interest) {
if ((!interest->client->clientGone) &&
- (interest->client->requestVector != InitialVector) &&
(interest->client->xkbClientFlags & _XkbClientInitialized) &&
(interest->extDevNotifyMask & reason)) {
if (!initialized) {