← Back to branch summary

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

« back to all changes in this revision

Viewing changes to test/xi2/protocol-xipassivegrabdevice.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:
test/xi2/protocol-xipassivegrabdevice.c
37
37
#include "scrnintstr.h"
38
38
#include "xipassivegrab.h"
39
39
#include "exevents.h"
 
40
#include "exglobals.h"
40
41
 
41
42
#include "protocol-common.h"
42
43
 
54
55
                      GrabParameters *param, enum InputLevel grabtype,
55
56
                      GrabMask *mask);
56
57
static void reply_XIPassiveGrabDevice_data(ClientPtr client, int len,
57
 
                                           char *data, void *userdata);
 
58
                                           char *data, void *closure);
58
59
 
59
60
int
60
61
__wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access)
85
86
}
86
87
 
87
88
static void
88
 
reply_XIPassiveGrabDevice(ClientPtr client, int len, char *data, void *userdata)
 
89
reply_XIPassiveGrabDevice(ClientPtr client, int len, char *data, void *closure)
89
90
{
90
91
    xXIPassiveGrabDeviceReply *rep = (xXIPassiveGrabDeviceReply *) data;
91
92
 
107
108
 
108
109
static void
109
110
reply_XIPassiveGrabDevice_data(ClientPtr client, int len, char *data,
110
 
                               void *userdata)
 
111
                               void *closure)
111
112
{
112
113
    int i;
113
114