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

Use C99 designated initializers in RandR 1.4 extension Replies

Browse Source 
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:
Alan Coopersmith 2012-07-14 10:45:29 -07:00
parent fb73f7f40f
commit ada04ef0ca
3 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
randr/rrprovider.c
View File

@ -86,23 +86,26 @@ ProcRRGetProviders (ClientPtr client)
} }
pScrPriv = rrGetScrPriv(pScreen); pScrPriv = rrGetScrPriv(pScreen);
rep.pad = 0;
if (!pScrPriv) if (!pScrPriv)
{ {
rep.type = X_Reply; rep = (xRRGetProvidersReply) {
rep.sequenceNumber = client->sequence; .type = X_Reply,
rep.length = 0; .sequenceNumber = client->sequence,
rep.timestamp = currentTime.milliseconds; .length = 0,
rep.nProviders = 0; .timestamp = currentTime.milliseconds,
.nProviders = 0
};
extra = NULL; extra = NULL;
extraLen = 0; extraLen = 0;
} else { } else {
rep.type = X_Reply; rep = (xRRGetProvidersReply) {
rep.sequenceNumber = client->sequence; .type = X_Reply,
rep.timestamp = pScrPriv->lastSetTime.milliseconds; .sequenceNumber = client->sequence,
rep.nProviders = total_providers; .timestamp = pScrPriv->lastSetTime.milliseconds,
rep.length = total_providers; .nProviders = total_providers,
.length = total_providers
};
extraLen = rep.length << 2; extraLen = rep.length << 2;
if (extraLen) { if (extraLen) {
extra = malloc(extraLen); extra = malloc(extraLen);
@ -163,18 +166,20 @@ ProcRRGetProviderInfo (ClientPtr client)
pScreen = provider->pScreen; pScreen = provider->pScreen;
pScrPriv = rrGetScrPriv(pScreen); pScrPriv = rrGetScrPriv(pScreen);
rep.type = X_Reply; rep = (xRRGetProviderInfoReply) {
rep.status = RRSetConfigSuccess; .type = X_Reply,
rep.sequenceNumber = client->sequence; .status = RRSetConfigSuccess,
rep.length = 0; .sequenceNumber = client->sequence,
rep.capabilities = provider->capabilities; .length = 0,
rep.nameLength = provider->nameLength; .capabilities = provider->capabilities,
rep.timestamp = pScrPriv->lastSetTime.milliseconds; .nameLength = provider->nameLength,
rep.nCrtcs = pScrPriv->numCrtcs; .timestamp = pScrPriv->lastSetTime.milliseconds,
rep.nOutputs = pScrPriv->numOutputs; .nCrtcs = pScrPriv->numCrtcs,
.nOutputs = pScrPriv->numOutputs,
.nAssociatedProviders = 0
};
/* count associated providers */ /* count associated providers */
rep.nAssociatedProviders = 0;
if (provider->offload_sink) if (provider->offload_sink)
rep.nAssociatedProviders++; rep.nAssociatedProviders++;
if (provider->output_source) if (provider->output_source)

31
randr/rrproviderproperty.c
View File

@ -394,10 +394,12 @@ ProcRRListProviderProperties(ClientPtr client)
if (!(pAtoms = (Atom *) malloc(numProps * sizeof(Atom)))) if (!(pAtoms = (Atom *) malloc(numProps * sizeof(Atom))))
return BadAlloc; return BadAlloc;
rep.type = X_Reply; rep = (xRRListProviderPropertiesReply) {
rep.length = bytes_to_int32(numProps * sizeof(Atom)); .type = X_Reply,
rep.sequenceNumber = client->sequence; .sequenceNumber = client->sequence,
rep.nAtoms = numProps; .length = bytes_to_int32(numProps * sizeof(Atom)),
.nAtoms = numProps
};
if (client->swapped) { if (client->swapped) {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
swapl(&rep.length); swapl(&rep.length);
@ -438,12 +440,14 @@ ProcRRQueryProviderProperty(ClientPtr client)
if (!extra) if (!extra)
return BadAlloc; return BadAlloc;
} }
rep.type = X_Reply; rep = (xRRQueryProviderPropertyReply) {
rep.length = prop->num_valid; .type = X_Reply,
rep.sequenceNumber = client->sequence; .sequenceNumber = client->sequence,
rep.pending = prop->is_pending; .length = prop->num_valid,
rep.range = prop->range; .pending = prop->is_pending,
rep.immutable = prop->immutable; .range = prop->range,
.immutable = prop->immutable
};
if (client->swapped) { if (client->swapped) {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
swapl(&rep.length); swapl(&rep.length);
@ -568,7 +572,10 @@ ProcRRGetProviderProperty(ClientPtr client)
RRPropertyValuePtr prop_value; RRPropertyValuePtr prop_value;
unsigned long n, len, ind; unsigned long n, len, ind;
RRProviderPtr provider; RRProviderPtr provider;
xRRGetProviderPropertyReply reply; xRRGetProviderPropertyReply reply = {
.type = X_Reply,
.sequenceNumber = client->sequence
};
char *extra = NULL; char *extra = NULL;
REQUEST_SIZE_MATCH(xRRGetProviderPropertyReq); REQUEST_SIZE_MATCH(xRRGetProviderPropertyReq);
@ -594,8 +601,6 @@ ProcRRGetProviderProperty(ClientPtr client)
if (prop->propertyName == stuff->property) if (prop->propertyName == stuff->property)
break; break;
reply.type = X_Reply;
reply.sequenceNumber = client->sequence;
if (!prop) { if (!prop) {
reply.nItems = 0; reply.nItems = 0;
reply.length = 0; reply.length = 0;

21
randr/rrscreen.c
View File

@ -396,16 +396,17 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen)
ErrorF("reporting %d %d %d %d\n", total_crtcs, total_outputs, total_modes, total_name_len); ErrorF("reporting %d %d %d %d\n", total_crtcs, total_outputs, total_modes, total_name_len);
pScrPriv = rrGetScrPriv(pScreen); pScrPriv = rrGetScrPriv(pScreen);
rep.pad = 0; rep = (xRRGetScreenResourcesReply) {
rep.type = X_Reply; .type = X_Reply,
rep.sequenceNumber = client->sequence; .sequenceNumber = client->sequence,
rep.length = 0; .length = 0,
rep.timestamp = pScrPriv->lastSetTime.milliseconds; .timestamp = pScrPriv->lastSetTime.milliseconds,
rep.configTimestamp = pScrPriv->lastConfigTime.milliseconds; .configTimestamp = pScrPriv->lastConfigTime.milliseconds,
rep.nCrtcs = total_crtcs; .nCrtcs = total_crtcs,
rep.nOutputs = total_outputs; .nOutputs = total_outputs,
rep.nModes = total_modes; .nModes = total_modes,
rep.nbytesNames = total_name_len; .nbytesNames = total_name_len
};
rep.length = (total_crtcs + total_outputs + total_modes * bytes_to_int32(SIZEOF(xRRModeInfo)) + rep.length = (total_crtcs + total_outputs + total_modes * bytes_to_int32(SIZEOF(xRRModeInfo)) +
bytes_to_int32(rep.nbytesNames)); bytes_to_int32(rep.nbytesNames));