diff options
Diffstat (limited to 'xorg-server/xkb/xkbEvents.c')
| -rw-r--r-- | xorg-server/xkb/xkbEvents.c | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/xorg-server/xkb/xkbEvents.c b/xorg-server/xkb/xkbEvents.c index cc9a535d7..ccf64215d 100644 --- a/xorg-server/xkb/xkbEvents.c +++ b/xorg-server/xkb/xkbEvents.c @@ -99,7 +99,8 @@ XkbSendLegacyMapNotify(DeviceIntPtr kbd, CARD16 xkb_event, CARD16 changed, continue; if (keymap_changed) { - xEvent core_mn = { .u.u.type = MappingNotify }; + xEvent core_mn; + core_mn.u.u.type = MappingNotify; core_mn.u.mappingNotify.request = MappingKeyboard; /* Clip the keycode range to what the client knows about, so it @@ -117,11 +118,10 @@ XkbSendLegacyMapNotify(DeviceIntPtr kbd, CARD16 xkb_event, CARD16 changed, WriteEventsToClient(clients[i], 1, &core_mn); } if (modmap_changed) { - xEvent core_mn = { - .u.mappingNotify.request = MappingModifier, - .u.mappingNotify.firstKeyCode = 0, - .u.mappingNotify.count = 0 - }; + xEvent core_mn; + core_mn.u.mappingNotify.request = MappingModifier; + core_mn.u.mappingNotify.firstKeyCode = 0; + core_mn.u.mappingNotify.count = 0; core_mn.u.u.type = MappingNotify; WriteEventsToClient(clients[i], 1, &core_mn); } @@ -131,26 +131,24 @@ XkbSendLegacyMapNotify(DeviceIntPtr kbd, CARD16 xkb_event, CARD16 changed, * here? Clients might be upset, but that seems better than the * alternative of stale keymaps. -ds */ if (keymap_changed) { - deviceMappingNotify xi_mn = { - .type = DeviceMappingNotify, - .deviceid = kbd->id, - .request = MappingKeyboard, - .firstKeyCode = first_key, - .count = num_keys, - .time = time - }; + deviceMappingNotify xi_mn; + xi_mn.type = DeviceMappingNotify; + xi_mn.deviceid = kbd->id; + xi_mn.request = MappingKeyboard; + xi_mn.firstKeyCode = first_key; + xi_mn.count = num_keys; + xi_mn.time = time; SendEventToAllWindows(kbd, DeviceMappingNotifyMask, (xEvent *) &xi_mn, 1); } if (modmap_changed) { - deviceMappingNotify xi_mn = { - .type = DeviceMappingNotify, - .deviceid = kbd->id, - .request = MappingModifier, - .firstKeyCode = 0, - .count = 0, - .time = time - }; + deviceMappingNotify xi_mn; + xi_mn.type = DeviceMappingNotify; + xi_mn.deviceid = kbd->id; + xi_mn.request = MappingModifier; + xi_mn.firstKeyCode = 0; + xi_mn.count = 0; + xi_mn.time = time; SendEventToAllWindows(kbd, DeviceMappingNotifyMask, (xEvent *) &xi_mn, 1); } |