diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-12 21:33:54 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-16 12:20:58 +1000 |
| commit | 8ff1bff8f462b15e05fc298704e1e40cb244587f (patch) | |
| tree | 597332ece4d47659363f41ef4f0f8906f69ec3fd /Xi/xiselectev.c | |
| parent | bbf266cca3de726e3eb932d66dd5b8981ef40fa8 (diff) | |
Update to new XI2 names
Diffstat (limited to 'Xi/xiselectev.c')
| -rw-r--r-- | Xi/xiselectev.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c index 601dec3f9..73097736e 100644 --- a/Xi/xiselectev.c +++ b/Xi/xiselectev.c @@ -41,7 +41,7 @@ SProcXISelectEvent(ClientPtr client) { char n; int i; - xXIDeviceEventMask* evmask; + xXIEventMask* evmask; REQUEST(xXISelectEventsReq); swaps(&stuff->length, n); @@ -49,12 +49,12 @@ SProcXISelectEvent(ClientPtr client) swapl(&stuff->window, n); swaps(&stuff->num_masks, n); - evmask = (xXIDeviceEventMask*)&stuff[1]; + evmask = (xXIEventMask*)&stuff[1]; for (i = 0; i < stuff->num_masks; i++) { swaps(&evmask->deviceid, n); swaps(&evmask->mask_len, n); - evmask = (xXIDeviceEventMask*)(((char*)evmask) + evmask->mask_len * 4); + evmask = (xXIEventMask*)(((char*)evmask) + evmask->mask_len * 4); } return (ProcXISelectEvent(client)); @@ -67,7 +67,7 @@ ProcXISelectEvent(ClientPtr client) WindowPtr win; DeviceIntPtr dev; DeviceIntRec dummy; - xXIDeviceEventMask *evmask; + xXIEventMask *evmask; int *types = NULL; REQUEST(xXISelectEventsReq); @@ -78,7 +78,7 @@ ProcXISelectEvent(ClientPtr client) return rc; /* check request validity */ - evmask = (xXIDeviceEventMask*)&stuff[1]; + evmask = (xXIEventMask*)&stuff[1]; num_masks = stuff->num_masks; while(num_masks--) { @@ -102,11 +102,11 @@ ProcXISelectEvent(ClientPtr client) } } - evmask = (xXIDeviceEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4); + evmask = (xXIEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4); } /* Set masks on window */ - evmask = (xXIDeviceEventMask*)&stuff[1]; + evmask = (xXIEventMask*)&stuff[1]; num_masks = stuff->num_masks; while(num_masks--) { @@ -118,7 +118,7 @@ ProcXISelectEvent(ClientPtr client) } else dixLookupDevice(&dev, evmask->deviceid, client, DixReadAccess); XISetEventMask(dev, win, client, evmask->mask_len * 4, (unsigned char*)&evmask[1]); - evmask = (xXIDeviceEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4); + evmask = (xXIEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4); } RecalculateDeliverableEvents(win); |