← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xorg-server/quantal-proposed

« back to all changes in this revision

Viewing changes to Xi/queryst.c

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers, Maarten Lankhorst, Christopher James Halse Rogers
  • Date: 2012-07-25 16:54:16 UTC
  • mfrom: (0.10.25)
  • Revision ID: package-import@ubuntu.com-20120725165416-5y3qcty2qdzgehgd
Tags: 2:1.12.99.902-0ubuntu1
https://launchpad.net/bugs/1015292
[ Maarten Lankhorst ]
* New upstream release snapshot (on the way to 1.13).
  - Fixes QT5 app segfaults (LP: #1015292)
* Bump minimum required abi, randr, dri2 and gl protos.
* Refreshed patches to apply on x1.13
* Remove patches merged upstream:
  - 508_device_off_release_buttons.patch
  - 510-dix-return-early-from-DisableDevice-if-the-device-is.patch
  - 511-dix-move-freeing-the-sprite-into-a-function.patch
  - 512-dix-free-the-sprite-when-disabling-the-device.patch
  - 513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
  - 514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
  - 515-dix-disable-all-devices-before-shutdown.patch

[ Christopher James Halse Rogers ]
* debian/patches/100_rethrow_signals.patch:
  - Drop, in favour of getting LightDM to pass -core to the server. This
    upstream mechanism is significantly more reliable at dumping core in
    my testing. We may later wish to improve this with some processing in
    the apport hook.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Xi/queryst.c
87
87
    REQUEST(xQueryDeviceStateReq);
88
88
    REQUEST_SIZE_MATCH(xQueryDeviceStateReq);
89
89
 
90
 
    rep.repType = X_Reply;
91
 
    rep.RepType = X_QueryDeviceState;
92
 
    rep.length = 0;
93
 
    rep.sequenceNumber = client->sequence;
94
 
 
95
90
    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess);
96
91
    if (rc != Success && rc != BadAccess)
97
92
        return rc;
163
158
        }
164
159
    }
165
160
 
166
 
    rep.num_classes = num_classes;
167
 
    rep.length = bytes_to_int32(total_length);
 
161
    rep = (xQueryDeviceStateReply) {
 
162
        .repType = X_Reply,
 
163
        .RepType = X_QueryDeviceState,
 
164
        .sequenceNumber = client->sequence,
 
165
        .length = bytes_to_int32(total_length),
 
166
        .num_classes = num_classes
 
167
    };
168
168
    WriteReplyToClient(client, sizeof(xQueryDeviceStateReply), &rep);
169
169
    if (total_length > 0)
170
170
        WriteToClient(client, total_length, savbuf);
184
184
{
185
185
    swaps(&rep->sequenceNumber);
186
186
    swapl(&rep->length);
187
 
    WriteToClient(client, size, (char *) rep);
 
187
    WriteToClient(client, size, rep);
188
188
}