From d6d3999ccb2cb72d55820770260172eccbbb68d7 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 16 Apr 2012 09:17:34 +0200 Subject: libX11 xserver pixman mesa git update 16 Apr 2012 --- xorg-server/Xi/getselev.c | 72 +++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'xorg-server/Xi/getselev.c') diff --git a/xorg-server/Xi/getselev.c b/xorg-server/Xi/getselev.c index b316e2364..253c87fb5 100644 --- a/xorg-server/Xi/getselev.c +++ b/xorg-server/Xi/getselev.c @@ -56,8 +56,8 @@ SOFTWARE. #include #include -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window struct */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window struct */ #include "exglobals.h" #include "swaprep.h" @@ -111,45 +111,45 @@ ProcXGetSelectedExtensionEvents(ClientPtr client) rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); if (rc != Success) - return rc; + return rc; if ((pOthers = wOtherInputMasks(pWin)) != 0) { - for (others = pOthers->inputClients; others; others = others->next) - for (i = 0; i < EMASKSIZE; i++) - ClassFromMask(NULL, others->mask[i], i, - &rep.all_clients_count, COUNT); - - for (others = pOthers->inputClients; others; others = others->next) - if (SameClient(others, client)) { - for (i = 0; i < EMASKSIZE; i++) - ClassFromMask(NULL, others->mask[i], i, - &rep.this_client_count, COUNT); - break; - } - - total_length = (rep.all_clients_count + rep.this_client_count) * - sizeof(XEventClass); - rep.length = bytes_to_int32(total_length); - buf = (XEventClass *) malloc(total_length); - - tclient = buf; - aclient = buf + rep.this_client_count; - if (others) - for (i = 0; i < EMASKSIZE; i++) - tclient = - ClassFromMask(tclient, others->mask[i], i, NULL, CREATE); - - for (others = pOthers->inputClients; others; others = others->next) - for (i = 0; i < EMASKSIZE; i++) - aclient = - ClassFromMask(aclient, others->mask[i], i, NULL, CREATE); + for (others = pOthers->inputClients; others; others = others->next) + for (i = 0; i < EMASKSIZE; i++) + ClassFromMask(NULL, others->mask[i], i, + &rep.all_clients_count, COUNT); + + for (others = pOthers->inputClients; others; others = others->next) + if (SameClient(others, client)) { + for (i = 0; i < EMASKSIZE; i++) + ClassFromMask(NULL, others->mask[i], i, + &rep.this_client_count, COUNT); + break; + } + + total_length = (rep.all_clients_count + rep.this_client_count) * + sizeof(XEventClass); + rep.length = bytes_to_int32(total_length); + buf = (XEventClass *) malloc(total_length); + + tclient = buf; + aclient = buf + rep.this_client_count; + if (others) + for (i = 0; i < EMASKSIZE; i++) + tclient = + ClassFromMask(tclient, others->mask[i], i, NULL, CREATE); + + for (others = pOthers->inputClients; others; others = others->next) + for (i = 0; i < EMASKSIZE; i++) + aclient = + ClassFromMask(aclient, others->mask[i], i, NULL, CREATE); } WriteReplyToClient(client, sizeof(xGetSelectedExtensionEventsReply), &rep); if (total_length) { - client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; - WriteSwappedDataToClient(client, total_length, buf); + client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; + WriteSwappedDataToClient(client, total_length, buf); } free(buf); return Success; @@ -164,11 +164,11 @@ ProcXGetSelectedExtensionEvents(ClientPtr client) void SRepXGetSelectedExtensionEvents(ClientPtr client, int size, - xGetSelectedExtensionEventsReply * rep) + xGetSelectedExtensionEventsReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); swaps(&rep->this_client_count); swaps(&rep->all_clients_count); - WriteToClient(client, size, (char *)rep); + WriteToClient(client, size, (char *) rep); } -- cgit v1.2.3