andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix: Pass the whole property into deliverPropertyNotifyEvent

Browse Source 
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>
This commit is contained in:
Adam Jackson 2014-07-12 12:39:21 -04:00
parent fde5cd7848
commit 50bcea8be3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dix/property.c
View File

@ -106,14 +106,14 @@ dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom propertyName,
} }
static void static void
deliverPropertyNotifyEvent(WindowPtr pWin, int state, Atom atom) deliverPropertyNotifyEvent(WindowPtr pWin, int state, PropertyPtr pProp)
{ {
xEvent event; xEvent event;
UpdateCurrentTimeIf(); UpdateCurrentTimeIf();
event = (xEvent) { event = (xEvent) {
.u.property.window = pWin->drawable.id, .u.property.window = pWin->drawable.id,
.u.property.state = state, .u.property.state = state,
.u.property.atom = atom, .u.property.atom = pProp->propertyName,
.u.property.time = currentTime.milliseconds, .u.property.time = currentTime.milliseconds,
}; };
event.u.u.type = PropertyNotify; event.u.u.type = PropertyNotify;
@ -175,7 +175,7 @@ ProcRotateProperties(ClientPtr client)
delta += stuff->nAtoms; delta += stuff->nAtoms;
for (i = 0; i < stuff->nAtoms; i++) { for (i = 0; i < stuff->nAtoms; i++) {
j = (i + delta) % stuff->nAtoms; j = (i + delta) % stuff->nAtoms;
deliverPropertyNotifyEvent(pWin, PropertyNewValue, atoms[i]); deliverPropertyNotifyEvent(pWin, PropertyNewValue, props[i]);
/* Preserve name and devPrivates */ /* Preserve name and devPrivates */
props[j]->type = saved[i].type; props[j]->type = saved[i].type;
@ -351,7 +351,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
return rc; return rc;
if (sendevent) if (sendevent)
deliverPropertyNotifyEvent(pWin, PropertyNewValue, pProp->propertyName); deliverPropertyNotifyEvent(pWin, PropertyNewValue, pProp);
return Success; return Success;
} }
@ -380,7 +380,7 @@ DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName)
prevProp->next = pProp->next; prevProp->next = pProp->next;
} }
deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName); deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp);
free(pProp->data); free(pProp->data);
dixFreeObjectWithPrivates(pProp, PRIVATE_PROPERTY); dixFreeObjectWithPrivates(pProp, PRIVATE_PROPERTY);
} }
@ -394,7 +394,7 @@ DeleteAllWindowProperties(WindowPtr pWin)
pProp = wUserProps(pWin); pProp = wUserProps(pWin);
while (pProp) { while (pProp) {
deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName); deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp);
pNextProp = pProp->next; pNextProp = pProp->next;
free(pProp->data); free(pProp->data);
dixFreeObjectWithPrivates(pProp, PRIVATE_PROPERTY); dixFreeObjectWithPrivates(pProp, PRIVATE_PROPERTY);
@ -517,7 +517,7 @@ ProcGetProperty(ClientPtr client)
}; };
if (stuff->delete && (reply.bytesAfter == 0)) if (stuff->delete && (reply.bytesAfter == 0))
deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName); deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp);
WriteReplyToClient(client, sizeof(xGenericReply), &reply); WriteReplyToClient(client, sizeof(xGenericReply), &reply);
if (len) { if (len) {