Use C99 designated initializers in RandR 1.4 extension Events
RandR 1.4 was going through review in parallel with main batch of C99 initialization changes - sync up now that both have landed. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
ada04ef0ca
commit
a6c5b8d3ee
|
@ -65,14 +65,14 @@ RRDestroyProviderProperty(RRPropertyPtr prop)
|
||||||
static void
|
static void
|
||||||
RRDeleteProperty(RRProviderRec * provider, RRPropertyRec * prop)
|
RRDeleteProperty(RRProviderRec * provider, RRPropertyRec * prop)
|
||||||
{
|
{
|
||||||
xRRProviderPropertyNotifyEvent event;
|
xRRProviderPropertyNotifyEvent event = {
|
||||||
|
.type = RREventBase + RRNotify,
|
||||||
event.type = RREventBase + RRNotify;
|
.subCode = RRNotify_ProviderProperty,
|
||||||
event.subCode = RRNotify_ProviderProperty;
|
.provider = provider->id,
|
||||||
event.provider = provider->id;
|
.state = PropertyDelete,
|
||||||
event.state = PropertyDelete;
|
.atom = prop->propertyName,
|
||||||
event.atom = prop->propertyName;
|
.timestamp = currentTime.milliseconds
|
||||||
event.timestamp = currentTime.milliseconds;
|
};
|
||||||
|
|
||||||
RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
|
RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
|
||||||
|
|
||||||
|
@ -138,7 +138,6 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
|
||||||
pointer value, Bool sendevent, Bool pending)
|
pointer value, Bool sendevent, Bool pending)
|
||||||
{
|
{
|
||||||
RRPropertyPtr prop;
|
RRPropertyPtr prop;
|
||||||
xRRProviderPropertyNotifyEvent event;
|
|
||||||
rrScrPrivPtr pScrPriv = rrGetScrPriv(provider->pScreen);
|
rrScrPrivPtr pScrPriv = rrGetScrPriv(provider->pScreen);
|
||||||
int size_in_bytes;
|
int size_in_bytes;
|
||||||
int total_size;
|
int total_size;
|
||||||
|
@ -237,12 +236,14 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
|
||||||
provider->pendingProperties = TRUE;
|
provider->pendingProperties = TRUE;
|
||||||
|
|
||||||
if (sendevent) {
|
if (sendevent) {
|
||||||
event.type = RREventBase + RRNotify;
|
xRRProviderPropertyNotifyEvent event = {
|
||||||
event.subCode = RRNotify_ProviderProperty;
|
.type = RREventBase + RRNotify,
|
||||||
event.provider = provider->id;
|
.subCode = RRNotify_ProviderProperty,
|
||||||
event.state = PropertyNewValue;
|
.provider = provider->id,
|
||||||
event.atom = prop->propertyName;
|
.state = PropertyNewValue,
|
||||||
event.timestamp = currentTime.milliseconds;
|
.atom = prop->propertyName,
|
||||||
|
.timestamp = currentTime.milliseconds
|
||||||
|
};
|
||||||
RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
|
RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
|
||||||
}
|
}
|
||||||
return Success;
|
return Success;
|
||||||
|
@ -677,14 +678,14 @@ ProcRRGetProviderProperty(ClientPtr client)
|
||||||
reply.propertyType = prop_value->type;
|
reply.propertyType = prop_value->type;
|
||||||
|
|
||||||
if (stuff->delete && (reply.bytesAfter == 0)) {
|
if (stuff->delete && (reply.bytesAfter == 0)) {
|
||||||
xRRProviderPropertyNotifyEvent event;
|
xRRProviderPropertyNotifyEvent event = {
|
||||||
|
.type = RREventBase + RRNotify,
|
||||||
event.type = RREventBase + RRNotify;
|
.subCode = RRNotify_ProviderProperty,
|
||||||
event.subCode = RRNotify_ProviderProperty;
|
.provider = provider->id,
|
||||||
event.provider = provider->id;
|
.state = PropertyDelete,
|
||||||
event.state = PropertyDelete;
|
.atom = prop->propertyName,
|
||||||
event.atom = prop->propertyName;
|
.timestamp = currentTime.milliseconds
|
||||||
event.timestamp = currentTime.milliseconds;
|
};
|
||||||
RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
|
RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user