diff options
Diffstat (limited to 'xorg-server/dix/inpututils.c')
| -rw-r--r-- | xorg-server/dix/inpututils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c index eb2222a07..fee34ef59 100644 --- a/xorg-server/dix/inpututils.c +++ b/xorg-server/dix/inpututils.c @@ -71,13 +71,14 @@ static void do_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client) { int i; - xEvent core_mn = { .u.u.type = MappingNotify }; + xEvent core_mn; deviceMappingNotify xi_mn; /* The map in ButtonClassRec refers to button numbers, whereas the * protocol is zero-indexed. Sigh. */ memcpy(&(dev->button->map[1]), map, len); + core_mn.u.u.type = MappingNotify; core_mn.u.mappingNotify.request = MappingPointer; /* 0 is the server client. */ @@ -92,12 +93,11 @@ do_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client) WriteEventsToClient(clients[i], 1, &core_mn); } - xi_mn = (deviceMappingNotify) { - .type = DeviceMappingNotify, - .request = MappingPointer, - .deviceid = dev->id, - .time = GetTimeInMillis() - }; + + xi_mn.type = DeviceMappingNotify; + xi_mn.request = MappingPointer; + xi_mn.deviceid = dev->id; + xi_mn.time = GetTimeInMillis(); SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) &xi_mn, 1); } |