From d137057fd13e83ec15ab416c7fe774741da06047 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 10 Jul 2012 14:56:29 +0200 Subject: fontconfig mesa xserver git update 10 Jul 2012 --- xorg-server/Xi/chgdctl.c | 25 +++++---- xorg-server/Xi/exevents.c | 13 ++--- xorg-server/Xi/extinit.c | 13 ++--- xorg-server/Xi/getbmap.c | 16 +++--- xorg-server/Xi/getdctl.c | 12 ++-- xorg-server/Xi/getfctl.c | 14 +++-- xorg-server/Xi/getfocus.c | 12 ++-- xorg-server/Xi/getkmap.c | 14 +++-- xorg-server/Xi/getmmap.c | 16 +++--- xorg-server/Xi/getprop.c | 14 +++-- xorg-server/Xi/getselev.c | 16 +++--- xorg-server/Xi/getvers.c | 19 ++++--- xorg-server/Xi/grabdev.c | 12 ++-- xorg-server/Xi/grabdevb.c | 15 ++--- xorg-server/Xi/grabdevk.c | 15 ++--- xorg-server/Xi/gtmotion.c | 20 ++++--- xorg-server/Xi/listdev.c | 13 +++-- xorg-server/Xi/opendev.c | 17 +++--- xorg-server/Xi/queryst.c | 16 +++--- xorg-server/Xi/setbmap.c | 14 +++-- xorg-server/Xi/setdval.c | 14 +++-- xorg-server/Xi/setmmap.c | 12 ++-- xorg-server/Xi/setmode.c | 12 ++-- xorg-server/Xi/xigetclientpointer.c | 16 +++--- xorg-server/Xi/xigrabdev.c | 14 +++-- xorg-server/Xi/xipassivegrab.c | 18 +++--- xorg-server/Xi/xiproperty.c | 109 +++++++++++++++++++----------------- xorg-server/Xi/xiquerydevice.c | 15 ++--- xorg-server/Xi/xiquerypointer.c | 21 +++---- xorg-server/Xi/xiqueryversion.c | 17 +++--- xorg-server/Xi/xiselectev.c | 14 +++-- xorg-server/Xi/xisetdevfocus.c | 12 ++-- 32 files changed, 314 insertions(+), 266 deletions(-) (limited to 'xorg-server/Xi') diff --git a/xorg-server/Xi/chgdctl.c b/xorg-server/Xi/chgdctl.c index ff5d69aef..9fe69a5ad 100644 --- a/xorg-server/Xi/chgdctl.c +++ b/xorg-server/Xi/chgdctl.c @@ -113,7 +113,6 @@ ProcXChangeDeviceControl(ClientPtr client) AxisInfoPtr a; CARD32 *resolution; xDeviceEnableCtl *e; - devicePresenceNotify dpn; REQUEST(xChangeDeviceControlReq); REQUEST_AT_LEAST_SIZE(xChangeDeviceControlReq); @@ -123,10 +122,12 @@ ProcXChangeDeviceControl(ClientPtr client) if (ret != Success) goto out; - rep.repType = X_Reply; - rep.RepType = X_ChangeDeviceControl; - rep.length = 0; - rep.sequenceNumber = client->sequence; + rep = (xChangeDeviceControlReply) { + .repType = X_Reply, + .RepType = X_ChangeDeviceControl, + .sequenceNumber = client->sequence, + .length = 0 + }; switch (stuff->control) { case DEVICE_RESOLUTION: @@ -209,11 +210,13 @@ ProcXChangeDeviceControl(ClientPtr client) out: if (ret == Success) { - dpn.type = DevicePresenceNotify; - dpn.time = currentTime.milliseconds; - dpn.devchange = DeviceControlChanged; - dpn.deviceid = dev->id; - dpn.control = stuff->control; + devicePresenceNotify dpn = { + .type = DevicePresenceNotify, + .time = currentTime.milliseconds, + .devchange = DeviceControlChanged, + .deviceid = dev->id, + .control = stuff->control + }; SendEventToAllWindows(dev, DevicePresenceNotifyMask, (xEvent *) &dpn, 1); @@ -236,5 +239,5 @@ SRepXChangeDeviceControl(ClientPtr client, int size, { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c index e99bf6c20..9f6ec84b9 100644 --- a/xorg-server/Xi/exevents.c +++ b/xorg-server/Xi/exevents.c @@ -1266,7 +1266,7 @@ ProcessTouchOwnershipEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, else ti->listeners[0].state = LISTENER_HAS_ACCEPTED; } - else { /* this is the very first ownership event for a grab */ + else { /* this is the very first ownership event for a grab */ DeliverTouchEvents(dev, ti, (InternalEvent *) ev, ev->resource); } } @@ -2312,12 +2312,11 @@ SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client, check = (mask & exclusivemasks); if (wOtherInputMasks(pWin)) { - if (check & wOtherInputMasks(pWin)->inputEvents[mskidx]) { /* It is illegal for two different - * clients to select on any of the - * events for maskcheck. However, - * it is OK, for some client to - * continue selecting on one of those - * events. */ + if (check & wOtherInputMasks(pWin)->inputEvents[mskidx]) { + /* It is illegal for two different clients to select on any of + * the events for maskcheck. However, it is OK, for some client + * to continue selecting on one of those events. + */ for (others = wOtherInputMasks(pWin)->inputClients; others; others = others->next) { if (!SameClient(others, client) && (check & diff --git a/xorg-server/Xi/extinit.c b/xorg-server/Xi/extinit.c index 94f46f72f..eac2586ed 100644 --- a/xorg-server/Xi/extinit.c +++ b/xorg-server/Xi/extinit.c @@ -49,8 +49,6 @@ SOFTWARE. * Dispatch routines and initialization routines for the X input extension. * */ -#define ARRAY_SIZE(_a) (sizeof((_a)) / sizeof((_a)[0])) - #define NUMTYPES 15 #ifdef HAVE_DIX_CONFIG_H @@ -150,10 +148,8 @@ const Mask ChangeDeviceNotifyMask = (1L << 16); const Mask DeviceButtonGrabMask = (1L << 17); const Mask DeviceOwnerGrabButtonMask = (1L << 17); const Mask DevicePresenceNotifyMask = (1L << 18); -const Mask DeviceEnterWindowMask = (1L << 18); -const Mask DeviceLeaveWindowMask = (1L << 19); -const Mask DevicePropertyNotifyMask = (1L << 20); -const Mask XIAllMasks = (1L << 21) - 1; +const Mask DevicePropertyNotifyMask = (1L << 19); +const Mask XIAllMasks = (1L << 20) - 1; int ExtEventIndex; Mask ExtExclusiveMasks[EMASKSIZE]; @@ -438,8 +434,9 @@ SProcIDispatch(ClientPtr client) static void SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep) - /* All we look at is the type field */ -{ /* This is common to all replies */ +{ + /* All we look at is the type field */ + /* This is common to all replies */ if (rep->RepType == X_GetExtensionVersion) SRepXGetExtensionVersion(client, len, (xGetExtensionVersionReply *) rep); diff --git a/xorg-server/Xi/getbmap.c b/xorg-server/Xi/getbmap.c index a0ec1a61b..49b868889 100644 --- a/xorg-server/Xi/getbmap.c +++ b/xorg-server/Xi/getbmap.c @@ -92,11 +92,13 @@ ProcXGetDeviceButtonMapping(ClientPtr client) REQUEST(xGetDeviceButtonMappingReq); REQUEST_SIZE_MATCH(xGetDeviceButtonMappingReq); - rep.repType = X_Reply; - rep.RepType = X_GetDeviceButtonMapping; - rep.nElts = 0; - rep.length = 0; - rep.sequenceNumber = client->sequence; + rep = (xGetDeviceButtonMappingReply) { + .repType = X_Reply, + .RepType = X_GetDeviceButtonMapping, + .sequenceNumber = client->sequence, + .nElts = 0, + .length = 0 + }; rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess); if (rc != Success) @@ -109,7 +111,7 @@ ProcXGetDeviceButtonMapping(ClientPtr client) rep.nElts = b->numButtons; rep.length = bytes_to_int32(rep.nElts); WriteReplyToClient(client, sizeof(xGetDeviceButtonMappingReply), &rep); - (void) WriteToClient(client, rep.nElts, (char *) &b->map[1]); + WriteToClient(client, rep.nElts, &b->map[1]); return Success; } @@ -126,5 +128,5 @@ SRepXGetDeviceButtonMapping(ClientPtr client, int size, { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/getdctl.c b/xorg-server/Xi/getdctl.c index 4d66a4dfc..6f73e0979 100644 --- a/xorg-server/Xi/getdctl.c +++ b/xorg-server/Xi/getdctl.c @@ -158,7 +158,7 @@ SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } /*********************************************************************** @@ -182,10 +182,12 @@ ProcXGetDeviceControl(ClientPtr client) if (rc != Success) return rc; - rep.repType = X_Reply; - rep.RepType = X_GetDeviceControl; - rep.length = 0; - rep.sequenceNumber = client->sequence; + rep = (xGetDeviceControlReply) { + .repType = X_Reply, + .RepType = X_GetDeviceControl, + .sequenceNumber = client->sequence, + .length = 0 + }; switch (stuff->control) { case DEVICE_RESOLUTION: diff --git a/xorg-server/Xi/getfctl.c b/xorg-server/Xi/getfctl.c index 2772c0c26..599b2ef97 100644 --- a/xorg-server/Xi/getfctl.c +++ b/xorg-server/Xi/getfctl.c @@ -265,7 +265,7 @@ SRepXGetFeedbackControl(ClientPtr client, int size, swaps(&rep->sequenceNumber); swapl(&rep->length); swaps(&rep->num_feedbacks); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } /*********************************************************************** @@ -295,11 +295,13 @@ ProcXGetFeedbackControl(ClientPtr client) if (rc != Success) return rc; - rep.repType = X_Reply; - rep.RepType = X_GetFeedbackControl; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.num_feedbacks = 0; + rep = (xGetFeedbackControlReply) { + .repType = X_Reply, + .RepType = X_GetFeedbackControl, + .sequenceNumber = client->sequence, + .length = 0, + .num_feedbacks = 0 + }; for (k = dev->kbdfeed; k; k = k->next) { rep.num_feedbacks++; diff --git a/xorg-server/Xi/getfocus.c b/xorg-server/Xi/getfocus.c index ba36e37e3..40546cb84 100644 --- a/xorg-server/Xi/getfocus.c +++ b/xorg-server/Xi/getfocus.c @@ -99,10 +99,12 @@ ProcXGetDeviceFocus(ClientPtr client) if (!dev->focus) return BadDevice; - rep.repType = X_Reply; - rep.RepType = X_GetDeviceFocus; - rep.length = 0; - rep.sequenceNumber = client->sequence; + rep = (xGetDeviceFocusReply) { + .repType = X_Reply, + .RepType = X_GetDeviceFocus, + .sequenceNumber = client->sequence, + .length = 0 + }; focus = dev->focus; @@ -135,5 +137,5 @@ SRepXGetDeviceFocus(ClientPtr client, int size, xGetDeviceFocusReply * rep) swapl(&rep->length); swapl(&rep->focus); swapl(&rep->time); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/getkmap.c b/xorg-server/Xi/getkmap.c index 006be62a6..87c197759 100644 --- a/xorg-server/Xi/getkmap.c +++ b/xorg-server/Xi/getkmap.c @@ -119,11 +119,13 @@ ProcXGetDeviceKeyMapping(ClientPtr client) if (!syms) return BadAlloc; - rep.repType = X_Reply; - rep.RepType = X_GetDeviceKeyMapping; - rep.sequenceNumber = client->sequence; - rep.keySymsPerKeyCode = syms->mapWidth; - rep.length = (syms->mapWidth * stuff->count); /* KeySyms are 4 bytes */ + rep = (xGetDeviceKeyMappingReply) { + .repType = X_Reply, + .RepType = X_GetDeviceKeyMapping, + .sequenceNumber = client->sequence, + .keySymsPerKeyCode = syms->mapWidth, + .length = (syms->mapWidth * stuff->count) /* KeySyms are 4 bytes */ + }; WriteReplyToClient(client, sizeof(xGetDeviceKeyMappingReply), &rep); client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write; @@ -150,5 +152,5 @@ SRepXGetDeviceKeyMapping(ClientPtr client, int size, { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/getmmap.c b/xorg-server/Xi/getmmap.c index 3f8424373..f07f2bb5c 100644 --- a/xorg-server/Xi/getmmap.c +++ b/xorg-server/Xi/getmmap.c @@ -101,15 +101,17 @@ ProcXGetDeviceModifierMapping(ClientPtr client) if (ret != Success) return ret; - rep.repType = X_Reply; - rep.RepType = X_GetDeviceModifierMapping; - rep.numKeyPerModifier = max_keys_per_mod; - rep.sequenceNumber = client->sequence; + rep = (xGetDeviceModifierMappingReply) { + .repType = X_Reply, + .RepType = X_GetDeviceModifierMapping, + .sequenceNumber = client->sequence, + .numKeyPerModifier = max_keys_per_mod, /* length counts 4 byte quantities - there are 8 modifiers 1 byte big */ - rep.length = max_keys_per_mod << 1; + .length = max_keys_per_mod << 1 + }; WriteReplyToClient(client, sizeof(xGetDeviceModifierMappingReply), &rep); - WriteToClient(client, max_keys_per_mod * 8, (char *) modkeymap); + WriteToClient(client, max_keys_per_mod * 8, modkeymap); free(modkeymap); @@ -129,5 +131,5 @@ SRepXGetDeviceModifierMapping(ClientPtr client, int size, { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/getprop.c b/xorg-server/Xi/getprop.c index b7b9e6b5a..4d6ce6338 100644 --- a/xorg-server/Xi/getprop.c +++ b/xorg-server/Xi/getprop.c @@ -101,11 +101,13 @@ ProcXGetDeviceDontPropagateList(ClientPtr client) REQUEST(xGetDeviceDontPropagateListReq); REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq); - rep.repType = X_Reply; - rep.RepType = X_GetDeviceDontPropagateList; - rep.sequenceNumber = client->sequence; - rep.length = 0; - rep.count = 0; + rep = (xGetDeviceDontPropagateListReply) { + .repType = X_Reply, + .RepType = X_GetDeviceDontPropagateList, + .sequenceNumber = client->sequence, + .length = 0, + .count = 0 + }; rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); if (rc != Success) @@ -178,5 +180,5 @@ SRepXGetDeviceDontPropagateList(ClientPtr client, int size, swaps(&rep->sequenceNumber); swapl(&rep->length); swaps(&rep->count); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/getselev.c b/xorg-server/Xi/getselev.c index 253c87fb5..60a46c2d1 100644 --- a/xorg-server/Xi/getselev.c +++ b/xorg-server/Xi/getselev.c @@ -102,12 +102,14 @@ ProcXGetSelectedExtensionEvents(ClientPtr client) REQUEST(xGetSelectedExtensionEventsReq); REQUEST_SIZE_MATCH(xGetSelectedExtensionEventsReq); - rep.repType = X_Reply; - rep.RepType = X_GetSelectedExtensionEvents; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.this_client_count = 0; - rep.all_clients_count = 0; + rep = (xGetSelectedExtensionEventsReply) { + .repType = X_Reply, + .RepType = X_GetSelectedExtensionEvents, + .sequenceNumber = client->sequence, + .length = 0, + .this_client_count = 0, + .all_clients_count = 0 + }; rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); if (rc != Success) @@ -170,5 +172,5 @@ SRepXGetSelectedExtensionEvents(ClientPtr client, int size, swapl(&rep->length); swaps(&rep->this_client_count); swaps(&rep->all_clients_count); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/getvers.c b/xorg-server/Xi/getvers.c index eb52c5b93..829e69535 100644 --- a/xorg-server/Xi/getvers.c +++ b/xorg-server/Xi/getvers.c @@ -98,14 +98,15 @@ ProcXGetExtensionVersion(ClientPtr client) stuff->nbytes)) return BadLength; - memset(&rep, 0, sizeof(xGetExtensionVersionReply)); - rep.repType = X_Reply; - rep.RepType = X_GetExtensionVersion; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.present = TRUE; - rep.major_version = XIVersion.major_version; - rep.minor_version = XIVersion.minor_version; + rep = (xGetExtensionVersionReply) { + .repType = X_Reply, + .RepType = X_GetExtensionVersion, + .sequenceNumber = client->sequence, + .length = 0, + .major_version = XIVersion.major_version, + .minor_version = XIVersion.minor_version, + .present = TRUE + }; WriteReplyToClient(client, sizeof(xGetExtensionVersionReply), &rep); @@ -127,5 +128,5 @@ SRepXGetExtensionVersion(ClientPtr client, int size, swapl(&rep->length); swaps(&rep->major_version); swaps(&rep->minor_version); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/grabdev.c b/xorg-server/Xi/grabdev.c index c904a9707..443ef56c1 100644 --- a/xorg-server/Xi/grabdev.c +++ b/xorg-server/Xi/grabdev.c @@ -113,10 +113,12 @@ ProcXGrabDevice(ClientPtr client) bytes_to_int32(sizeof(xGrabDeviceReq)) + stuff->event_count) return BadLength; - rep.repType = X_Reply; - rep.RepType = X_GrabDevice; - rep.sequenceNumber = client->sequence; - rep.length = 0; + rep = (xGrabDeviceReply) { + .repType = X_Reply, + .RepType = X_GrabDevice, + .sequenceNumber = client->sequence, + .length = 0, + }; rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess); if (rc != Success) @@ -211,5 +213,5 @@ SRepXGrabDevice(ClientPtr client, int size, xGrabDeviceReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/grabdevb.c b/xorg-server/Xi/grabdevb.c index 0f0e975a0..8b4ae698e 100644 --- a/xorg-server/Xi/grabdevb.c +++ b/xorg-server/Xi/grabdevb.c @@ -137,13 +137,14 @@ ProcXGrabDeviceButton(ClientPtr client) X_GrabDeviceButton)) != Success) return ret; - memset(¶m, 0, sizeof(param)); - param.grabtype = XI; - param.ownerEvents = stuff->ownerEvents; - param.this_device_mode = stuff->this_device_mode; - param.other_devices_mode = stuff->other_devices_mode; - param.grabWindow = stuff->grabWindow; - param.modifiers = stuff->modifiers; + param = (GrabParameters) { + .grabtype = XI, + .ownerEvents = stuff->ownerEvents, + .this_device_mode = stuff->this_device_mode, + .other_devices_mode = stuff->other_devices_mode, + .grabWindow = stuff->grabWindow, + .modifiers = stuff->modifiers + }; mask.xi = tmp[stuff->grabbed_device].mask; ret = GrabButton(client, dev, mdev, stuff->button, ¶m, XI, &mask); diff --git a/xorg-server/Xi/grabdevk.c b/xorg-server/Xi/grabdevk.c index b75518211..8694f9e6d 100644 --- a/xorg-server/Xi/grabdevk.c +++ b/xorg-server/Xi/grabdevk.c @@ -135,13 +135,14 @@ ProcXGrabDeviceKey(ClientPtr client) X_GrabDeviceKey)) != Success) return ret; - memset(¶m, 0, sizeof(param)); - param.grabtype = XI; - param.ownerEvents = stuff->ownerEvents; - param.this_device_mode = stuff->this_device_mode; - param.other_devices_mode = stuff->other_devices_mode; - param.grabWindow = stuff->grabWindow; - param.modifiers = stuff->modifiers; + param = (GrabParameters) { + .grabtype = XI, + .ownerEvents = stuff->ownerEvents, + .this_device_mode = stuff->this_device_mode, + .other_devices_mode = stuff->other_devices_mode, + .grabWindow = stuff->grabWindow, + .modifiers = stuff->modifiers + }; mask.xi = tmp[stuff->grabbed_device].mask; ret = GrabKey(client, dev, mdev, stuff->key, ¶m, XI, &mask); diff --git a/xorg-server/Xi/gtmotion.c b/xorg-server/Xi/gtmotion.c index 48bc79af4..4642b194a 100644 --- a/xorg-server/Xi/gtmotion.c +++ b/xorg-server/Xi/gtmotion.c @@ -110,13 +110,15 @@ ProcXGetDeviceMotionEvents(ClientPtr client) if (dev->valuator->motionHintWindow) MaybeStopDeviceHint(dev, client); axes = v->numAxes; - rep.repType = X_Reply; - rep.RepType = X_GetDeviceMotionEvents; - rep.sequenceNumber = client->sequence; - rep.nEvents = 0; - rep.axes = axes; - rep.mode = Absolute; /* XXX we don't do relative at the moment */ - rep.length = 0; + rep = (xGetDeviceMotionEventsReply) { + .repType = X_Reply, + .RepType = X_GetDeviceMotionEvents, + .sequenceNumber = client->sequence, + .length = 0, + .nEvents = 0, + .axes = axes, + .mode = Absolute /* XXX we don't do relative at the moment */ + }; start = ClientTimeToServerTime(stuff->start); stop = ClientTimeToServerTime(stuff->stop); if (CompareTimeStamps(start, stop) == LATER || @@ -147,7 +149,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client) bufptr++; } } - WriteToClient(client, length * 4, (char *) coords); + WriteToClient(client, length * 4, coords); } free(coords); return Success; @@ -167,5 +169,5 @@ SRepXGetDeviceMotionEvents(ClientPtr client, int size, swaps(&rep->sequenceNumber); swapl(&rep->length); swapl(&rep->nEvents); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/listdev.c b/xorg-server/Xi/listdev.c index a02112f32..014c61db0 100644 --- a/xorg-server/Xi/listdev.c +++ b/xorg-server/Xi/listdev.c @@ -342,11 +342,12 @@ ProcXListInputDevices(ClientPtr client) REQUEST_SIZE_MATCH(xListInputDevicesReq); - memset(&rep, 0, sizeof(xListInputDevicesReply)); - rep.repType = X_Reply; - rep.RepType = X_ListInputDevices; - rep.length = 0; - rep.sequenceNumber = client->sequence; + rep = (xListInputDevicesReply) { + .repType = X_Reply, + .RepType = X_ListInputDevices, + .sequenceNumber = client->sequence, + .length = 0 + }; /* allocate space for saving skip value */ skip = calloc(sizeof(Bool), inputInfo.numDevices); @@ -417,5 +418,5 @@ SRepXListInputDevices(ClientPtr client, int size, xListInputDevicesReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/opendev.c b/xorg-server/Xi/opendev.c index e7c00a236..6708bade1 100644 --- a/xorg-server/Xi/opendev.c +++ b/xorg-server/Xi/opendev.c @@ -117,10 +117,6 @@ ProcXOpenDevice(ClientPtr client) if (status != Success) return status; - memset(&rep, 0, sizeof(xOpenDeviceReply)); - rep.repType = X_Reply; - rep.RepType = X_OpenDevice; - rep.sequenceNumber = client->sequence; if (dev->key != NULL) { evbase[j].class = KeyClass; evbase[j++].event_type_base = event_base[KeyClass]; @@ -148,10 +144,15 @@ ProcXOpenDevice(ClientPtr client) } evbase[j].class = OtherClass; evbase[j++].event_type_base = event_base[OtherClass]; - rep.length = bytes_to_int32(j * sizeof(xInputClassInfo)); - rep.num_classes = j; + rep = (xOpenDeviceReply) { + .repType = X_Reply, + .RepType = X_OpenDevice, + .sequenceNumber = client->sequence, + .length = bytes_to_int32(j * sizeof(xInputClassInfo)), + .num_classes = j + }; WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep); - WriteToClient(client, j * sizeof(xInputClassInfo), (char *) evbase); + WriteToClient(client, j * sizeof(xInputClassInfo), evbase); return Success; } @@ -167,5 +168,5 @@ SRepXOpenDevice(ClientPtr client, int size, xOpenDeviceReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/queryst.c b/xorg-server/Xi/queryst.c index ffb6de04a..04a652be3 100644 --- a/xorg-server/Xi/queryst.c +++ b/xorg-server/Xi/queryst.c @@ -87,11 +87,6 @@ ProcXQueryDeviceState(ClientPtr client) REQUEST(xQueryDeviceStateReq); REQUEST_SIZE_MATCH(xQueryDeviceStateReq); - rep.repType = X_Reply; - rep.RepType = X_QueryDeviceState; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rc = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess); if (rc != Success && rc != BadAccess) return rc; @@ -163,8 +158,13 @@ ProcXQueryDeviceState(ClientPtr client) } } - rep.num_classes = num_classes; - rep.length = bytes_to_int32(total_length); + rep = (xQueryDeviceStateReply) { + .repType = X_Reply, + .RepType = X_QueryDeviceState, + .sequenceNumber = client->sequence, + .length = bytes_to_int32(total_length), + .num_classes = num_classes + }; WriteReplyToClient(client, sizeof(xQueryDeviceStateReply), &rep); if (total_length > 0) WriteToClient(client, total_length, savbuf); @@ -184,5 +184,5 @@ SRepXQueryDeviceState(ClientPtr client, int size, xQueryDeviceStateReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/setbmap.c b/xorg-server/Xi/setbmap.c index 110f5e91e..94796558d 100644 --- a/xorg-server/Xi/setbmap.c +++ b/xorg-server/Xi/setbmap.c @@ -100,11 +100,13 @@ ProcXSetDeviceButtonMapping(ClientPtr client) if (ret != Success) return ret; - rep.repType = X_Reply; - rep.RepType = X_SetDeviceButtonMapping; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.status = MappingSuccess; + rep = (xSetDeviceButtonMappingReply) { + .repType = X_Reply, + .RepType = X_SetDeviceButtonMapping, + .sequenceNumber = client->sequence, + .length = 0, + .status = MappingSuccess + }; ret = ApplyPointerMapping(dev, (CARD8 *) &stuff[1], stuff->map_length, @@ -134,5 +136,5 @@ SRepXSetDeviceButtonMapping(ClientPtr client, int size, { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/setdval.c b/xorg-server/Xi/setdval.c index 542f20dd8..4c9c99f55 100644 --- a/xorg-server/Xi/setdval.c +++ b/xorg-server/Xi/setdval.c @@ -92,11 +92,13 @@ ProcXSetDeviceValuators(ClientPtr client) REQUEST(xSetDeviceValuatorsReq); REQUEST_AT_LEAST_SIZE(xSetDeviceValuatorsReq); - rep.repType = X_Reply; - rep.RepType = X_SetDeviceValuators; - rep.length = 0; - rep.status = Success; - rep.sequenceNumber = client->sequence; + rep = (xSetDeviceValuatorsReply) { + .repType = X_Reply, + .RepType = X_SetDeviceValuators, + .sequenceNumber = client->sequence, + .length = 0, + .status = Success + }; if (stuff->length != bytes_to_int32(sizeof(xSetDeviceValuatorsReq)) + stuff->num_valuators) @@ -138,5 +140,5 @@ SRepXSetDeviceValuators(ClientPtr client, int size, { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/setmmap.c b/xorg-server/Xi/setmmap.c index 36845d706..1320cfec7 100644 --- a/xorg-server/Xi/setmmap.c +++ b/xorg-server/Xi/setmmap.c @@ -98,10 +98,12 @@ ProcXSetDeviceModifierMapping(ClientPtr client) (stuff->numKeyPerModifier << 1)) return BadLength; - rep.repType = X_Reply; - rep.RepType = X_SetDeviceModifierMapping; - rep.length = 0; - rep.sequenceNumber = client->sequence; + rep = (xSetDeviceModifierMappingReply) { + .repType = X_Reply, + .RepType = X_SetDeviceModifierMapping, + .sequenceNumber = client->sequence, + .length = 0 + }; ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess); if (ret != Success) @@ -140,5 +142,5 @@ SRepXSetDeviceModifierMapping(ClientPtr client, int size, { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/setmode.c b/xorg-server/Xi/setmode.c index a7bf1eaff..535655257 100644 --- a/xorg-server/Xi/setmode.c +++ b/xorg-server/Xi/setmode.c @@ -92,10 +92,12 @@ ProcXSetDeviceMode(ClientPtr client) REQUEST(xSetDeviceModeReq); REQUEST_SIZE_MATCH(xSetDeviceModeReq); - rep.repType = X_Reply; - rep.RepType = X_SetDeviceMode; - rep.length = 0; - rep.sequenceNumber = client->sequence; + rep = (xSetDeviceModeReply) { + .repType = X_Reply, + .RepType = X_SetDeviceMode, + .sequenceNumber = client->sequence, + .length = 0 + }; rc = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess); if (rc != Success) @@ -137,5 +139,5 @@ SRepXSetDeviceMode(ClientPtr client, int size, xSetDeviceModeReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/xigetclientpointer.c b/xorg-server/Xi/xigetclientpointer.c index 07dbf1800..3c90d588d 100644 --- a/xorg-server/Xi/xigetclientpointer.c +++ b/xorg-server/Xi/xigetclientpointer.c @@ -75,12 +75,14 @@ ProcXIGetClientPointer(ClientPtr client) else winclient = client; - rep.repType = X_Reply; - rep.RepType = X_XIGetClientPointer; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.set = (winclient->clientPtr != NULL); - rep.deviceid = (winclient->clientPtr) ? winclient->clientPtr->id : 0; + rep = (xXIGetClientPointerReply) { + .repType = X_Reply, + .RepType = X_XIGetClientPointer, + .sequenceNumber = client->sequence, + .length = 0, + .set = (winclient->clientPtr != NULL), + .deviceid = (winclient->clientPtr) ? winclient->clientPtr->id : 0 + }; WriteReplyToClient(client, sizeof(xXIGetClientPointerReply), &rep); return Success; @@ -100,5 +102,5 @@ SRepXIGetClientPointer(ClientPtr client, int size, swaps(&rep->sequenceNumber); swapl(&rep->length); swaps(&rep->deviceid); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/xigrabdev.c b/xorg-server/Xi/xigrabdev.c index 8d2cf0bed..09186e84f 100644 --- a/xorg-server/Xi/xigrabdev.c +++ b/xorg-server/Xi/xigrabdev.c @@ -104,11 +104,13 @@ ProcXIGrabDevice(ClientPtr client) if (ret != Success) return ret; - rep.repType = X_Reply; - rep.RepType = X_XIGrabDevice; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.status = status; + rep = (xXIGrabDeviceReply) { + .repType = X_Reply, + .RepType = X_XIGrabDevice, + .sequenceNumber = client->sequence, + .length = 0, + .status = status + }; WriteReplyToClient(client, sizeof(rep), &rep); return ret; @@ -156,5 +158,5 @@ SRepXIGrabDevice(ClientPtr client, int size, xXIGrabDeviceReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c index 7130328ec..ddab53dec 100644 --- a/xorg-server/Xi/xipassivegrab.c +++ b/xorg-server/Xi/xipassivegrab.c @@ -78,7 +78,13 @@ int ProcXIPassiveGrabDevice(ClientPtr client) { DeviceIntPtr dev, mod_dev; - xXIPassiveGrabDeviceReply rep; + xXIPassiveGrabDeviceReply rep = { + .repType = X_Reply, + .RepType = X_XIPassiveGrabDevice, + .sequenceNumber = client->sequence, + .length = 0, + .num_modifiers = 0 + }; int i, ret = Success; uint32_t *modifiers; xXIGrabModifierInfo *modifiers_failed; @@ -137,12 +143,6 @@ ProcXIPassiveGrabDevice(ClientPtr client) xi2mask_set_one_mask(mask.xi2mask, stuff->deviceid, (unsigned char *) &stuff[1], mask_len * 4); - rep.repType = X_Reply; - rep.RepType = X_XIPassiveGrabDevice; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.num_modifiers = 0; - memset(¶m, 0, sizeof(param)); param.grabtype = XI2; param.ownerEvents = stuff->owner_events; @@ -224,7 +224,7 @@ ProcXIPassiveGrabDevice(ClientPtr client) WriteReplyToClient(client, sizeof(rep), &rep); if (rep.num_modifiers) - WriteToClient(client, rep.length * 4, (char *) modifiers_failed); + WriteToClient(client, rep.length * 4, modifiers_failed); free(modifiers_failed); out: @@ -240,7 +240,7 @@ SRepXIPassiveGrabDevice(ClientPtr client, int size, swapl(&rep->length); swaps(&rep->num_modifiers); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } int diff --git a/xorg-server/Xi/xiproperty.c b/xorg-server/Xi/xiproperty.c index 5f46b5435..ca731042c 100644 --- a/xorg-server/Xi/xiproperty.c +++ b/xorg-server/Xi/xiproperty.c @@ -182,30 +182,27 @@ static long XIPropHandlerID = 1; static void send_property_event(DeviceIntPtr dev, Atom property, int what) { - devicePropertyNotify event; - xXIPropertyEvent xi2; - int state; + int state = (what == XIPropertyDeleted) ? PropertyDelete : PropertyNewValue; + devicePropertyNotify event = { + .type = DevicePropertyNotify, + .deviceid = dev->id, + .state = state, + .atom = property, + .time = currentTime.milliseconds + }; + xXIPropertyEvent xi2 = { + .type = GenericEvent, + .extension = IReqCode, + .length = 0, + .evtype = XI_PropertyEvent, + .deviceid = dev->id, + .time = currentTime.milliseconds, + .property = property, + .what = what + }; - if (what == XIPropertyDeleted) - state = PropertyDelete; - else - state = PropertyNewValue; - - event.type = DevicePropertyNotify; - event.deviceid = dev->id; - event.state = state; - event.atom = property; - event.time = currentTime.milliseconds; SendEventToAllWindows(dev, DevicePropertyNotifyMask, (xEvent *) &event, 1); - xi2.type = GenericEvent; - xi2.extension = IReqCode; - xi2.length = 0; - xi2.evtype = XI_PropertyEvent; - xi2.deviceid = dev->id; - xi2.time = currentTime.milliseconds; - xi2.property = property; - xi2.what = what; SendEventToAllWindows(dev, GetEventFilter(dev, (xEvent *) &xi2), (xEvent *) &xi2, 1); } @@ -864,11 +861,13 @@ ProcXListDeviceProperties(ClientPtr client) if (rc != Success) return rc; - rep.repType = X_Reply; - rep.RepType = X_ListDeviceProperties; - rep.length = natoms; - rep.sequenceNumber = client->sequence; - rep.nAtoms = natoms; + rep = (xListDevicePropertiesReply) { + .repType = X_Reply, + .RepType = X_ListDeviceProperties, + .sequenceNumber = client->sequence, + .length = natoms, + .nAtoms = natoms + }; WriteReplyToClient(client, sizeof(xListDevicePropertiesReply), &rep); if (natoms) { @@ -958,15 +957,17 @@ ProcXGetDeviceProperty(ClientPtr client) if (rc != Success) return rc; - reply.repType = X_Reply; - reply.RepType = X_GetDeviceProperty; - reply.sequenceNumber = client->sequence; - reply.deviceid = dev->id; - reply.nItems = nitems; - reply.format = format; - reply.bytesAfter = bytes_after; - reply.propertyType = type; - reply.length = bytes_to_int32(length); + reply = (xGetDevicePropertyReply) { + .repType = X_Reply, + .RepType = X_GetDeviceProperty, + .sequenceNumber = client->sequence, + .length = bytes_to_int32(length), + .propertyType = type, + .bytesAfter = bytes_after, + .nItems = nitems, + .format = format, + .deviceid = dev->id + }; if (stuff->delete && (reply.bytesAfter == 0)) send_property_event(dev, stuff->property, XIPropertyDeleted); @@ -1063,7 +1064,7 @@ SRepXListDeviceProperties(ClientPtr client, int size, swapl(&rep->length); swaps(&rep->nAtoms); /* properties will be swapped later, see ProcXListDeviceProperties */ - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } void @@ -1076,7 +1077,7 @@ SRepXGetDeviceProperty(ClientPtr client, int size, swapl(&rep->bytesAfter); swapl(&rep->nItems); /* data will be swapped, see ProcXGetDeviceProperty */ - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } /* XI2 Request/reply handling */ @@ -1100,11 +1101,13 @@ ProcXIListProperties(ClientPtr client) if (rc != Success) return rc; - rep.repType = X_Reply; - rep.RepType = X_XIListProperties; - rep.length = natoms; - rep.sequenceNumber = client->sequence; - rep.num_properties = natoms; + rep = (xXIListPropertiesReply) { + .repType = X_Reply, + .RepType = X_XIListProperties, + .sequenceNumber = client->sequence, + .length = natoms, + .num_properties = natoms + }; WriteReplyToClient(client, sizeof(xXIListPropertiesReply), &rep); if (natoms) { @@ -1194,14 +1197,16 @@ ProcXIGetProperty(ClientPtr client) if (rc != Success) return rc; - reply.repType = X_Reply; - reply.RepType = X_XIGetProperty; - reply.sequenceNumber = client->sequence; - reply.num_items = nitems; - reply.format = format; - reply.bytes_after = bytes_after; - reply.type = type; - reply.length = bytes_to_int32(length); + reply = (xXIGetPropertyReply) { + .repType = X_Reply, + .RepType = X_XIGetProperty, + .sequenceNumber = client->sequence, + .length = bytes_to_int32(length), + .type = type, + .bytes_after = bytes_after, + .num_items = nitems, + .format = format + }; if (length && stuff->delete && (reply.bytes_after == 0)) send_property_event(dev, stuff->property, XIPropertyDeleted); @@ -1300,7 +1305,7 @@ SRepXIListProperties(ClientPtr client, int size, xXIListPropertiesReply * rep) swapl(&rep->length); swaps(&rep->num_properties); /* properties will be swapped later, see ProcXIListProperties */ - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } void @@ -1312,5 +1317,5 @@ SRepXIGetProperty(ClientPtr client, int size, xXIGetPropertyReply * rep) swapl(&rep->bytes_after); swapl(&rep->num_items); /* data will be swapped, see ProcXIGetProperty */ - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/xiquerydevice.c b/xorg-server/Xi/xiquerydevice.c index 15c8b2a7b..85c1dd81d 100644 --- a/xorg-server/Xi/xiquerydevice.c +++ b/xorg-server/Xi/xiquerydevice.c @@ -107,12 +107,13 @@ ProcXIQueryDevice(ClientPtr client) return BadAlloc; } - memset(&rep, 0, sizeof(xXIQueryDeviceReply)); - rep.repType = X_Reply; - rep.RepType = X_XIQueryDevice; - rep.sequenceNumber = client->sequence; - rep.length = len / 4; - rep.num_devices = 0; + rep = (xXIQueryDeviceReply) { + .repType = X_Reply, + .RepType = X_XIQueryDevice, + .sequenceNumber = client->sequence, + .length = len / 4, + .num_devices = 0 + }; ptr = info; if (dev) { @@ -162,7 +163,7 @@ SRepXIQueryDevice(ClientPtr client, int size, xXIQueryDeviceReply * rep) /* Device info is already swapped, see ProcXIQueryDevice */ - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } /** diff --git a/xorg-server/Xi/xiquerypointer.c b/xorg-server/Xi/xiquerypointer.c index 169436e14..7e6852dd0 100644 --- a/xorg-server/Xi/xiquerypointer.c +++ b/xorg-server/Xi/xiquerypointer.c @@ -121,15 +121,16 @@ ProcXIQueryPointer(ClientPtr client) pSprite = pDev->spriteInfo->sprite; - memset(&rep, 0, sizeof(rep)); - rep.repType = X_Reply; - rep.RepType = X_XIQueryPointer; - rep.length = 6; - rep.sequenceNumber = client->sequence; - rep.root = (GetCurrentRootWindow(pDev))->drawable.id; - rep.root_x = FP1616(pSprite->hot.x, 0); - rep.root_y = FP1616(pSprite->hot.y, 0); - rep.child = None; + rep = (xXIQueryPointerReply) { + .repType = X_Reply, + .RepType = X_XIQueryPointer, + .sequenceNumber = client->sequence, + .length = 6, + .root = (GetCurrentRootWindow(pDev))->drawable.id, + .root_x = FP1616(pSprite->hot.x, 0), + .root_y = FP1616(pSprite->hot.y, 0), + .child = None + }; if (kbd) { state = &kbd->key->xkbInfo->state; @@ -219,5 +220,5 @@ SRepXIQueryPointer(ClientPtr client, int size, xXIQueryPointerReply * rep) swapl(&rep->win_y); swaps(&rep->buttons_len); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/xiqueryversion.c b/xorg-server/Xi/xiqueryversion.c index 6081c413d..b807a53ce 100644 --- a/xorg-server/Xi/xiqueryversion.c +++ b/xorg-server/Xi/xiqueryversion.c @@ -93,13 +93,14 @@ ProcXIQueryVersion(ClientPtr client) pXIClient->minor_version = minor; } - memset(&rep, 0, sizeof(xXIQueryVersionReply)); - rep.repType = X_Reply; - rep.RepType = X_XIQueryVersion; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.major_version = major; - rep.minor_version = minor; + rep = (xXIQueryVersionReply) { + .repType = X_Reply, + .RepType = X_XIQueryVersion, + .sequenceNumber = client->sequence, + .length = 0, + .major_version = major, + .minor_version = minor + }; WriteReplyToClient(client, sizeof(xXIQueryVersionReply), &rep); @@ -126,5 +127,5 @@ SRepXIQueryVersion(ClientPtr client, int size, xXIQueryVersionReply * rep) swapl(&rep->length); swaps(&rep->major_version); swaps(&rep->minor_version); - WriteToClient(client, size, (char *) rep); + WriteToClient(client, size, rep); } diff --git a/xorg-server/Xi/xiselectev.c b/xorg-server/Xi/xiselectev.c index e7e719d16..0e45cb8cb 100644 --- a/xorg-server/Xi/xiselectev.c +++ b/xorg-server/Xi/xiselectev.c @@ -260,11 +260,13 @@ ProcXIGetSelectedEvents(ClientPtr client) if (rc != Success) return rc; - reply.repType = X_Reply; - reply.RepType = X_XIGetSelectedEvents; - reply.length = 0; - reply.sequenceNumber = client->sequence; - reply.num_masks = 0; + reply = (xXIGetSelectedEventsReply) { + .repType = X_Reply, + .RepType = X_XIGetSelectedEvents, + .sequenceNumber = client->sequence, + .length = 0, + .num_masks = 0 + }; masks = wOtherInputMasks(win); if (masks) { @@ -335,5 +337,5 @@ SRepXIGetSelectedEvents(ClientPtr client, swaps(&rep->sequenceNumber); swapl(&rep->length); swaps(&rep->num_masks); - WriteToClient(client, len, (char *) rep); + WriteToClient(client, len, rep); } diff --git a/xorg-server/Xi/xisetdevfocus.c b/xorg-server/Xi/xisetdevfocus.c index b52c9cc99..372ec248a 100644 --- a/xorg-server/Xi/xisetdevfocus.c +++ b/xorg-server/Xi/xisetdevfocus.c @@ -97,10 +97,12 @@ ProcXIGetFocus(ClientPtr client) if (!dev->focus) return BadDevice; - rep.repType = X_Reply; - rep.RepType = X_XIGetFocus; - rep.length = 0; - rep.sequenceNumber = client->sequence; + rep = (xXIGetFocusReply) { + .repType = X_Reply, + .RepType = X_XIGetFocus, + .sequenceNumber = client->sequence, + .length = 0 + }; if (dev->focus->win == NoneWin) rep.focus = None; @@ -121,5 +123,5 @@ SRepXIGetFocus(ClientPtr client, int len, xXIGetFocusReply * rep) swaps(&rep->sequenceNumber); swapl(&rep->length); swapl(&rep->focus); - WriteToClient(client, len, (char *) rep); + WriteToClient(client, len, rep); } -- cgit v1.2.3