diff options
author | Adam Jackson <ajax@redhat.com> | 2014-07-12 12:39:21 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2017-02-23 13:30:11 -0500 |
commit | 50bcea8be337ea983e464f2b5b8b2dc6d1024532 (patch) | |
tree | 87508779e64e1927c79bf4250a80ef4f496c6961 | |
parent | fde5cd78488f3370c92397868ca78929296f7ad1 (diff) |
dix: Pass the whole property into deliverPropertyNotifyEvent
Instead of just the atom. No functional change.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r-- | dix/property.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dix/property.c b/dix/property.c index fa4da2d42..3447bca89 100644 --- a/dix/property.c +++ b/dix/property.c @@ -106,14 +106,14 @@ dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom propertyName, } static void -deliverPropertyNotifyEvent(WindowPtr pWin, int state, Atom atom) +deliverPropertyNotifyEvent(WindowPtr pWin, int state, PropertyPtr pProp) { xEvent event; UpdateCurrentTimeIf(); event = (xEvent) { .u.property.window = pWin->drawable.id, .u.property.state = state, - .u.property.atom = atom, + .u.property.atom = pProp->propertyName, .u.property.time = currentTime.milliseconds, }; event.u.u.type = PropertyNotify; @@ -175,7 +175,7 @@ ProcRotateProperties(ClientPtr client) delta += stuff->nAtoms; for (i = 0; i < stuff->nAtoms; i++) { j = (i + delta) % stuff->nAtoms; - deliverPropertyNotifyEvent(pWin, PropertyNewValue, atoms[i]); + deliverPropertyNotifyEvent(pWin, PropertyNewValue, props[i]); /* Preserve name and devPrivates */ props[j]->type = saved[i].type; @@ -351,7 +351,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property, return rc; if (sendevent) - deliverPropertyNotifyEvent(pWin, PropertyNewValue, pProp->propertyName); + deliverPropertyNotifyEvent(pWin, PropertyNewValue, pProp); return Success; } @@ -380,7 +380,7 @@ DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName) prevProp->next = pProp->next; } - deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName); + deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp); free(pProp->data); dixFreeObjectWithPrivates(pProp, PRIVATE_PROPERTY); } @@ -394,7 +394,7 @@ DeleteAllWindowProperties(WindowPtr pWin) pProp = wUserProps(pWin); while (pProp) { - deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName); + deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp); pNextProp = pProp->next; free(pProp->data); dixFreeObjectWithPrivates(pProp, PRIVATE_PROPERTY); @@ -517,7 +517,7 @@ ProcGetProperty(ClientPtr client) }; if (stuff->delete && (reply.bytesAfter == 0)) - deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName); + deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp); WriteReplyToClient(client, sizeof(xGenericReply), &reply); if (len) { |